Merge branch 'master' into dev

BitMaker-hub · Jun 10, 2024 · 865bf4f · 865bf4f
2 parents f75fd09 + f174d62
commit 865bf4f
Show file tree

Hide file tree

Showing 41 changed files with 392 additions and 174 deletions.
diff --git a/README.md b/README.md
@@ -143,9 +143,8 @@ Recommended low difficulty share pools:
 | Pool URL          | Port  | Web URL                    | Status                                                             |
 | ----------------- | ----- | -------------------------- | ------------------------------------------------------------------ |
 | public-pool.io    | 21496 | https://web.public-pool.io | Open Source Solo Bitcoin Mining Pool supporting open source miners |
-| nerdminers.org    |       | https://nerdminers.org     | Team domain for future pool - Currently pointing to public-pool.io |
+| pool.nerdminers.org    | 3333  | https://nerdminers.org     | The official Nerdminer pool site - Mantained by @golden-guy |
 | pool.nerdminer.io | 3333  | https://nerdminer.io       | Mantained by CHMEX                                                 |
-| pool.vkbit.com    | 3333  | https://vkbit.com/         | Mantained by djerfy - public-pool fork                             |
 | pool.pyblock.xyz  | 3333  | https://pool.pyblock.xyz/  | Mantained by curly60e                                              |
 | pool.sethforprivacy.com  | 3333  | https://pool.sethforprivacy.com/  | Mantained by @sethforprivacy - public-pool fork      |
 

diff --git a/bin/bin DUO/DUO_A/0x0000_bootloader.bin b/bin/bin DUO/DUO_A/0x0000_bootloader.bin
diff --git a/bin/bin DUO/DUO_A/0x10000_firmware.bin b/bin/bin DUO/DUO_A/0x10000_firmware.bin
diff --git a/...el1/0x8000_NerdMinerV2.ino.partitions.bin → bin/bin DUO/DUO_A/0x8000_partitions.bin b/...el1/0x8000_NerdMinerV2.ino.partitions.bin → bin/bin DUO/DUO_A/0x8000_partitions.bin
diff --git a/bin/bin DUO/DUO_A/0xe000_boot_app0.bin b/bin/bin DUO/DUO_A/0xe000_boot_app0.bin
diff --git a/bin/bin DUO/DUO_B/0x0000_bootloader.bin b/bin/bin DUO/DUO_B/0x0000_bootloader.bin
diff --git a/bin/bin DUO/DUO_B/0x10000_firmware.bin b/bin/bin DUO/DUO_B/0x10000_firmware.bin
diff --git a/bin/bin DUO/DUO_B/0x8000_partitions.bin b/bin/bin DUO/DUO_B/0x8000_partitions.bin
diff --git a/bin/bin DUO/DUO_B/0xe000_boot_app0.bin b/bin/bin DUO/DUO_B/0xe000_boot_app0.bin
diff --git a/bin/bin ESP32-devKit- no pass/0x10000_firmware.bin b/bin/bin ESP32-devKit- no pass/0x10000_firmware.bin
diff --git a/bin/bin ESP32-devKit- no pass/0x1000_bootloader.bin b/bin/bin ESP32-devKit- no pass/0x1000_bootloader.bin
diff --git a/bin/bin ESP32-devKit- no pass/0x8000_partitions.bin b/bin/bin ESP32-devKit- no pass/0x8000_partitions.bin
diff --git a/bin/bin ESP32-devKit- no pass/0xe000_boot_app0.bin b/bin/bin ESP32-devKit- no pass/0xe000_boot_app0.bin
diff --git a/bin/bin LYLYGO TDisplay S3 - no pass/0x0000_bootloader.bin b/bin/bin LYLYGO TDisplay S3 - no pass/0x0000_bootloader.bin
diff --git a/bin/bin LYLYGO TDisplay S3 - no pass/0x10000_firmware.bin b/bin/bin LYLYGO TDisplay S3 - no pass/0x10000_firmware.bin
diff --git a/bin/bin LYLYGO TDisplay S3 - no pass/0x8000_partitions.bin b/bin/bin LYLYGO TDisplay S3 - no pass/0x8000_partitions.bin
diff --git a/bin/bin LYLYGO TDisplay S3 - no pass/0xe000_boot_app0.bin b/bin/bin LYLYGO TDisplay S3 - no pass/0xe000_boot_app0.bin
diff --git a/bin/flash_download_tool_3.9.3/configure/esp32/spi_download.conf b/bin/flash_download_tool_3.9.3/configure/esp32/spi_download.conf
@@ -4,16 +4,16 @@ efuse_err_halt = 1
 
 [DOWNLOAD PATH]
 file_sel0 = 1
