Diff: main.cpp

Revision:

20:b11592c9ba5f

Parent:

19:be8a8b0e7320

Child:

21:b84a77dfb43c

--- a/main.cpp	Tue Aug 02 15:36:51 2016 -0700
+++ b/main.cpp	Wed Aug 31 23:55:27 2016 +0000
@@ -26,6 +26,10 @@
 
 bool ook_test_en;
 bool poll_irq_en;
+volatile RegIrqFlags2_t fsk_RegIrqFlags2_prev;
+volatile RegIrqFlags1_t fsk_RegIrqFlags1_prev;
+Timer rx_start_timer;
+uint32_t secs_rx_start;
 
 /***************************** eiger per: *************************************************/
 
@@ -65,6 +69,8 @@
 
 #define FSK_RSSI_OFFSET         0
 #define FSK_RSSI_SMOOTHING      2
+DigitalIn dio2(LORA_DIO2);
+DigitalIn dio4(LORA_DIO4);
 
 #else   /********************* ...mDot **********************/
 
@@ -82,6 +88,7 @@
 #endif
 
 DigitalIn dio2(D4);
+DigitalIn dio4(D8);
 
 void rfsw_callback()
 {
@@ -107,6 +114,8 @@
 SX127x_lora lora(radio);
 //Kermit kermit(lora);
 
+volatile bool saved_dio4;
+
 void printLoraIrqs_(bool clear)
 {
     //in radio class -- RegIrqFlags_t RegIrqFlags;
@@ -906,7 +915,11 @@
     } else {
         float pmax = (0.6*radio.RegPaConfig.bits.MaxPower) + 10.8;
         float output_dBm = pmax - (15-radio.RegPaConfig.bits.OutputPower);
+#ifdef TARGET_MTS_MDOT_F411RE
+        printf(" \x1b[31mRFO pmax=%.1fdBm OutputPower=%.1fdBm\x1b[0m", pmax, output_dBm);  // not connected
+#else
         printf(" RFO pmax=%.1fdBm OutputPower=%.1fdBm", pmax, output_dBm);
+#endif
     }
 }
 
@@ -941,8 +954,12 @@
         printf("PER device ID:%d\r\n", per_id);
     }    
     
-    if (poll_irq_en)
+    if (poll_irq_en) {
         printf("poll_irq_en\r\n");
+        if (!radio.RegOpMode.bits.LongRangeMode) {
+            printf("saved irqs: %02x %02x\r\n", fsk_RegIrqFlags1_prev.octet, fsk_RegIrqFlags2_prev.octet);
+        }
+    }
 
 }
 
@@ -998,7 +1015,7 @@
         } else {    // fsk..
             //fsk_tx_length = 9;
         }
-        PacketRxSequencePrev = -1;
+        PacketRxSequencePrev = 0; // transmitter side PacketTxCnt is 1 at first TX
         //PacketRxSequence = 0;
         PacketPerKoCnt = 0;
         PacketPerOkCnt = 0;
@@ -1153,20 +1170,192 @@
     lora.start_tx(lora.RegPayloadLength);
 }
 
