Merge branch 'master' into hex_v302

skot · Feb 25, 2024 · e561f60 · e561f60
2 parents 87eb3d4 + 69e3c4b
commit e561f60
Show file tree

Hide file tree

Showing 76 changed files with 11,950 additions and 3,570 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,4 +24,4 @@
     ],
     "idf.port": "/dev/cu.usbmodem1434301",
     "C_Cpp.intelliSenseEngine": "Tag Parser"
-}
+}
diff --git a/components/bm1397/CMakeLists.txt b/components/bm1397/CMakeLists.txt
@@ -1,5 +1,6 @@
 idf_component_register(
 SRCS 
+    "bm1368.c"
     "bm1366.c"
     "bm1397.c" 
     "serial.c"  

diff --git a/components/bm1397/bm1366.c b/components/bm1397/bm1366.c
@@ -179,7 +179,7 @@ void BM1366_send_hash_frequency(float target_freq)
         }
     }
 
-    _send_BM1366((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, true);
+    _send_BM1366((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, false);
 
     ESP_LOGI(TAG, "Setting Frequency to %.2fMHz (%.2f)", target_freq, newf);
 }
@@ -665,7 +665,7 @@ asic_result * BM1366_receive_work(void)
     return SERIAL_rx_aa55(asic_response_buffer, 11);
 }
 
-uint16_t reverse_uint16(uint16_t num)
+static uint16_t reverse_uint16(uint16_t num)
 {
     return (num >> 8) | (num << 8);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ @@
         ],
         "idf.port": "/dev/cu.usbmodem1434301",
         "C_Cpp.intelliSenseEngine": "Tag Parser"
-    }
+    }