Fix buffer overrun in packet print. Add conditional to 446x.

tracker/software/source/config/config.c

@@ -14,10 +14,10 @@ const conf_t conf_flash_default = {
     // Primary position app
     .pos_pri = {
         .beacon = {
-            .active = false,
-            .cycle = TIME_S2I(60 * 5),
+            .active = true,
+            .cycle = TIME_S2I(60 * 30),
             .init_delay = TIME_S2I(5),
-            .fixed = false, // Add lat, lon alt fields when enabling fixed
+            .fixed = true, // Add lat, lon alt fields when enabling fixed
             .lat = -337331175, // Degrees (expressed in 1e-7 form)
             .lon = 1511143478, // Degrees (expressed in 1e-7 form)
             .alt = 144 // Altitude in metres
@@ -32,14 +32,14 @@ const conf_t conf_flash_default = {
         .call = "VK2GJ-5",
         .path = "WIDE1-1",
         .symbol = SYM_DIGIPEATER,
-        .aprs_msg = false, // Enable APRS message reception on this app
+        .aprs_msg = true, // Enable APRS message reception on this app
     },
 
     // Secondary position app
     .pos_sec = {
         .beacon = {
             .active = true,
-            .cycle = TIME_S2I(60 * 30), // Beacon interval
+            .cycle = TIME_S2I(60 * 5), // Beacon interval
             .init_delay = TIME_S2I(10),
             .fixed = false
         },
@@ -53,7 +53,7 @@ const conf_t conf_flash_default = {
         .call = "VK2GJ-2",
         .path = "WIDE2-1",
         .symbol = SYM_ANTENNA,
-        .aprs_msg = false, // Enable APRS message reception on this app
+        .aprs_msg = true, // Enable APRS message reception on this app
     },
 
     // Primary image app
@@ -157,7 +157,7 @@ const conf_t conf_flash_default = {
             .symbol = SYM_ANTENNA
         },
         .aprs_msg = true, // Set true to enable messages to be accepted on RX call sign
-        .digi = false,
+        .digi = true,
         .tx = {
            // Transmit radio configuration
            .radio_conf = {

tracker/software/source/drivers/devices/si446x.c

@@ -988,11 +988,15 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
   /* Packet handler disabled in RX. */
   Si446x_setProperty8(radio, Si446x_PKT_CONFIG1, 0x40);
 
-  if(is_part_Si4463(handler->radio_part))
+  if(is_part_Si4463(handler->radio_part)) {
     /* To run 4463 in 4464 compatibility mode (set SEARCH2 to zero). */
     /* 0xBC (SCH_FROZEN = 1 {Freeze min-max on gear switch, SCHPRD_HI = 6 SCHPRD_LO = 4 {SEARCH_4TB, SEARCH_8TB}) */
+#if Si446x_4463_USE_446X_COMPATABILITY == TRUE
+    Si446x_setProperty8(radio, Si446x_MODEM_RAW_SEARCH2, 0x00);
+#else
     Si446x_setProperty8(radio, Si446x_MODEM_RAW_SEARCH2, 0xBC);
-
+#endif
+  }
   /*
    * MODEM_RAW_CONTROL
    *  UNSTDPK[7] = 1 (raw mode for no-standard packet reception)
@@ -1020,7 +1024,11 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
    *  OOK_LIMIT_DISCHG[5] = 1 Peak detector discharge is disabled when the detected peak is lower than the input signal for low input levels.
    */
   if(is_part_Si4463(handler->radio_part))
+#if Si446x_4463_USE_446X_COMPATABILITY == TRUE
+    Si446x_setProperty8(radio, Si446x_MODEM_OOK_MISC, 0x03);
+#else
     Si446x_setProperty8(radio, Si446x_MODEM_OOK_MISC, 0x23);
+#endif
   else
     Si446x_setProperty8(radio, Si446x_MODEM_OOK_MISC, 0x03);
 
@@ -1039,8 +1047,13 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
    *  SHWAIT[7:4] This specifies the wait period per PLL AFC correction cycle before gear switching has occurred.
    *  LGWAIT [3:0] This specifies the wait period per PLL AFC correction cycle after gear switching has occurred.
    */
+
   if(is_part_Si4463(handler->radio_part))
+#if Si446x_4463_USE_446X_COMPATABILITY == TRUE
+    Si446x_setProperty8(radio, Si446x_MODEM_AFC_WAIT, 0x23);
+#else
     Si446x_setProperty8(radio, Si446x_MODEM_AFC_WAIT, 0x36);
+#endif
   else
     Si446x_setProperty8(radio, Si446x_MODEM_AFC_WAIT, 0x23);
 
@@ -1066,7 +1079,11 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
   /* RX AGC control. */
   /* 0xE2 -> xE0 (ADC_GAIN_CORR_EN[1] not used in 4464. It is used in 4463.) */
   if(is_part_Si4463(handler->radio_part))
+#if Si446x_4463_USE_446X_COMPATABILITY == TRUE
+    Si446x_setProperty8(radio, Si446x_MODEM_AGC_CONTROL, 0xE0);
+#else
     Si446x_setProperty8(radio, Si446x_MODEM_AGC_CONTROL, 0xE2);
+#endif
   else
     Si446x_setProperty8(radio, Si446x_MODEM_AGC_CONTROL, 0xE0);
   Si446x_setProperty8(radio, Si446x_MODEM_AGC_WINDOW_SIZE, 0x11);
@@ -1104,8 +1121,9 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
      * NDEC2AGC[2] = 1 enable AGC control of 2nd stage CIC
      * NDEC2GAIN[4:3] = 1 2nd stage CIC gain is 12dB
      */
+#if Si446x_4463_USE_446X_COMPATABILITY == TRUE
     Si446x_setProperty8(radio, Si446x_MODEM_DECIMATION_CFG2, 0x0C);
-
+#endif
   /* RSSI controls. */
   /*
    * LATCH[2:0] = 0 disabled.
@@ -1113,9 +1131,11 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
    */
   Si446x_setProperty8(radio, Si446x_MODEM_RSSI_CONTROL, 0x00);
   if(is_part_Si4463(handler->radio_part)) {
+#if Si446x_4463_USE_446X_COMPATABILITY != TRUE
     /* RSSI jump control (ENRSSIJMP[3] 1 -> 0 to disable. */
     Si446x_setProperty8(radio, Si446x_MODEM_RSSI_CONTROL2, 0x18);
     Si446x_setProperty8(radio, Si446x_MODEM_RSSI_JUMP_THRESH, 0x06);
+#endif
   }
 
   /* RX IF filter coefficients. */
@@ -1161,6 +1181,7 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
 
   /* Unused Si4463 features for AFSK RX. */
   if(is_part_Si4463(handler->radio_part)) {
+#if Si446x_4463_USE_446X_COMPATABILITY != TRUE
    /* DSA is not enabled. */
    Si446x_setProperty8(radio, Si446x_MODEM_DSA_CTRL1, 0x40); // 0xA0
    Si446x_setProperty8(radio, Si446x_MODEM_DSA_CTRL2, 0x04); // 0x04
@@ -1170,6 +1191,7 @@ static void Si446x_setModemAFSK_RX(const radio_unit_t radio) {
    Si446x_setProperty8(radio, Si446x_MODEM_DSA_RSSI, 0x78); // 0x78
    Si446x_setProperty8(radio, Si446x_MODEM_RSSI_MUTE, 0x00);
    Si446x_setProperty8(radio, Si446x_MODEM_DSA_MISC, 0x20); // 0x20
+#endif
   }
 }
 

tracker/software/source/drivers/devices/si446x.h

@@ -17,8 +17,9 @@
 
 #define SI446X_EVT_TX_TIMEOUT                   EVENT_MASK(0)
 
-#define Si446x_LOCK_BY_SEMAPHORE                TRUE
+//#define Si446x_LOCK_BY_SEMAPHORE                TRUE
 #define Si446x_UNLOCK_FOR_ENCODE                FALSE
+#define Si446x_4463_USE_446X_COMPATABILITY      TRUE
 
 /* Si4464 States. */
 #define Si446x_STATE_REMAIN                     0

tracker/software/source/packet/protocols/aprs/aprs.c

@@ -275,7 +275,7 @@ void aprs_debug_getPacket(packet_t pp, char* buf, uint32_t len)
 
     // Print decoded packet
     uint32_t out = chsnprintf(buf, len, "%s", rec);
-    for(uint32_t i = 0; pinfo[i]; i++) {
+    for(uint32_t i = 0; pinfo[i] && (len > out); i++) {
         if(pinfo[i] < 32 || pinfo[i] > 126) {
             out += chsnprintf(&buf[out], len - out, "<0x%02x>", pinfo[i]);
         } else {

tracker/software/source/threads/rxtx/radio.c

@@ -50,6 +50,7 @@ static void pktProcessReceivedPacket(pkt_data_object_t *const pkt_buff) {
   uint8_t n = 1;
   if(pktGetAX25FrameStatus(pkt_buff))
     n = 0;
+  /* TODO: Check aprs_debug_getPacket(...) for buffer overrun bug. */
   aprs_debug_getPacket(pp, &serial_buf[n], sizeof(serial_buf) - n);
   if(rssi != 0xFF) {
     TRACE_MON("RX   > Packet opening RSSI 0x%x", rssi);