tweaks to debug remove firmware (#21)

matteocrippa · Mar 12, 2024 · a1b8e93 · a1b8e93 · gungriffonbr · Mar 13, 2024
1 parent 934299e
commit a1b8e93
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/.github/scripts/release.sh b/.github/scripts/release.sh
@@ -3,7 +3,7 @@
 file_path="platformio.ini"
 
 # Replace -build_type = debug with build_type = release
-sed 's/build_type = debug/build_type = release/' $file_path > tmpfile && mv tmpfile $file_path
+#sed 's/build_type = debug/build_type = release/' $file_path > tmpfile && mv tmpfile $file_path
 
 # Replace -DLOG_LEVEL=3 with -DLOG_LEVEL=0
-sed 's/-DLOG_LEVEL=3/-DLOG_LEVEL=0/' $file_path > tmpfile && mv tmpfile $file_path
+#sed 's/-DLOG_LEVEL=3/-DLOG_LEVEL=0/' $file_path > tmpfile && mv tmpfile $file_path
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# v0.0.10
+# v0.0.11
 
 - Improved network handling
 
diff --git a/README.md b/README.md
@@ -57,12 +57,12 @@ _Legend_
 
 | Board                                                    | Link                                                         |
 | :------------------------------------------------------- | :----------------------------------------------------------- |
-| [ESP8266](https://s.click.aliexpress.com/e/_EuwffHJ)     | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
-| [GeekMagic SmartTV]()                                    | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
-| [ESP32](https://s.click.aliexpress.com/e/_Ey6AJnT)       | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
-| [ESP32-S2](https://s.click.aliexpress.com/e/_EGJcibR)    | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
-| [ESP32-S3](https://s.click.aliexpress.com/e/_EJbAXyl)    | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
-| [LILYGO-T-S3](https://s.click.aliexpress.com/e/_ExRWk6H) | [0.0.10](https://github.com/matteocrippa/leafminer/releases) |
+| [ESP8266](https://s.click.aliexpress.com/e/_EuwffHJ)     | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
+| [GeekMagic SmartTV]()                                    | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
+| [ESP32](https://s.click.aliexpress.com/e/_Ey6AJnT)       | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
+| [ESP32-S2](https://s.click.aliexpress.com/e/_EGJcibR)    | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
+| [ESP32-S3](https://s.click.aliexpress.com/e/_EJbAXyl)    | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
+| [LILYGO-T-S3](https://s.click.aliexpress.com/e/_ExRWk6H) | [0.0.11](https://github.com/matteocrippa/leafminer/releases) |
 
 - Browse to [ESPWebtool](https://esp.huhn.me/) using a Chrome based browser and follow the instructions.
 

diff --git a/platformio.ini b/platformio.ini
@@ -100,7 +100,6 @@ build_flags =
 	-DBOARD_HAS_PSRAM
 	-DCONFIG_SPIRAM_CACHE_WORKAROUND
 	-DCORE_DEBUG_LEVEL=0
-	-mfix-esp32-psram-cache-issue
 	-fexceptions
 
 [env:esp32-s2]

diff --git a/src/leafminer.h b/src/leafminer.h
@@ -1,7 +1,7 @@
 #ifndef LEAFMINER_H
 #define LEAFMINER_H
 
-#define _VERSION "0.0.10"
+#define _VERSION "0.0.11"
 #define DIFFICULTY 1e-4
 
 // Mining

diff --git a/src/main.cpp b/src/main.cpp
@@ -29,8 +29,8 @@ bool force_ap = false;
 void setup()
 {
   Serial.begin(115200);
-  delay(1000);
-  l_info(TAG_MAIN, "LeafMiner - v.%s", _VERSION);
+  delay(1500);
+  l_info(TAG_MAIN, "LeafMiner - v.%s - (C: %d)", _VERSION, CORE);
 
 #if defined(ESP8266)
   l_info(TAG_MAIN, "ESP8266 - Disable WDT");

diff --git a/src/miner/nerdSHA256plus.h b/src/miner/nerdSHA256plus.h
@@ -27,8 +27,8 @@
 
 struct nerdSHA256_context
 {
-    MEM_ALIGN_4 uint8_t buffer[NERD_SHA256_BLOCK_SIZE];
-    MEM_ALIGN_32 uint32_t digest[8];
+    uint8_t buffer[NERD_SHA256_BLOCK_SIZE];
+    uint32_t digest[8];
 };
 
 /* Calculate midstate */

diff --git a/src/screen/screen.cpp b/src/screen/screen.cpp
@@ -52,7 +52,6 @@ void screen_loop()
 {
   if (!screen_enabled)
   {
-    l_info(TAG_SCREEN, "Screen disabled");
     return;
   }
 

diff --git a/src/utils/platform.h b/src/utils/platform.h
@@ -5,13 +5,9 @@
 #if defined(ESP32)
 #define MEM_ATTR DRAM_ATTR
 #define RAM_ATTR IRAM_ATTR
-#define MEM_ALIGN_32 alignas(32)
-#define MEM_ALIGN_4 alignas(4)
 #else
 #define MEM_ATTR
 #define RAM_ATTR
-#define MEM_ALIGN_32
-#define MEM_ALIGN_4
 #endif
 
 // Core auto configuration

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "current": "0.0.10",
+  "current": "0.0.11",
   "link": "https://github.com/matteocrippa/leafminer/releases/download/v{{version}}/firmware_{{device}}.bin",
   "devices": [
     "esp8266",
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,6 @@ void screen_loop() @@
     {
       if (!screen_enabled)
       {
-        l_info(TAG_SCREEN, "Screen disabled");
         return;
       }
@@ Expand Down @@