Partial fix suggested by @henrygab

RfidResearchGroup · Nov 11, 2023 · 175c141 · 175c141
1 parent 045a10c
commit 175c141
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
@@ -858,10 +858,11 @@ static void PacketReceived(PacketCommandNG *packet) {
             } PACKED;
             struct p *payload = (struct p *)packet->data.asBytes;
             uint32_t bits;
-            if (payload->realtime)
+            if (payload->realtime) {
                 bits = ReadLF_realtime(true);
-            else
+            } else {
                 bits = SampleLF(payload->verbose, payload->samples, true);
+            }
             reply_ng(CMD_LF_ACQ_RAW_ADC, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
             break;
         }
@@ -892,10 +893,11 @@ static void PacketReceived(PacketCommandNG *packet) {
             } PACKED;
             struct p *payload = (struct p *)packet->data.asBytes;
             uint32_t bits;
-            if (payload->realtime)
+            if (payload->realtime) {
                 bits = ReadLF_realtime(false);
-            else
+            } else {
                 bits = SniffLF(payload->verbose, payload->samples, true);
+            }
             reply_ng(CMD_LF_SNIFF_RAW_ADC, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
             break;
         }

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
@@ -441,8 +441,8 @@ int ReadLF_realtime(bool reader_field) {
     const uint8_t decimation = config.decimation;
 
     uint32_t sample_size = 64;
-    const int8_t size_threshold_table[9] = {0, 64, 64, 48, 64, 40, 48, 56, 64};
-    const int8_t size_threshold = size_threshold_table[decimation];
+    const int8_t size_threshold_table[9] = {0, 64, 64, 60, 64, 60, 60, 56, 64};
+    const int8_t size_threshold = size_threshold_table[bits_per_sample];
 
     // DoAcquisition() start
     uint8_t last_byte = 0;
@@ -500,8 +500,9 @@ int ReadLF_realtime(bool reader_field) {
 
             // write to USB FIFO if byte changed
             curr_byte = data.numbits >> 3;
-            if (curr_byte > last_byte)
+            if (curr_byte > last_byte) {
                 usb_write_byte_async(data.buffer[last_byte]);
+            }
             last_byte = curr_byte;
 
             if(samples.total_saved == size_threshold)

diff --git a/common_arm/usb_cdc.c b/common_arm/usb_cdc.c
@@ -833,8 +833,9 @@ inline bool usb_write_request(void)
     while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP) {};
 
     // can we write?
-    if ((pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0) 
+    if ((pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0) {
         return false;
+    }
 
     // start of transmission
     UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);