Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Spooks4576 committed Mar 23, 2024
2 parents 644c630 + 0d6b37a commit 8d545d2
Show file tree
Hide file tree
Showing 19 changed files with 389 additions and 910 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: self-hosted
strategy:
matrix:
board: [esp32_s2, esp32_wroom, esp32_c3, esp32-s3-devkitm-1]
board: [esp32_s2, esp32_c3, lolin_s2_mini, dev_board_pro, marauder_minion]

steps:
- name: Checkout code
Expand Down
6 changes: 6 additions & 0 deletions include/board_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
#include "config/esp32_c6_dev_module.h"
#elif defined(ESP32_C3_DEV_MODULE)
#include "config/esp32_c3_dev_module.h"
#elif defined(DEV_BOARD_PRO)
#include "config/marauder_dev_board_pro.h"
#elif defined(MINION_BOARD)
#include "config/rabbit_labs_minion.h"
#elif defined(rek5rek5_BOARD)
#include "config/rek5rek5_board_module.h"
#else
#error "Board type is not defined or unsupported!"
#endif
6 changes: 5 additions & 1 deletion include/config/marauder_dev_board_pro.h
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
#pragma once
#pragma once
#define NEOPIXEL_PIN 16
#define SD_CARD_CS_PIN 4
#define Pixels 1
#define HAS_BT
14 changes: 14 additions & 0 deletions include/config/rek5rek5_board_module.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Pin definitions
// define RGB pins if using legacy LEDs otherwise specify the neopixel pin
//#define OLD_LED true
#define HAS_BT
//#define LED_R 2
//#define LED_G 2
//#define LED_B 2
#define NEOPIXEL_PIN 21
#define SD_CARD_CS_PIN 4
//#define DISPLAY_SUPPORT
#define Pixels 1
#define HAS_GPS
#define GPS_TX 5
#define GPS_RX 22
94 changes: 91 additions & 3 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,39 @@ lib_deps =
ivanseidel/LinkedList
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
# Add more libraries as needed
board_build.partitions = min_spiffs.csv


[env:lolin_s2_mini]
platform = espressif32
board = lolin_s2_mini
framework = arduino
build_flags =
-DESP32_S2_DEV_MODULE
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

; Configuration for ESP32 WROOM (General)
[env:esp32_wroom]
platform = espressif32
board = esp32dev
framework = arduino
build_flags =
-DESP32_S2_DEV_MODULE
-DESP32_DEV_MODULE
-DWROOM
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
h2zero/NimBLE-Arduino@^1.4.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

; Configuration for ESP32-S3 (General)
[env:esp32_s3]
Expand All @@ -42,6 +59,7 @@ lib_deps =
h2zero/NimBLE-Arduino@^1.4.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

; Configuration for ESP32-C6 (General)
[env:esp32_c3]
Expand All @@ -57,6 +75,7 @@ lib_deps =
h2zero/NimBLE-Arduino@^1.4.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv


[env:esp32_wroom_screen]
Expand All @@ -75,6 +94,7 @@ lib_deps =
lvgl/lv_arduino@^3.0.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

[env:esp32-s3-devkitm-1]
platform = espressif32
Expand All @@ -89,4 +109,72 @@ lib_deps =
h2zero/NimBLE-Arduino@^1.4.1
lvgl/lv_arduino@^3.0.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

[env:dev_board_pro]
platform = espressif32
board = esp32dev
framework = arduino
build_flags =
-DDEV_BOARD_PRO
-DWROOM
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

[env:marauder_minion]
platform = espressif32
board = esp32dev
framework = arduino
build_flags =
-DMINION_BOARD
-DWROOM
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
h2zero/NimBLE-Arduino@^1.4.1
lvgl/lv_arduino@^3.0.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv

[env:rek5rek5_Board]
platform = espressif32
board = esp32dev
framework = arduino
build_flags =
-Drek5rek5_BOARD
-DWROOM
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
h2zero/NimBLE-Arduino@^1.4.1
lvgl/lv_arduino@^3.0.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
stevemarple/MicroNMEA@^2.0.6
board_build.partitions = min_spiffs.csv


[env:esp32-s3-wroom-1]
platform = espressif32
board = esp32-s3-devkitc-1
framework = arduino
build_flags =
-DESP32_DEV_MODULE
-std=c++17
lib_deps =
Adafruit NeoPixel
ivanseidel/LinkedList
h2zero/NimBLE-Arduino@^1.4.1
lvgl/lv_arduino@^3.0.1
arduino-libraries/ArduinoHttpClient@^0.5.0
mobizt/ESP_SSLClient@^2.1.7
board_build.partitions = min_spiffs.csv
Loading

0 comments on commit 8d545d2

Please sign in to comment.