From 9d3d954cc96685f7a350483b3642893c8220cfeb Mon Sep 17 00:00:00 2001 From: sany3001 Date: Fri, 29 Dec 2023 07:30:50 +0100 Subject: [PATCH 1/8] Adding note about effect of missing BTC address --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e60d13f..972a83e 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ Update NerdMiner firmware following same flashing steps but only using the file ## NerdMiner configuration After programming, you will only need to setup your Wifi and BTC address. +Note: when BTC address of your selected wallet is not provided, mining will not be started. #### Wifi Accesspoint From ae8eb9c44c0168028833fec54f23af8a030bafd2 Mon Sep 17 00:00:00 2001 From: sany3001 Date: Fri, 29 Dec 2023 07:31:08 +0100 Subject: [PATCH 2/8] Adding formatting to JSON code --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 972a83e..1754012 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ Note: when BTC address of your selected wallet is not provided, mining will not 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", @@ -100,6 +101,7 @@ Note: when BTC address of your selected wallet is not provided, mining will not "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. 1. Power down to remove the SD card. It is not needed for mining. From a349da9302ab0cb66969235f2de33a269552587d Mon Sep 17 00:00:00 2001 From: sany3001 Date: Fri, 29 Dec 2023 07:45:16 +0100 Subject: [PATCH 3/8] Adding new line for better formatting --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1754012..ab6618b 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ Update NerdMiner firmware following same flashing steps but only using the file ## NerdMiner configuration After programming, you will only need to setup your Wifi and BTC address. + Note: when BTC address of your selected wallet is not provided, mining will not be started. #### Wifi Accesspoint From 04de3c0c841b7544c64c8bf69a69a02ff65c102e Mon Sep 17 00:00:00 2001 From: ToTo Date: Sun, 31 Dec 2023 09:37:25 +0200 Subject: [PATCH 4/8] Cleaned up libs --- platformio.ini | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1645c50..730e35d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,10 +7,11 @@ ; ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html +; 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 [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 [env:M5Stick-C] platform = espressif32 @@ -29,16 +30,17 @@ 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 + ;-------------------------------------------------------------------- [env:ESP32-S3-mini-wemos] From 072d306161f5720cb0d3a1417569072a6aa6517e Mon Sep 17 00:00:00 2001 From: Nilson Santos Date: Wed, 10 Jan 2024 16:21:08 -0300 Subject: [PATCH 5/8] Add support Lilygo T-Embed board --- lib/TFT_eSPI/User_Setup_Select.h | 4 +++- platformio.ini | 35 +++++++++++++++++++++++++++- src/drivers/devices/device.h | 2 ++ src/drivers/devices/lilygoS3TEmbed.h | 10 ++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 src/drivers/devices/lilygoS3TEmbed.h diff --git a/lib/TFT_eSPI/User_Setup_Select.h b/lib/TFT_eSPI/User_Setup_Select.h index 2ebed60..a96ff51 100644 --- a/lib/TFT_eSPI/User_Setup_Select.h +++ b/lib/TFT_eSPI/User_Setup_Select.h @@ -142,7 +142,9 @@ //#include // For the ESP32 S3 Box Lite (may also work with ESP32 S3 Box) //#include // For the LilyGo T-Dongle S3 based ESP32 with ST7735 80 x 160 TFT -// #include // For the LilyGo T-Embed S3 based ESP32S3 with ST7789 170 x 320 TFT +#ifdef LILYGO_S3_T_EMBED +#include // For the LilyGo T-Embed S3 based ESP32S3 with ST7789 170 x 320 TFT +#endif #ifdef NERMINER_T_QT #include // For the LilyGo T-QT Pro S3 based ESP32S3 with GC9A01 128 x 128 TFT #endif diff --git a/platformio.ini b/platformio.ini index dace0bb..ac47948 100644 --- a/platformio.ini +++ b/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, ESP32-C3-devKitmv1, ESP32-C3-super-mini +default_envs = M5Stick-C, esp32cam, ESP32-2432S028R, NerminerV2, Lilygo-T-Embed, 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 @@ -226,6 +226,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 diff --git a/src/drivers/devices/device.h b/src/drivers/devices/device.h index ddc45c6..bf291b7 100644 --- a/src/drivers/devices/device.h +++ b/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(NERMINER_T_QT) diff --git a/src/drivers/devices/lilygoS3TEmbed.h b/src/drivers/devices/lilygoS3TEmbed.h new file mode 100644 index 0000000..1214c97 --- /dev/null +++ b/src/drivers/devices/lilygoS3TEmbed.h @@ -0,0 +1,10 @@ +#ifndef _LILYGO_S3_T_EMBED_H +#define _LILYGO_S3_T_EMBED_H + +#define PIN_BUTTON_1 0 +// #define PIN_BUTTON_2 14 +#define PIN_ENABLE5V 46 + +#define T_DISPLAY + +#endif \ No newline at end of file From 8f0e4ff7e01320d16df0b91418a995bbdbe173eb Mon Sep 17 00:00:00 2001 From: Nilson Santos Date: Wed, 10 Jan 2024 17:36:20 -0300 Subject: [PATCH 6/8] Add support Lilygo T-Embed board --- src/drivers/devices/lilygoS3TEmbed.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/drivers/devices/lilygoS3TEmbed.h b/src/drivers/devices/lilygoS3TEmbed.h index 1214c97..3b774b9 100644 --- a/src/drivers/devices/lilygoS3TEmbed.h +++ b/src/drivers/devices/lilygoS3TEmbed.h @@ -2,7 +2,6 @@ #define _LILYGO_S3_T_EMBED_H #define PIN_BUTTON_1 0 -// #define PIN_BUTTON_2 14 #define PIN_ENABLE5V 46 #define T_DISPLAY From 26940925892f819494e8ee6770b7e09cdf71139d Mon Sep 17 00:00:00 2001 From: Nilson Santos Date: Wed, 10 Jan 2024 19:10:08 -0300 Subject: [PATCH 7/8] Rotate the screen so the USB connector is on the right if the board is T-Embed --- src/drivers/displays/tDisplayDriver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/drivers/displays/tDisplayDriver.cpp b/src/drivers/displays/tDisplayDriver.cpp index c13d966..e78d00d 100644 --- a/src/drivers/displays/tDisplayDriver.cpp +++ b/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); From 6410e8a01dfce7fb43cefc967cdd74f467346ed7 Mon Sep 17 00:00:00 2001 From: Julio MATARRANZ Date: Sun, 31 Dec 2023 11:16:12 +0100 Subject: [PATCH 8/8] fix #264 RGB with generic ESP32RGB.h --- platformio.ini | 3 ++- src/drivers/devices/device.h | 2 -- src/drivers/devices/m5StampS3.h | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 src/drivers/devices/m5StampS3.h diff --git a/platformio.ini b/platformio.ini index dace0bb..b403edd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -454,7 +454,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 diff --git a/src/drivers/devices/device.h b/src/drivers/devices/device.h index ddc45c6..bd6b759 100644 --- a/src/drivers/devices/device.h +++ b/src/drivers/devices/device.h @@ -21,8 +21,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" diff --git a/src/drivers/devices/m5StampS3.h b/src/drivers/devices/m5StampS3.h deleted file mode 100644 index fd09fca..0000000 --- a/src/drivers/devices/m5StampS3.h +++ /dev/null @@ -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