Merge branch 'master' into master

README.md

@@ -91,7 +91,10 @@ Update NerdMiner firmware following same flashing steps but only using the file
 
 After programming, you will only need to setup your Wifi and BTC address.
 
-#### Wifi Configuration
+Note: when BTC address of your selected wallet is not provided, mining will not be started.
+
+#### Wifi Accesspoint
+
 
 1. Connect to NerdMinerAP
    - AP: NerdMinerAP
@@ -107,6 +110,7 @@ After programming, you will only need to setup your Wifi and BTC address.
 
 1. Format a SD card using Fat32.
 1. Create a file named "config.json" in your card's root, containing the the following structure. Adjust the settings to your needs:  
+```
 {  
   "SSID": "myWifiSSID",  
   "WifiPW": "myWifiPassword",  
@@ -117,6 +121,7 @@ After programming, you will only need to setup your Wifi and BTC address.
   "Timezone": 2,  
   "SaveStats": false  
 }
+```
 
 1. Insert the SD card.
 1. Hold down the "reset configurations" button as described below to reset the configurations and/or boot without settings in your nvmemory.

lib/TFT_eSPI/User_Setup_Select.h

@@ -142,7 +142,9 @@
 //#include <User_Setups/Setup208_ESP32_S3_Box_Lite.h>      // For the ESP32 S3 Box Lite (may also work with ESP32 S3 Box)
 
 //#include <User_Setups/Setup209_LilyGo_T_Dongle_S3.h>      // For the LilyGo T-Dongle S3 based ESP32 with ST7735 80 x 160 TFT
-// #include <User_Setups/Setup210_LilyGo_T_Embed_S3.h>         // For the LilyGo T-Embed S3 based ESP32S3 with ST7789 170 x 320 TFT
+#ifdef LILYGO_S3_T_EMBED
+#include <User_Setups/Setup210_LilyGo_T_Embed_S3.h>         // For the LilyGo T-Embed S3 based ESP32S3 with ST7789 170 x 320 TFT
+#endif
 #ifdef NERMINER_T_QT
 #include <User_Setups/Setup211_LilyGo_T_QT_Pro_S3.h>         // For the LilyGo T-QT Pro S3 based ESP32S3 with GC9A01 128 x 128 TFT
 #endif

platformio.ini

@@ -10,8 +10,10 @@
 
 [platformio]
 globallib_dir = lib
+
 default_envs = M5Stick-C, esp32cam, ESP32-2432S028R, ESP32_2432S028_2USB, 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
 board = m5stick-c
@@ -29,15 +31,16 @@ build_flags =
 	-D M5STICK_C=1
 	;-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
 	M5StickC
-	Wire
 lib_ignore =
 	TFT_eSPI
+	SD
+	SD_MMC
+	rm67162
 	
 ;--------------------------------------------------------------------
 
@@ -226,6 +229,39 @@ lib_deps =
 
 ;--------------------------------------------------------------------
 
+[env:Lilygo-T-Embed]
+platform = espressif32
+board = esp32-s3-devkitc-1
+framework = arduino
+monitor_filters = 
+	esp32_exception_decoder
+	time
+	log2file
+board_build.arduino.memory_type = qio_opi
+monitor_speed = 115200
+upload_speed = 115200
+# 2 x 4.5MB app, 6.875MB SPIFFS
+;board_build.partitions = large_spiffs_16MB.csv
+;board_build.partitions = default_8MB.csv
+board_build.partitions = huge_app.csv
+;board_build.partitions = default.csv
+build_flags = 
+	-D LV_LVGL_H_INCLUDE_SIMPLE
+	-D BOARD_HAS_PSRAM
+	-D ARDUINO_USB_MODE=1
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D LILYGO_S3_T_EMBED=1
+	;-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/golden-guy/Arduino_wolfssl.git#v5.5.4
+
+;--------------------------------------------------------------------
+
 [env:ESP32-devKitv1]
 platform = espressif32
 board = esp32dev
@@ -504,7 +540,8 @@ board_build.partitions = huge_app.csv
 build_flags = 
 	-D ARDUINO_USB_MODE=1
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D M5_STAMP_S3=1
+	-D ESP32RGB=1
+	-D RGB_LED_PIN=21
 lib_deps = 
 	bblanchon/ArduinoJson@^6.21.2
 	https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2

src/drivers/devices/device.h

@@ -13,6 +13,8 @@
 #include "lilygoS3Amoled.h"
 #elif defined(NERMINER_S3_DONGLE)
 #include "lilygoS3Dongle.h"
+#elif defined(LILYGO_S3_T_EMBED)
+#include "lilygoS3TEmbed.h"
 #elif defined(ESP32_2432S028R)
 #include "esp322432s028r.h"
 #elif defined(ESP32_2432S028_2USB) // For another type of ESP32_2432S028 version with 2 USB connectors
@@ -23,8 +25,6 @@
 #include "lilygoV1TDisplay.h"
 #elif defined(ESP32_CAM)
 #include "esp32CAM.h"
-#elif defined(M5_STAMP_S3)
-#include "m5StampS3.h"
 #elif defined(ESP32RGB)
 #include "esp32RGB.h"
 

src/drivers/devices/lilygoS3TEmbed.h

@@ -0,0 +1,9 @@
+#ifndef _LILYGO_S3_T_EMBED_H
+#define _LILYGO_S3_T_EMBED_H
+
+#define PIN_BUTTON_1 0
+#define PIN_ENABLE5V 46
+
+#define T_DISPLAY
+
+#endif

src/drivers/devices/m5StampS3.h

@@ -1,10 +0,0 @@
-#ifndef _M5_STAMP_S3_H
-#define _M5_STAMP_S3_H
-
-#define PIN_BUTTON_1 0
-#define RGB_LED_PIN 21
-
-#define LED_DISPLAY
-#define USE_LED
-
-#endif

src/drivers/displays/tDisplayDriver.cpp

@@ -20,7 +20,11 @@ TFT_eSprite background = TFT_eSprite(&tft); // Invoke library sprite
 void tDisplay_Init(void)
 {
   tft.init();
+  #ifdef LILYGO_S3_T_EMBED
+  tft.setRotation(3);
+  #else
   tft.setRotation(1);
+  #endif
   tft.setSwapBytes(true);                 // Swap the colour byte order when rendering
   background.createSprite(WIDTH, HEIGHT); // Background Sprite
   background.setSwapBytes(true);