+  
 void
 poll_service_radio()
 {
     if (radio.RegOpMode.bits.LongRangeMode) {
     } else { // fsk:
-        RegIrqFlags2_t RegIrqFlags2;
+        /*RegIrqFlags2_t RegIrqFlags2;
         if (radio.RegOpMode.bits.Mode == RF_OPMODE_TRANSMITTER) {
             RegIrqFlags2.octet = radio.read_reg(REG_FSK_IRQFLAGS2);
             if (RegIrqFlags2.bits.PacketSent) {
                 radio.set_opmode(RF_OPMODE_SLEEP);
                 printf("poll mode fsk tx done\r\n");
             }
-        }
-    } // ..fsk
+        }*/
+        static uint8_t rssi;    
+        RegIrqFlags2_t RegIrqFlags2;
+        RegIrqFlags1_t RegIrqFlags1;
+        RegIrqFlags1.octet = radio.read_reg(REG_FSK_IRQFLAGS1);
+        if (RegIrqFlags1.octet != fsk_RegIrqFlags1_prev.octet) {
+            printf("iF1:");
+            if (RegIrqFlags1.bits.ModeReady ^ fsk_RegIrqFlags1_prev.bits.ModeReady) {
+                printf("ModeReady-");
+                if (RegIrqFlags1.bits.ModeReady)
+                    printf("on ");
+                else
+                    printf("off ");
+            }
+            if (RegIrqFlags1.bits.RxReady ^ fsk_RegIrqFlags1_prev.bits.RxReady) {
+                printf("RxReady-");
+                if (RegIrqFlags1.bits.RxReady)
+                    printf("on ");
+                else
+                    printf("off ");
+            }
+            if (RegIrqFlags1.bits.TxReady ^ fsk_RegIrqFlags1_prev.bits.TxReady) {
+                printf("TxReady-");
+                if (RegIrqFlags1.bits.TxReady)
+                    printf("on ");
+                else
+                    printf("off ");                
+            }
+            if (RegIrqFlags1.bits.PllLock ^ fsk_RegIrqFlags1_prev.bits.PllLock) {
+                printf("PllLock-");
+                if (RegIrqFlags1.bits.PllLock)
+                    printf("on ");
+                else
+                    printf("off ");                    
+            }
+            if (RegIrqFlags1.bits.Rssi ^ fsk_RegIrqFlags1_prev.bits.Rssi) {
+                printf("Rssi-");
+                if (RegIrqFlags1.bits.Rssi)
+                    printf("on ");
+                else
+                    printf("off ");                   
+            }
+            if (RegIrqFlags1.bits.Timeout ^ fsk_RegIrqFlags1_prev.bits.Timeout) {
+                printf("Timeout-");
+                if (RegIrqFlags1.bits.Timeout)
+                    printf("on ");
+                else
+                    printf("off ");                   
+            }
+            if (RegIrqFlags1.bits.PreambleDetect ^ fsk_RegIrqFlags1_prev.bits.PreambleDetect) {
+                printf("PreambleDetect-");
+                if (RegIrqFlags1.bits.PreambleDetect)
+                    printf("on ");
+                else
+                    printf("off ");                   
+            }
+            if (RegIrqFlags1.bits.SyncAddressMatch ^ fsk_RegIrqFlags1_prev.bits.SyncAddressMatch) {
+                printf("SyncAddressMatch-");
+                if (RegIrqFlags1.bits.SyncAddressMatch)
+                    printf("on ");
+                else
+                    printf("off ");                   
+            }
+            fsk_RegIrqFlags1_prev.octet = RegIrqFlags1.octet; 
+            printf("\r\n");
+            fflush(stdout); 
+        }    
+        RegIrqFlags2.octet = radio.read_reg(REG_FSK_IRQFLAGS2);
+        if (RegIrqFlags2.octet != fsk_RegIrqFlags2_prev.octet) {
+            printf("iF2:");
+            if (RegIrqFlags2.bits.FifoFull ^ fsk_RegIrqFlags2_prev.bits.FifoFull) {
+                printf("FifoFull-");
+                if (RegIrqFlags2.bits.FifoFull)
+                    printf("on ");
+                else
+                    printf("off ");                   
+            }
+            if (RegIrqFlags2.bits.FifoEmpty ^ fsk_RegIrqFlags2_prev.bits.FifoEmpty) {
+                printf("FifoEmpty-");
+                if (RegIrqFlags2.bits.FifoEmpty)
+                    printf("on ");
+                else {
+                    printf("off ");                 
+                    rssi = radio.read_reg(REG_FSK_RSSIVALUE);
+                }
+            }
+            if (RegIrqFlags2.bits.FifoLevel ^ fsk_RegIrqFlags2_prev.bits.FifoLevel) {
+                printf("FifoLevel-");
+                if (RegIrqFlags2.bits.FifoLevel)
+                    printf("on ");
+                else
+                    printf("off ");                 
+            }
+            if (RegIrqFlags2.bits.FifoOverrun ^ fsk_RegIrqFlags2_prev.bits.FifoOverrun) {
+                printf("FifoOverrun-");
+                if (RegIrqFlags2.bits.FifoOverrun)
+                    printf("on ");
+                else
+                    printf("off ");                 
+            }
+            if (RegIrqFlags2.bits.PacketSent ^ fsk_RegIrqFlags2_prev.bits.PacketSent) {
+                printf("PacketSent-");
+                if (RegIrqFlags2.bits.PacketSent) {
+                    printf("on ");
+                } else
+                    printf("off ");                 
+            }
+            if (RegIrqFlags2.bits.PayloadReady ^ fsk_RegIrqFlags2_prev.bits.PayloadReady) {
+                printf("PayloadReady-");
+                if (RegIrqFlags2.bits.PayloadReady)
+                    printf("on ");
+                else
+                    printf("off ");                 
+            }
+            if (RegIrqFlags2.bits.CrcOk ^ fsk_RegIrqFlags2_prev.bits.CrcOk) {
+                printf("CrcOk-");
+                if (RegIrqFlags2.bits.CrcOk)
+                    printf("on ");
+                else
+                    printf("off ");                 
+            }
+            if (RegIrqFlags2.bits.LowBat ^ fsk_RegIrqFlags2_prev.bits.LowBat) {
+                printf("LowBat-");
+                if (RegIrqFlags2.bits.LowBat)
+                    printf("on ");
+                else
+                    printf("off ");                 
+            }
+            fsk_RegIrqFlags2_prev.octet = RegIrqFlags2.octet;
+            printf("\r\n");
+            fflush(stdout); 
+            
+            if (RegIrqFlags2.bits.PacketSent) {
+                if (fsk.tx_done_sleep)
+                    radio.set_opmode(RF_OPMODE_SLEEP);
+                else
+                    radio.set_opmode(RF_OPMODE_STANDBY);                    
+            }
+
+            if (RegIrqFlags2.bits.CrcOk || RegIrqFlags2.bits.PayloadReady) {
+                if (fsk.RegRxConfig.bits.AfcAutoOn) {
+                    fsk.RegAfcValue = radio.read_s16(REG_FSK_AFCMSB);      
+                    printf("%dHz ", (int)(FREQ_STEP_HZ * fsk.RegAfcValue));  
+                    if (rssi != 0) {
+                        printf("pkt:-%.1fdBm ", rssi / 2.0);
+                        rssi = 0;
+                    }                                         
+                }
+                if (fsk.RegPktConfig1.bits.PacketFormatVariable) {
+                    fsk.rx_buf_length = radio.read_reg(REG_FIFO);
+                } else {
+                    fsk.rx_buf_length = fsk.RegPktConfig2.bits.PayloadLength;
+                }
+                
+                radio.m_cs = 0;
+                radio.m_spi.write(REG_FIFO); // bit7 is low for reading from radio
+                for (int i = 0; i < fsk.rx_buf_length; i++) {
+                    radio.rx_buf[i] = radio.m_spi.write(0);
+                }
+                radio.m_cs = 1;                        
+                /****/
+                if (per_en) { 
+                    if (!per_parse_rx(fsk.rx_buf_length)) {
+                        PacketNormalCnt++;
+                        print_rx_buf(fsk.rx_buf_length);                                                 
+                    }                                       
+                } else {
+                    print_rx_buf(fsk.rx_buf_length);                            
+                }
+                fflush(stdout);                    
+            } // ..if CrcOk or PayloadReady
+        } // ..if RegIrqFlags2 changed
+    } // ...fsk
 }
 
 void cadper_service()