-file_path0 = C:\Users\RogerPC\Desktop\CRYPTO\BITMAKER\Projectes\EN CURSO\SEEDER\Seeder\bin\0xe000_boot_app0.bin
-file_offset0 = 0xe000
+file_path0 = C:\Users\RogerPC\Desktop\BITMAKER\BITMAKER\Projectes\EN CURSO\NERDMINERv2\NerdMinerV2\bin\bin ESP32-devKit- no pass\0x1000_bootloader.bin
+file_offset0 = 0x1000
 file_sel1 = 1
-file_path1 = C:\Users\RogerPC\Desktop\CRYPTO\BITMAKER\Projectes\EN CURSO\SEEDER\Seeder\bin\0x1000_bootloader_qio_80m.bin
-file_offset1 = 0x1000
+file_path1 = C:\Users\RogerPC\Desktop\BITMAKER\BITMAKER\Projectes\EN CURSO\NERDMINERv2\NerdMinerV2\bin\bin ESP32-devKit- no pass\0xe000_boot_app0.bin
+file_offset1 = 0xe000
 file_sel2 = 1
-file_path2 = C:\Users\RogerPC\Desktop\CRYPTO\BITMAKER\Projectes\EN CURSO\SEEDER\Seeder\bin\0x8000_Seeder.ino.partitions.bin
+file_path2 = C:\Users\RogerPC\Desktop\BITMAKER\BITMAKER\Projectes\EN CURSO\NERDMINERv2\NerdMinerV2\bin\bin ESP32-devKit- no pass\0x8000_partitions.bin
 file_offset2 = 0x8000
 file_sel3 = 1
-file_path3 = C:\Users\RogerPC\Desktop\CRYPTO\BITMAKER\Projectes\EN CURSO\SEEDER\Seeder\bin\0x10000_Seeder.ino.bin
+file_path3 = C:\Users\RogerPC\Desktop\BITMAKER\BITMAKER\Projectes\EN CURSO\NERDMINERv2\NerdMinerV2\bin\bin ESP32-devKit- no pass\0x10000_firmware.bin
 file_offset3 = 0x10000
 file_sel4 = 0
 file_path4 = 
@@ -45,12 +45,12 @@ file_offset12 =
 file_sel13 = 0
 file_path13 = 
 file_offset13 = 
-default_path = C:\Users\RogerPC\Desktop\CRYPTO\BITMAKER\Projectes\EN CURSO\SEEDER\Seeder\bin
+default_path = C:\Users\RogerPC\Desktop\BITMAKER\BITMAKER\Projectes\EN CURSO\NERDMINERv2\NerdMinerV2\bin\bin ESP32-devKit- no pass
 
 [FLASH_CRYSTAL]
 spicfgdis = 0
 spispeed = 3
-spimode = 0
+spimode = 2
 
 [MAC SAVE]
 mac_save_enable = False
@@ -84,7 +84,7 @@ flash_write_size = 1024
 
 [DOWNLOAD]
 autostart1 = 0
-com_port1 = COM4
+com_port1 = COM157
 baudrate1 = 4
 checkmac1 = 1
 erase_flash_en = True

