Merge branch 'master' into master

platformio.ini

@@ -10,7 +10,7 @@
 
 [platformio]
 globallib_dir = lib
-default_envs = M5Stick-C, esp32cam, ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R, M5-StampS3, ESP32-S3-devKitv1, ESP32-S3-mini-wemos, ESP32-S3-mini-weact
+default_envs = M5Stick-C, esp32cam, ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R, M5-StampS3, ESP32-S3-devKitv1, ESP32-S3-mini-wemos, ESP32-S3-mini-weact, ESP32-C3-devKitmv1, ESP32-C3-super-mini
 
 [env:M5Stick-C]
 platform = espressif32
@@ -57,7 +57,8 @@ build_flags =
 	-D BOARD_HAS_PSRAM
 	-D ARDUINO_USB_MODE=1
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D S3MINIWEMOS=1
+	-D ESP32RGB=1
+	-D RGB_LED_PIN=47
 	;-D DEBUG_MINING=1
 lib_deps = 
 	https://github.com/takkaO/OpenFontRender
@@ -68,7 +69,6 @@ lib_deps =
 	https://github.com/FastLED/FastLED
 lib_ignore =
 	TFT_eSPI
-;--------------------------------------------------------------------
 
 ;--------------------------------------------------------------------
 
@@ -88,7 +88,8 @@ build_flags =
 	-D BOARD_HAS_PSRAM
 	-D ARDUINO_USB_MODE=1
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D S3MINIWEACT=1
+	-D ESP32RGB=1
+	-D RGB_LED_PIN=48
 	;-D DEBUG_MINING=1
 lib_deps = 
 	https://github.com/takkaO/OpenFontRender
@@ -101,6 +102,66 @@ lib_ignore =
 	TFT_eSPI
 ;--------------------------------------------------------------------
 
+[env:ESP32-C3-super-mini]
+platform = espressif32
+board = seeed_xiao_esp32c3
+framework = arduino
+monitor_filters = 
+	esp32_exception_decoder
+	time
+	log2file
+monitor_speed = 115200
+upload_speed = 115200
+board_build.partitions = huge_app.csv
+build_flags = 
+	-D BOARD_HAS_PSRAM
+	-D ARDUINO_USB_MODE=1
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D DEVKITV1=1
+	-D PIN_BUTTON_1=9
+	-D LED_PIN=8
+	;-D DEBUG_MINING=1
+lib_deps = 
+	https://github.com/takkaO/OpenFontRender
+	bblanchon/ArduinoJson@^6.21.2
+	https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
+	mathertel/OneButton @ ^2.0.3
+	arduino-libraries/NTPClient
+lib_ignore =
+	TFT_eSPI
+;--------------------------------------------------------------------
+
+[env:ESP32-C3-devKitmv1]
+platform = espressif32
+board = esp32-c3-devkitm-1
+framework = arduino
+monitor_filters = 
+	esp32_exception_decoder
+	time
+	log2file
+monitor_speed = 115200
+upload_speed = 115200
+board_build.partitions = huge_app.csv
+build_flags = 
+	-D BOARD_HAS_PSRAM
+	-D ARDUINO_USB_MODE=1
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D ESP32RGB=1
+	-D PIN_BUTTON_1=9
+	-D RGB_LED_PIN=8
+	;-D DEBUG_MINING=1
+lib_deps = 
+	https://github.com/takkaO/OpenFontRender
+	bblanchon/ArduinoJson@^6.21.2
+	https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
+	mathertel/OneButton @ ^2.0.3
+	arduino-libraries/NTPClient
+	https://github.com/FastLED/FastLED
+lib_ignore =
+	TFT_eSPI
+
+;--------------------------------------------------------------------
+
 [env:ESP32-S3-devKitv1]
 platform = espressif32
 board = esp32-s3-devkitc-1
@@ -117,7 +178,8 @@ build_flags =
 	-D BOARD_HAS_PSRAM
 	-D ARDUINO_USB_MODE=1
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D DEVKITV1RGB=1
+	-D ESP32RGB=1
+	-D RGB_LED_PIN=48
 	;-D DEBUG_MINING=1
 lib_deps = 
 	https://github.com/takkaO/OpenFontRender
