initial q1373 support (#595)

shufps · web-flow · commit 7c730f8ea4aa · 2026-05-31T06:03:06.000+02:00
* initial q1373 support
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,6 +41,9 @@ jobs:
           - board: Q1370
             upload_www: false
             label: Q1370
+          - board: Q1373
+            upload_www: false
+            label: Q1373
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -30,6 +30,8 @@ jobs:
             label: NerdQX
           - board: Q1370
             label: Q1370
+          - board: Q1373
+            label: Q1373
 
     steps:
     - name: Checkout repository
diff --git a/components/bm1397/CMakeLists.txt b/components/bm1397/CMakeLists.txt
@@ -4,6 +4,7 @@ SRCS
     "bm1366.cpp"
     "bm1368.cpp"
     "bm1370.cpp"
+    "bm1373.cpp"
     "serial.cpp"
     "crc.cpp"
     "mining_utils.cpp"
diff --git a/components/bm1397/bm1366.cpp b/components/bm1397/bm1366.cpp
@@ -120,10 +120,6 @@ uint8_t BM1366::asicToJobId(uint8_t asic_id) {
     return asic_id & 0xf8;
 }
 
-uint8_t BM1366::nonceToAsicNr(uint32_t nonce) {
-    return (uint8_t) ((nonce & 0x0000fc00) >> 10);
-}
-
 uint16_t BM1366::getSmallCoreCount() {
     return BM1366_SMALL_CORE_COUNT;
 }
diff --git a/components/bm1397/bm1368.cpp b/components/bm1397/bm1368.cpp
@@ -130,10 +130,6 @@ uint8_t BM1368::asicToJobId(uint8_t asic_id) {
     return (asic_id & 0xf0) >> 1;
 }
 
-uint8_t BM1368::nonceToAsicNr(uint32_t nonce) {
-    return (uint8_t) ((nonce & 0x0000fc00) >> 10);
-}
-
 uint16_t BM1368::getSmallCoreCount() {
     return BM1368_SMALL_CORE_COUNT;
 }
diff --git a/components/bm1397/bm1370.cpp b/components/bm1397/bm1370.cpp
@@ -141,13 +141,6 @@ uint8_t BM1370::asicToJobId(uint8_t asic_id) {
     return (asic_id & 0xf0) >> 1;
 }
 
-uint8_t BM1370::nonceToAsicNr(uint32_t nonce) {
-    return (uint8_t) ((nonce & 0x0000fc00) >> 11);
-}
-
-// chipIndexFromAddr and addrFromChipIndex now use base class
-// implementation with m_addressInterval (set during init)
-
 uint16_t BM1370::getSmallCoreCount() {
     return BM1370_SMALL_CORE_COUNT;
 }
diff --git a/components/bm1397/include/asic.h b/components/bm1397/include/asic.h
@@ -124,8 +124,6 @@ class Asic {
     uint32_t vrFreqToReg(uint32_t freq_hz);
     uint32_t vrRegToFreq(uint32_t reg);
 
-    virtual uint8_t nonceToAsicNr(uint32_t nonce) = 0;
-
 public:
     Asic();
     virtual const char* getName() = 0;
diff --git a/components/bm1397/include/bm1366.h b/components/bm1397/include/bm1366.h
@@ -12,7 +12,6 @@ class BM1366 : public Asic {
 
     virtual uint8_t jobToAsicId(uint8_t job_id);
     virtual uint8_t asicToJobId(uint8_t asic_id);
-    virtual uint8_t nonceToAsicNr(uint32_t nonce);
 
 public:
     BM1366();
diff --git a/components/bm1397/include/bm1368.h b/components/bm1397/include/bm1368.h
@@ -12,7 +12,6 @@ class BM1368 : public Asic {
 
     virtual uint8_t jobToAsicId(uint8_t job_id);
     virtual uint8_t asicToJobId(uint8_t asic_id);
-    virtual uint8_t nonceToAsicNr(uint32_t nonce);
 
 public:
     BM1368();
diff --git a/components/bm1397/include/bm1370.h b/components/bm1397/include/bm1370.h
@@ -13,7 +13,6 @@ class BM1370 : public Asic {
     virtual uint8_t jobToAsicId(uint8_t job_id);
     virtual uint8_t asicToJobId(uint8_t asic_id);
 
-    virtual uint8_t nonceToAsicNr(uint32_t nonce);
 public:
     BM1370();
     virtual const char* getName() { return "BM1370"; };
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -16,6 +16,7 @@ SRCS
     "boards/nerdqx.cpp"
     "boards/nerdeko.cpp"
     "boards/q1370.cpp"
+    "boards/q1373.cpp"
     "boards/drivers/EMC2302.cpp"
     "boards/drivers/TMP1075.cpp"
     "boards/drivers/TPS53647.cpp"
diff --git a/main/boards/q1373.cpp b/main/boards/q1373.cpp
@@ -0,0 +1,19 @@
+#include "q1373.h"
+#include "bm1373.h"
+
+Q1373B::Q1373B() : Q1370B()
+{
+    m_deviceModel = "Q1373";
+    m_miningAgent = m_deviceModel;
+    m_asicModel = "BM1373";
+    m_asicCount = 1;
+
+    m_asicFrequencies = {300, 325, 350, 375, 400, 425, 450};
+    m_defaultAsicFrequency = m_asicFrequency = 350;
+    m_defaultAsicVoltageMillis = m_asicVoltageMillis = 1050;
+
+#ifdef Q1373
+    m_theme = new ThemeGeneric();
+#endif
+    m_asics = new BM1373();
+}
diff --git a/main/boards/q1373.h b/main/boards/q1373.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "q1370.h"
+
+class Q1373B : public Q1370B {
+  public:
+    Q1373B();
+};
diff --git a/main/http_server/v2/handler_v2_settings.cpp b/main/http_server/v2/handler_v2_settings.cpp
@@ -215,11 +215,9 @@ esp_err_t PATCH_V2_settings(httpd_req_t *req)
     if (doc["stratumDifficulty"].is<uint32_t>()) {
         Config::setStratumDifficulty(doc["stratumDifficulty"].as<uint32_t>());
     }
-#ifdef VR_FREQUENCY_ENABLED
     if (doc["vrFrequency"].is<uint32_t>()) {
         Config::setVrFrequency(doc["vrFrequency"].as<uint32_t>());
     }
-#endif
 
     // --- display ---
     if (doc["flipScreen"].is<bool>()) {
diff --git a/main/main.cpp b/main/main.cpp
@@ -22,6 +22,7 @@
 #include "boards/nerdqaxeplus2.h"
 #include "boards/nerdqx.h"
 #include "boards/q1370.h"
+#include "boards/q1373.h"
 #include "create_jobs_task.h"
 #include "discord.h"
 #include "global_state.h"
@@ -265,6 +266,9 @@ extern "C" void app_main(void)
 #ifdef Q1370
     Board *board = new Q1370B();
 #endif
+#ifdef Q1373
+    Board *board = new Q1373B();
+#endif
 
     // initialize everything non-asic-specific like
     // fan and serial and load settings from nvs

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,6 @@ uint8_t BM1366::asicToJobId(uint8_t asic_id) {`
`120`	`120`	`return asic_id & 0xf8;`
`121`	`121`	`}`
`122`	`122`
`123`		`-uint8_t BM1366::nonceToAsicNr(uint32_t nonce) {`
`124`		`- return (uint8_t) ((nonce & 0x0000fc00) >> 10);`
`125`		`-}`
`126`		`-`
`127`	`123`	`uint16_t BM1366::getSmallCoreCount() {`
`128`	`124`	`return BM1366_SMALL_CORE_COUNT;`
`129`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,6 @@ uint8_t BM1368::asicToJobId(uint8_t asic_id) {`
`130`	`130`	`return (asic_id & 0xf0) >> 1;`
`131`	`131`	`}`
`132`	`132`
`133`		`-uint8_t BM1368::nonceToAsicNr(uint32_t nonce) {`
`134`		`- return (uint8_t) ((nonce & 0x0000fc00) >> 10);`
`135`		`-}`
`136`		`-`
`137`	`133`	`uint16_t BM1368::getSmallCoreCount() {`
`138`	`134`	`return BM1368_SMALL_CORE_COUNT;`
`139`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,6 @@ uint8_t BM1370::asicToJobId(uint8_t asic_id) {`
`141`	`141`	`return (asic_id & 0xf0) >> 1;`
`142`	`142`	`}`
`143`	`143`
`144`		`-uint8_t BM1370::nonceToAsicNr(uint32_t nonce) {`
`145`		`- return (uint8_t) ((nonce & 0x0000fc00) >> 11);`
`146`		`-}`
`147`		`-`
`148`		`-// chipIndexFromAddr and addrFromChipIndex now use base class`
`149`		`-// implementation with m_addressInterval (set during init)`
`150`		`-`
`151`	`144`	`uint16_t BM1370::getSmallCoreCount() {`
`152`	`145`	`return BM1370_SMALL_CORE_COUNT;`
`153`	`146`	`}`