Q1370 (#582)

* initial q1370 support
* show active protocol on dashboard
* cleaned up weird dashboard isystem struct default values
* removed fan-guessing artifact code
* can related changes

---------

Co-authored-by: Pmaxsd <pmaxsd80@gmail.com>

Author: shufps

.github/workflows/build.yml

@@ -6,6 +6,8 @@ on:
 jobs:
   build-and-release:
     runs-on: ubuntu-latest
+    env:
+      RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
     strategy:
       matrix:
         include:
@@ -36,6 +38,9 @@ jobs:
           - board: NERDQX
             upload_www: false
             label: NerdQX
+          - board: Q1370
+            upload_www: false
+            label: Q1370
 
     steps:
     - name: Checkout repository
@@ -125,14 +130,6 @@ jobs:
         path: esp-miner-factory-${{ matrix.label }}-${{ env.VERSION_TAG }}.bin
         retention-days: 7
 
-    - name: Upload ELF for crash analysis
-      if: env.RELEASE_EXISTS == 'false'
-      uses: actions/upload-artifact@v4
-      with:
-        name: esp-miner-${{ matrix.label }}.elf
-        path: build/esp-miner-${{ matrix.label }}.elf
-        retention-days: 7
-
     - name: Upload BIN firmware
       if: env.RELEASE_EXISTS == 'false'
       uses: actions/upload-artifact@v4
@@ -161,7 +158,9 @@ jobs:
 
     - name: Set files variable
       id: set_files_var
-      run: echo "files=$(cat file_list.txt | tr '\n' ',')" >> $GITHUB_ENV
+      run: |
+        echo "files=$(grep -v '\.elf$' file_list.txt | tr '\n' ',')" >> $GITHUB_ENV
+        echo "r2_files=$(cat file_list.txt | tr '\n' ',')" >> $GITHUB_ENV
 
     # Skip release upload if no release exists
     - name: Skip release upload if not tagged
@@ -178,21 +177,21 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install rclone
+      if: env.RCLONE_CONF != ''
       run: |
         curl -fsSL https://rclone.org/install.sh | sudo bash
 
     - name: Upload to Cloudflare R2 using rclone
-      env:
-        RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
+      if: env.RCLONE_CONF != ''
       run: |
         mkdir -p ~/.config/rclone
         echo "$RCLONE_CONF" > ~/.config/rclone/rclone.conf
 
         TARGET_DIR="webflasher/${{ env.VERSION_TAG }}"
 
-        while read file; do
+        echo "$r2_files" | tr ',' '\n' | grep -v '^$' | while read file; do
           rclone copyto "$file" "r2:${TARGET_DIR}/$(basename "$file")" --s3-acl public-read
-        done < file_list.txt
+        done
 
     outputs:
       release_exists: ${{ env.RELEASE_EXISTS }}

.github/workflows/validate.yml

@@ -28,6 +28,9 @@ jobs:
             label: NerdEKO
           - board: NERDQX
             label: NerdQX
+          - board: Q1370
+            label: Q1370
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3

components/bm1397/asic.cpp

@@ -19,18 +19,6 @@ typedef enum
 } packet_type_t;
 
 
-typedef struct __attribute__((__packed__))
-{
-    uint8_t job_id;
-    uint8_t num_midstates;
-    uint8_t starting_nonce[4];
-    uint8_t nbits[4];
-    uint8_t ntime[4];
-    uint8_t merkle_root[32];
-    uint8_t prev_block_hash[32];
-    uint8_t version[4];
-} BM1368_job;
-
 const static char* TAG = "asic";
 
 Asic::Asic() {
@@ -347,6 +335,11 @@ uint8_t Asic::sendWork(uint32_t job_id, bm_job *next_bm_job)
     return job.job_id;
 }
 
+void Asic::sendRawJob(BM1368_job *job)
+{
+    send((TYPE_JOB | GROUP_SINGLE | CMD_WRITE), (uint8_t*) job, sizeof(BM1368_job));
+}
+
 bool Asic::receiveWork(asic_result_t *result)
 {
     // wait for a response, wait time is pretty arbitrary

components/bm1397/include/asic.h

@@ -2,6 +2,18 @@
 
 #include "mining.h"
 
+typedef struct __attribute__((__packed__))
+{
+    uint8_t job_id;
+    uint8_t num_midstates;
+    uint8_t starting_nonce[4];
+    uint8_t nbits[4];
+    uint8_t ntime[4];
+    uint8_t merkle_root[32];
+    uint8_t prev_block_hash[32];
+    uint8_t version[4];
+} BM1368_job;
+
 #define CRC5_MASK 0x1F
 
 // debug serial
@@ -118,6 +130,7 @@ class Asic {
     Asic();
     virtual const char* getName() = 0;
     uint8_t sendWork(uint32_t job_id, bm_job *next_bm_job);
+    void sendRawJob(BM1368_job *job);
     bool processWork(task_result *result);
     void setJobDifficultyMask(int difficulty);
     bool setAsicFrequency(float frequency);