@@ -398,6 +460,7 @@ lib_deps =
 	https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
 	mathertel/OneButton @ ^2.0.3
 	arduino-libraries/NTPClient
+	https://github.com/FastLED/FastLED
 lib_ignore =
 	TFT_eSPI
 	SD

src/drivers/devices/device.h

@@ -23,12 +23,8 @@
 #include "esp32CAM.h"
 #elif defined(M5_STAMP_S3)
 #include "m5StampS3.h"
-#elif defined(DEVKITV1RGB)
+#elif defined(ESP32RGB)
-#include "esp32DevKitRGB.h"
+#include "esp32RGB.h"
-#elif defined(S3MINIWEMOS)
-#include "esp32S3MiniWemos.h"
-#elif defined(S3MINIWEACT)
-#include "esp32S3MiniWeact.h"
 
 #else
 #error "No device defined"

src/drivers/devices/esp32DevKit.h

@@ -1,8 +1,13 @@
 #ifndef _ESP32_DEV_KIT_H
 #define _ESP32_DEV_KIT_H
 
+#ifndef PIN_BUTTON_1
 #define PIN_BUTTON_1 0
+#endif
+
+#ifndef LED_PIN
 #define LED_PIN 2
+#endif
 
 #define NO_DISPLAY
 

src/drivers/devices/esp32DevKitRGB.h

@@ -1,10 +0,0 @@
-#ifndef _ESP32_DEV_KIT_RGB_H
-#define _ESP32_DEV_KIT_RGB_H
-
-#define PIN_BUTTON_1 0
-#define RGB_LED_PIN 48
-
-#define LED_DISPLAY
-#define USE_LED
-
-#endif

src/drivers/devices/esp32RGB.h

@@ -0,0 +1,24 @@
+#ifndef _ESP32_RGB_H
+#define _ESP32_RGB_H
+
+#ifndef PIN_BUTTON_1
+#define PIN_BUTTON_1 0
+#endif
+
+#ifndef RGB_LED_PIN
+#define RGB_LED_PIN 48
+#endif
+
+#ifndef RGB_LED_CLASS
+#define RGB_LED_CLASS WS2812B
+#endif
+
+#ifndef RGB_LED_ORDER
+#define RGB_LED_ORDER BGR
+#endif
+
+
+#define LED_DISPLAY
+#define USE_LED
+
+#endif

src/drivers/devices/esp32S3MiniWeact.h

@@ -1,10 +0,0 @@
-#ifndef _ESP32_S3_MINI_WEACT_H
-#define _ESP32_S3_MINI_WEACT_H
-
-#define PIN_BUTTON_1 0
-#define RGB_LED_PIN 48
-
-#define LED_DISPLAY
-#define USE_LED
-
-#endif

src/drivers/devices/esp32S3MiniWemos.h

@@ -1,10 +0,0 @@
-#ifndef _ESP32_S3_MINI_WEMOS_H
-#define _ESP32_S3_MINI_WEMOS_H
-
-#define PIN_BUTTON_1 0
-#define RGB_LED_PIN 47
-
-#define LED_DISPLAY
-#define USE_LED
-
-#endif

src/drivers/devices/m5StampS3.h

@@ -2,8 +2,9 @@
 #define _M5_STAMP_S3_H
 
 #define PIN_BUTTON_1 0
-#define LED_PIN 9
+#define RGB_LED_PIN 21
 
-#define NO_DISPLAY
+#define LED_DISPLAY
+#define USE_LED
 
-#endif
+#endif

src/drivers/displays/ledDisplayDriver.cpp

@@ -28,7 +28,7 @@ void ledDisplay_Init(void)
 {
   Serial.println("Led display driver initialized");
   #ifdef USE_LED
-  FastLED.addLeds<WS2812B, RGB_LED_PIN, BGR>(&leds, 1);
+  FastLED.addLeds<RGB_LED_CLASS, RGB_LED_PIN, RGB_LED_ORDER>(&leds, 1);
   FastLED.show();
   #endif // USE_LED
 }