Merge branch 'master' into version

BitMaker-hub · Apr 10, 2024 · 886f46c · 886f46c
2 parents d0821cf + a8a4eb0
commit 886f46c
Show file tree

Hide file tree

Showing 99 changed files with 20,837 additions and 48 deletions.
diff --git a/3d_files/NerdMinerv2_SecurePins.stl b/3d_files/NerdMinerv2_SecurePins.stl
diff --git a/README.md b/README.md
@@ -48,10 +48,19 @@ Every time an stratum job notification is received miner update its current work
 - LILYGO T-QT pro ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DBQIr43))
 - LILYGO T-Display 1.14 ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DEqGvSJ))
 - LILYGO T-Display S3 AMOLED ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DmOIK6j))
+- LILYGO T-Display S3 AMOLED Touch ([Board Info](https://www.lilygo.cc/products/t-display-s3-amoled?variant=43532279939253))
 - LILYGO T-Dongle S3 ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DmQCPyj))
 - ESP32-2432S028R 2,8" ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DdXkvLv) / Dev support: @nitroxgas / ⚡[email protected])
 - ESP32-cam ([Board Info](https://lastminuteengineers.com/getting-started-with-esp32-cam/) / Dev support: @elmo128)
 - M5-StampS3 ([Aliexpress link\*](https://s.click.aliexpress.com/e/_DevABY3) / Dev support: @gyengus)
+- Wemos Lolin S3 Mini ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/lolin_s3_mini.html))
+- Wemos Lolin S2 Mini ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/lolin_s2_mini.html))
+- Weact S3 Mini ([Board Info](https://github.com/WeActStudio/WeActStudio.ESP32S3-MINI))
+- Weact ESP32-D0WD-V3 ([Board Info](https://github.com/WeActStudio/WeActStudio.ESP32CoreBoard))
+- ESP32-S3 Devkit ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/esp32-s3-devkitm-1.html))
+- ESP32-C3 Devkit ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/esp32-c3-devkitm-1.html))
+- ESP32-C3 Super Mini ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/seeed_xiao_esp32c3.html))
+- Waveshare ESP32-S3-GEEK ([Board Info](https://www.waveshare.com/wiki/ESP32-S3-GEEK))
 
 \*Affiliate links
 

diff --git a/bin/bin ESP32-C3-devKitmv1/0x10000_firmware.bin b/bin/bin ESP32-C3-devKitmv1/0x10000_firmware.bin
diff --git a/bin/bin ESP32-C3-devKitmv1/0x1000_bootloader.bin b/bin/bin ESP32-C3-devKitmv1/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-C3-devKitmv1/0x8000_partitions.bin b/bin/bin ESP32-C3-devKitmv1/0x8000_partitions.bin
diff --git a/bin/bin ESP32-C3-devKitmv1/0xe000_boot_app0.bin b/bin/bin ESP32-C3-devKitmv1/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-C3-super-mini/0x10000_firmware.bin b/bin/bin ESP32-C3-super-mini/0x10000_firmware.bin
diff --git a/bin/bin ESP32-C3-super-mini/0x1000_bootloader.bin b/bin/bin ESP32-C3-super-mini/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-C3-super-mini/0x8000_partitions.bin b/bin/bin ESP32-C3-super-mini/0x8000_partitions.bin
diff --git a/bin/bin ESP32-C3-super-mini/0xe000_boot_app0.bin b/bin/bin ESP32-C3-super-mini/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-D0WD-V3-weact/0x10000_firmware.bin b/bin/bin ESP32-D0WD-V3-weact/0x10000_firmware.bin
diff --git a/bin/bin ESP32-D0WD-V3-weact/0x1000_bootloader.bin b/bin/bin ESP32-D0WD-V3-weact/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-D0WD-V3-weact/0x8000_partitions.bin b/bin/bin ESP32-D0WD-V3-weact/0x8000_partitions.bin
diff --git a/bin/bin ESP32-D0WD-V3-weact/0xe000_boot_app0.bin b/bin/bin ESP32-D0WD-V3-weact/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-S2-mini-wemos/0x10000_firmware.bin b/bin/bin ESP32-S2-mini-wemos/0x10000_firmware.bin
diff --git a/bin/bin ESP32-S2-mini-wemos/0x1000_bootloader.bin b/bin/bin ESP32-S2-mini-wemos/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-S2-mini-wemos/0x8000_partitions.bin b/bin/bin ESP32-S2-mini-wemos/0x8000_partitions.bin
diff --git a/bin/bin ESP32-S2-mini-wemos/0xe000_boot_app0.bin b/bin/bin ESP32-S2-mini-wemos/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-S3-devKitv1/0x10000_firmware.bin b/bin/bin ESP32-S3-devKitv1/0x10000_firmware.bin
diff --git a/bin/bin ESP32-S3-devKitv1/0x1000_bootloader.bin b/bin/bin ESP32-S3-devKitv1/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-S3-devKitv1/0x8000_partitions.bin b/bin/bin ESP32-S3-devKitv1/0x8000_partitions.bin
diff --git a/bin/bin ESP32-S3-devKitv1/0xe000_boot_app0.bin b/bin/bin ESP32-S3-devKitv1/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-S3-mini-weact/0x10000_firmware.bin b/bin/bin ESP32-S3-mini-weact/0x10000_firmware.bin
diff --git a/bin/bin ESP32-S3-mini-weact/0x1000_bootloader.bin b/bin/bin ESP32-S3-mini-weact/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-S3-mini-weact/0x8000_partitions.bin b/bin/bin ESP32-S3-mini-weact/0x8000_partitions.bin
diff --git a/bin/bin ESP32-S3-mini-weact/0xe000_boot_app0.bin b/bin/bin ESP32-S3-mini-weact/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-S3-mini-wemos/0x10000_firmware.bin b/bin/bin ESP32-S3-mini-wemos/0x10000_firmware.bin
diff --git a/bin/bin ESP32-S3-mini-wemos/0x1000_bootloader.bin b/bin/bin ESP32-S3-mini-wemos/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-S3-mini-wemos/0x8000_partitions.bin b/bin/bin ESP32-S3-mini-wemos/0x8000_partitions.bin
diff --git a/bin/bin ESP32-S3-mini-wemos/0xe000_boot_app0.bin b/bin/bin ESP32-S3-mini-wemos/0xe000_boot_app0.bin
diff --git a/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x0000_bootloader.bin b/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x0000_bootloader.bin
diff --git a/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x10000_firmware.bin b/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x10000_firmware.bin
diff --git a/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x8000_partitions.bin b/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0x8000_partitions.bin
diff --git a/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0xe000_boot_app0.bin b/bin/bin LILYGO TDisplay-AMOLED-TOUCH/0xe000_boot_app0.bin
diff --git a/bin/bin Waveshare S3 Geek/0x0000_bootloader.bin b/bin/bin Waveshare S3 Geek/0x0000_bootloader.bin
diff --git a/bin/bin Waveshare S3 Geek/0x10000_firmware.bin b/bin/bin Waveshare S3 Geek/0x10000_firmware.bin
diff --git a/bin/bin Waveshare S3 Geek/0x8000_partitions.bin b/bin/bin Waveshare S3 Geek/0x8000_partitions.bin
diff --git a/bin/bin Waveshare S3 Geek/0xe000_boot_app0.bin b/bin/bin Waveshare S3 Geek/0xe000_boot_app0.bin
diff --git a/boards/lilygo-t-hmi.json b/boards/lilygo-t-hmi.json
@@ -0,0 +1,46 @@
+{
+    "build": {
+      "arduino":{
+        "ldscript": "esp32s3_out.ld",
+        "memory_type": "qio_opi",
+        "partitions": "default_16MB.csv"
+      },
+      "core": "esp32",
+      "extra_flags": [
+        "-DBOARD_HAS_PSRAM",
+        "-DARDUINO_USB_MODE=1"
+      ],
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "hwids": [
+        [
+          "0X303A",
+          "0x1001"
+        ]
+      ],
+      "mcu": "esp32s3",
+      "variant": "esp32s3"
+    },
+    "connectivity": [
+      "wifi",
+      "bluetooth"
+    ],
+    "debug": {
+      "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "LILYGO T-HMI",
+    "upload": {
+      "flash_size": "16MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 16777216,
+      "require_upload_port": true,
+      "speed": 921600
+    },
+    "url": "https://www.adafruit.com/product/5290",
+    "vendor": "LILYGO"
+  }
diff --git a/lib/TFT_eSPI/User_Setup_Select.h b/lib/TFT_eSPI/User_Setup_Select.h
@@ -137,8 +137,9 @@
 #ifdef NERMINER_S3_AMOLED
 #include <User_Setups/Setup206_LilyGo_T_Display_S3.h> //Just a stub. No driver implementation for S3 AMOLED in TFT_eSPI
 #endif
-//#include <User_Setups/Setup207_LilyGo_T_HMI.h>            // For the LilyGo T-HMI S3 based ESP32S3 with ST7789 240 x 320 TFT
-
+#ifdef NERDMINER_T_HMI
+#include <User_Setups/Setup207_LilyGo_T_HMI.h>            // For the LilyGo T-HMI S3 based ESP32S3 with ST7789 240 x 320 TFT
+#endif
 //#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
@@ -154,6 +155,9 @@
 #ifdef ESP32_CAM
 #include <User_Setups/Setup212_ESP32Cam_DongleDisplay.h>      // For the LilyGo T-Dongle S3 based ESP32 with ST7735 80 x 160 TFT
 #endif
+#ifdef NERMINER_S3_GEEK
+#include <User_Setups/Setup303_WaveShare ESP32S3_GEEK.h>            // Setup file for Waveshare Setup303_WaveShare ESP32S3_GEEK with ST7789 135*240 TFT
+#endif
 //#include <User_Setups/Setup301_BW16_ST7735.h>            // Setup file for Bw16-based boards with ST7735 160 x 80 TFT
 
 //#include <User_Setups/SetupX_Template.h>     // Template file for a setup

diff --git a/lib/TFT_eSPI/User_Setups/Setup303_WaveShare ESP32S3_GEEK.h b/lib/TFT_eSPI/User_Setups/Setup303_WaveShare ESP32S3_GEEK.h
@@ -0,0 +1,41 @@
+// ST7789 135 x 240 display
+
+#define USER_SETUP_ID 303
+
+#define ST7789_DRIVER // Configure all registers
+
+#define TFT_WIDTH  135
+#define TFT_HEIGHT 240
+
+#define CGRAM_OFFSET      // Library will add offsets required
+
+#define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
+
+#define TFT_INVERSION_ON
+
+// Generic ESP32 setup
+//#define TFT_MISO 19
+#define TFT_MOSI 11
+#define TFT_SCLK 12
+#define TFT_CS    10
+#define TFT_DC    8
+#define TFT_RST   9
+#define TFT_BL 7
+
+
+#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
+#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
+#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
+#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
+#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:.
+#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
+//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
+#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
+
+#define SMOOTH_FONT
+
+
+// #define SPI_FREQUENCY  27000000
+#define SPI_FREQUENCY  40000000
+
+// #define SUPPORT_TRANSACTIONS
diff --git a/lib/hansolov2/CMakeLists.txt b/lib/hansolov2/CMakeLists.txt
@@ -0,0 +1,21 @@
+SET(SOURCES screens/ui_SplashScreen.c
+    screens/ui_HomeScreen.c
+    screens/ui_StatsScreen.c
+    screens/ui_ClockScreen.c
+    ui.c
+    components/ui_comp_hook.c
+    ui_helpers.c
+    ui_events.c
+    images/ui_img_sky_png.c
+    images/ui_img_1552732429.c
+    images/ui_img_metal2_png.c
+    fonts/ui_font_calculator128.c
+    fonts/ui_font_calculator16.c
+    fonts/ui_font_calculator24.c
+    fonts/ui_font_calculator32.c
+    fonts/ui_font_calculator48.c
+    fonts/ui_font_star24.c
+    fonts/ui_font_star32.c
+    fonts/ui_font_start16.c)
+
+add_library(ui ${SOURCES})
diff --git a/lib/hansolov2/components/ui_comp_hook.c b/lib/hansolov2/components/ui_comp_hook.c
@@ -0,0 +1,5 @@
+// This file was generated by SquareLine Studio
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
+// Project name: nostresp
+
diff --git a/lib/hansolov2/filelist.txt b/lib/hansolov2/filelist.txt
@@ -0,0 +1,19 @@
+screens/ui_SplashScreen.c
+screens/ui_HomeScreen.c
+screens/ui_StatsScreen.c
+screens/ui_ClockScreen.c
+ui.c
+components/ui_comp_hook.c
+ui_helpers.c
+ui_events.c
+images/ui_img_sky_png.c
+images/ui_img_1552732429.c
+images/ui_img_metal2_png.c
+fonts/ui_font_calculator128.c
+fonts/ui_font_calculator16.c
+fonts/ui_font_calculator24.c
+fonts/ui_font_calculator32.c
+fonts/ui_font_calculator48.c
+fonts/ui_font_star24.c
+fonts/ui_font_star32.c
+fonts/ui_font_start16.c