diff --git a/...lash_download_tool_3.9.3/dl_temp/_temp_by_dltool/downloadPanel1/0x1000_bootloader.bin_rep b/...lash_download_tool_3.9.3/dl_temp/_temp_by_dltool/downloadPanel1/0x1000_bootloader.bin_rep
diff --git a/...nload_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x0000_NerdMinerV2.ino.bootloader.bin_rep b/...nload_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x0000_NerdMinerV2.ino.bootloader.bin_rep
diff --git a/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x10000_NerdMinerV2.ino.bin b/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x10000_NerdMinerV2.ino.bin
diff --git a/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x10000_firmware.bin b/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x10000_firmware.bin
diff --git a/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x1000_bootloader.bin_rep b/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x1000_bootloader.bin_rep
diff --git a/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x8000_partitions.bin b/bin/flash_download_tool_3.9.3/dl_temp/bin_tmp/downloadPanel1/0x8000_partitions.bin
diff --git a/platformio.ini b/platformio.ini
@@ -462,14 +462,17 @@ monitor_filters =
 	esp32_exception_decoder
 	time
 	log2file
-board_build.arduino.memory_type = qio_opi
+# Commenting out 'board_build.arduino.memory_type' fixes missing 'sdkconfig.h' errors:
+;board_build.arduino.memory_type = qio_opi
 monitor_speed = 115200
 upload_speed = 115200
 # 2 x 4.5MB app, 6.875MB SPIFFS
 board_build.partitions = huge_app.csv
 build_flags = 
 	;-D DEBUG_MINING=1
-	-D TDISPLAY=1
+  	# Switching from 'TDISPLAY' to 'NERDMINER_T_DISPLAY_V1' fixes font related compile errors
+	;-D TDISPLAY=1
+	-D NERDMINER_T_DISPLAY_V1=1
 lib_deps = 
 	https://github.com/takkaO/OpenFontRender#v1.2
 	bblanchon/ArduinoJson@^6.21.5
@@ -685,6 +688,11 @@ platform = [email protected]
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
+monitor_filters = 
+	esp32_exception_decoder
+	time	
+	colorize
+	;debug
 upload_speed = 921600
 ;build_type = debug
 board_build.partitions = huge_app.csv
@@ -714,6 +722,7 @@ build_flags =
 	-DSPI_FREQUENCY=55000000
 	-DSPI_READ_FREQUENCY=20000000
 	-DSPI_TOUCH_FREQUENCY=2500000
+
 lib_deps = 
 	https://github.com/takkaO/OpenFontRender#v1.2
 	bblanchon/ArduinoJson@^6.21.5

diff --git a/src/NerdMinerV2.ino.cpp b/src/NerdMinerV2.ino.cpp
@@ -115,8 +115,12 @@ void setup()
 
   /******** CREATE STRATUM TASK *****/
   sprintf(name, "(%s)", "Stratum");
+ #ifdef ESP32_2432S028R
+ // Free a little bit of the heap to the screen
+  BaseType_t res2 = xTaskCreatePinnedToCore(runStratumWorker, "Stratum", 13500, (void*)name, 3, NULL,1);
+ #else
   BaseType_t res2 = xTaskCreatePinnedToCore(runStratumWorker, "Stratum", 15000, (void*)name, 3, NULL,1);
-
+ #endif
 
   /******** CREATE MINER TASKS *****/
   //for (size_t i = 0; i < THREADS; i++) {

diff --git a/src/drivers/devices/esp322432s028r.h b/src/drivers/devices/esp322432s028r.h
@@ -3,9 +3,22 @@
 
 #define PIN_BUTTON_1 0
 //#define PIN_BUTTON_2 22  // Not used
-#define PIN_ENABLE5V 21  // Not used
+// #define PIN_ENABLE5V 21  // Not used
 #define LED_PIN      4   // Red pin
-#define LED_PIN_G    17  // Green pin
+#define LED_PIN_G    16  // Green pin
+#define LED_PIN_B    17  // Green pin
+
+// Pin defines for the SD card interface
+// This is working for both, ESP32 2432S028R and ESP 2432S028_2USB boards 
+// --------------------------------------
+// use SPI interface
+// (default SPI unit provided by <SPI.h>)
+// setup SPI pins.
+
+#define SDSPI_CS    5
+#define SDSPI_CLK   18
+#define SDSPI_MOSI  23
+#define SDSPI_MISO  19
 
 // Pin defines for the SD card interface
 // This is working for both, ESP32 2432S028R and ESP 2432S028_2USB boards