@@ -1200,6 +1389,26 @@
 
 }
 
+void cmd_restart_rx(uint8_t);
+Timeout timeout_syncAddress;
+int preamble_to_sync_us;
+bool get_syncAddress;
+float preamble_detect_at;
+
+void callback_sa_timeout()
+{
+    printf("syncAddress timeout ");
+    if (dio2.read() == 0) {
+        //cmd_restart_rx(0);
+        rx_start_timer.reset();
+        radio.set_opmode(RF_OPMODE_STANDBY);
+        printf("(false preamble detect at %f, secs:%u)\r\n", preamble_detect_at, time(NULL) - secs_rx_start);
+        secs_rx_start = time(NULL);
+        radio.set_opmode(RF_OPMODE_RECEIVER);
+    } else
+        printf("\r\n");
+}   
+
 void
 service_radio()
 {
@@ -1300,16 +1509,43 @@
             case SERVICE_ERROR:
             case SERVICE_NONE:
                 break;                
-         } // ...switch (act)
+        } // ...switch (act)
          
-         /* fsk sync address */
-         if (dio2 && radio.RegDioMapping1.bits.Dio2Mapping == 3) {
-             // syncAdrs when in RX mode
-             if (rssi == 0) {
+        /* FSK receiver handling of preamble detection */
+        if (radio.RegDioMapping2.bits.MapPreambleDetect && radio.RegDioMapping2.bits.Dio4Mapping == 3) {
+            if (saved_dio4 != dio4.read()) {
+                //printf("predet-dio4:%d\r\n", dio4.read());
+                /* FSK: preamble detect state change */
+                if (dio4.read()) {
+                    if (radio.RegDioMapping1.bits.Dio2Mapping == 3) {   // if we can see SyncAddress
+                        get_syncAddress = true;
+                        timeout_syncAddress.attach_us(callback_sa_timeout, preamble_to_sync_us);
+                    }
+                    /* how long after RX start is preamble detection occuring? */
+                    //printf("preamble detect at %f\r\n", rx_start_timer.read());
+                    preamble_detect_at = rx_start_timer.read(); 
+                } else {
+                    get_syncAddress = false;
+                    //printf("preamble detect clear\r\n");
+                }
+                saved_dio4 = dio4.read();
+             }
+         }  // ..if dio4 is 
+         
+         if (radio.RegDioMapping1.bits.Dio2Mapping == 3) {
+             if (dio2.read()) {
+                 if (get_syncAddress) {
+                     timeout_syncAddress.detach();
+                     get_syncAddress = false;
+                 }                 
                  rssi = radio.read_reg(REG_FSK_RSSIVALUE);
              }
          }
          
+         /*if (radio.RegDioMapping1.bits.Dio1Mapping == 1 && radio.dio1) {
+              = radio.read_reg(REG_FSK_RSSIVALUE);
+         }*/
+         
     } // ...!radio.RegOpMode.bits.LongRangeMode
 }
 
@@ -1756,7 +1992,7 @@
         fsk.RegRxConfig.octet = radio.read_reg(REG_FSK_RXCONFIG);
         fsk.RegRxConfig.bits.AfcAutoOn = 1;
         fsk.RegRxConfig.bits.AgcAutoOn = 1;
-        fsk.RegRxConfig.bits.RxTrigger = 7;
+        fsk.RegRxConfig.bits.RxTrigger = 7; // both
         radio.write_reg(REG_FSK_RXCONFIG, fsk.RegRxConfig.octet);    
         
         fsk.RegPreambleDetect.bits.PreambleDetectorOn = 1;
@@ -1806,14 +2042,54 @@
                 fsk.set_rx_dcc_bw_hz(5208, 0);  // rxbw
                 fsk.set_rx_dcc_bw_hz(10417, 1);  // afcbw
                 radio.write_u16(REG_FSK_PREAMBLEMSB, 8);                    
-                break;                                                                 
+                break;   
+            case '6':
+                fsk.set_bitrate(65536);
+                fsk.set_tx_fdev_hz(16384);
+                fsk.set_rx_dcc_bw_hz(62500, 0);  // rxbw
+                fsk.set_rx_dcc_bw_hz(100000, 1);  // afcbw
+                radio.write_u16(REG_FSK_PREAMBLEMSB, 5);             
+                fsk.RegSyncConfig.octet = radio.read_reg(REG_FSK_SYNCCONFIG);    
+                fsk.RegSyncConfig.bits.SyncSize = 2;
+                radio.write_reg(REG_FSK_SYNCCONFIG, fsk.RegSyncConfig.octet);
+                radio.write_reg(REG_FSK_SYNCVALUE3, 0x33);
+                radio.write_reg(REG_FSK_SYNCVALUE2, 0xcb);
+                radio.write_reg(REG_FSK_SYNCVALUE1, 0x82);           
+                
+                fsk.RegRxConfig.bits.RxTrigger = 6; // preamble
+                radio.write_reg(REG_FSK_RXCONFIG, fsk.RegRxConfig.octet);
+                radio.RegDioMapping2.bits.Dio4Mapping = 3;
+                radio.RegDioMapping2.bits.MapPreambleDetect = 1;    // dio4 to preambleDetect in RX
+                radio.write_reg(REG_DIOMAPPING2, radio.RegDioMapping2.octet);     
+                radio.RegDioMapping1.bits.Dio2Mapping = 3;  // dio2 to SyncAddress in RX
+                radio.RegDioMapping1.bits.Dio1Mapping = 1;  // to FifoEmpty
+                radio.write_reg(REG_DIOMAPPING1, radio.RegDioMapping1.octet);                                   
+                break;                                                                                           
         } // ...switch (pcbuf[idx])
         printf("%" PRIu32 "bps fdev:%" PRIu32 "hz ", fsk.get_bitrate(), fsk.get_tx_fdev_hz());
         printf("rxbw:%" PRIu32 "Hz ", fsk.get_rx_bw_hz(REG_FSK_RXBW));
-        printf("afcbw:%" PRIu32 "Hz preambleLen:%" PRIu16 "\r\n", fsk.get_rx_bw_hz(REG_FSK_AFCBW), radio.read_u16(REG_FSK_PREAMBLEMSB));        
+        printf("afcbw:%" PRIu32 "Hz preambleLen:%" PRIu16 "\r\n", fsk.get_rx_bw_hz(REG_FSK_AFCBW), radio.read_u16(REG_FSK_PREAMBLEMSB));  
+        
+        /* time between preamble occurring and syncAddress occuring 
+         * = bitrate in microseconds * 8 * (preamble bytes + sync bytes)
+         */
+        preamble_to_sync_us = (1.0 / fsk.get_bitrate())*1e6 * 8 * (radio.read_u16(REG_FSK_PREAMBLEMSB)+1 + fsk.RegSyncConfig.bits.SyncSize+2);
+        //printf("bitrate:%d, %f\r\n", fsk.get_bitrate(), 1.0 / fsk.get_bitrate()*1e6);
+        printf("preamble_to_sync_us:%d\r\n", preamble_to_sync_us);
     }
 }
 
+void cmd_restart_rx(uint8_t idx)
+{
+    fsk.RegRxConfig.octet = radio.read_reg(REG_FSK_RXCONFIG);
+    fsk.RegRxConfig.bits.RestartRxWithoutPllLock = 1;
+    radio.write_reg(REG_FSK_RXCONFIG, fsk.RegRxConfig.octet);
+    rx_start_timer.reset();
+    secs_rx_start = time(NULL);
+    fsk.RegRxConfig.bits.RestartRxWithoutPllLock = 0;
+    printf("RestartRxWithoutPllLock\r\n");
+}
+
 void cmd_toggle_modem(uint8_t idx)
 {
     ook_test_en = false;
@@ -1955,7 +2231,7 @@
     set_per_en(true);
 
     PacketNormalCnt = 0;
-    PacketRxSequencePrev = -1;
+    PacketRxSequencePrev = 0;   // transmitter side PacketTxCnt is 1 at first TX
     PacketPerKoCnt = 0;
     PacketPerOkCnt = 0;
             
@@ -2062,6 +2338,13 @@
     if (radio.RegOpMode.bits.LongRangeMode)
         lora.start_rx(RF_OPMODE_RECEIVER);
     else {
+        if (poll_irq_en) {
+            fsk_RegIrqFlags2_prev.octet = 0;
+            fsk_RegIrqFlags1_prev.octet = 0; 
+        }
+        
+        rx_start_timer.start();
+        secs_rx_start = time(NULL);
         fsk.start_rx();
         radio.RegDioMapping1.bits.Dio2Mapping = 3;  // dio2 to syncadrs
         radio.write_reg(REG_DIOMAPPING1, radio.RegDioMapping1.octet); 
@@ -2727,9 +3010,11 @@
 {
     poll_irq_en ^= 1;
     printf("poll_irq_en:");
-    if (poll_irq_en)
+    if (poll_irq_en) {
         printf("irqFlags register\r\n");
-    else
+        fsk_RegIrqFlags1_prev.octet = 0;
+        fsk_RegIrqFlags2_prev.octet = 0;
+    } else
         printf("DIO pin interrupt\r\n");
 }
 
@@ -2762,7 +3047,7 @@
     set_per_en(true);
 
     PacketNormalCnt = 0;
-    PacketRxSequencePrev = -1;
+    PacketRxSequencePrev = 0; // transmitter side PacketTxCnt is 1 at first TX
     PacketPerKoCnt = 0;
     PacketPerOkCnt = 0;                
     //dio3.rise(&dio3_cb);
@@ -3180,6 +3465,7 @@
     { MODEM_FSK, "ar", cmd_fsk_AutoRestartRxMode, "","(RX) increment AutoRestartRxMode"},
     { MODEM_FSK, "alc", cmd_fsk_AfcAutoClearOn, "","(RX) toggle AfcAutoClearOn"},
     { MODEM_FSK, "mp", cmd_MapPreambleDetect, "","(RX) toggle MapPreambleDetect"},
+    { MODEM_FSK, "rrx", cmd_restart_rx, "","restart RX"},  
     { MODEM_BOTH, "op", cmd_op, "<dBm>","(TX) get/set TX power"}, 
     
 #ifdef LORA_TX_TEST
@@ -3457,7 +3743,7 @@
     
     toggle_per_en();
     PacketNormalCnt = 0;
-    PacketRxSequencePrev = -1;
+    PacketRxSequencePrev = 0;
     PacketPerKoCnt = 0;
     PacketPerOkCnt = 0;       
     
@@ -3489,6 +3775,9 @@
 
     (void)radio.get_frf_MHz();
     radio.RegPaConfig.octet = radio.read_reg(REG_PACONFIG);
+#ifdef TARGET_MTS_MDOT_F411RE
+    radio.RegPaConfig.bits.PaSelect = 1;    // mDot uses PA_BOOST
+#else
     if (shield_type == SHIELD_TYPE_LAS) {
         // LAS HF=PA_BOOST  LF=RFO
         if (radio.HF)
@@ -3498,7 +3787,8 @@
     } else if (shield_type == SHIELD_TYPE_MAS) {
         // MAS HF=RFO  LF=RFO
         radio.RegPaConfig.bits.PaSelect = 0;        
-    } 
+    }
+#endif
     radio.RegPaConfig.bits.OutputPower = 15;
     radio.write_reg(REG_PACONFIG, radio.RegPaConfig.octet);