Event History Setup: #287;

P25p1: Set currentslot to 0 when decoding phase 1 specific duids (HDU, TDU, TDULC, LDU, TSBK, MPDU) so that we don't have a potential stale phase 2 slot value present when writing to event history, etc.

Update Glamor Shot to include the Event History Update;

src/p25p1_hdu.c

@@ -215,6 +215,11 @@ correct_golay_dibits_6(char* corrected_hex_data, int hex_count, AnalogSignal* an
 void
 processHDU(dsd_opts* opts, dsd_state* state)
 {
+
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
+  
   uint8_t mi[73];
   char mfid[9], algid[9], kid[17], tgid[17];
   int i, j;

src/p25p1_ldu1.c

@@ -26,6 +26,11 @@
 void
 processLDU1 (dsd_opts* opts, dsd_state* state)
 {
+
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
+  
   // extracts IMBE frames from LDU frame
   int i;
   uint8_t lcformat[9], mfid[9], lcinfo[57];

src/p25p1_ldu2.c

@@ -26,6 +26,11 @@
 void
 processLDU2 (dsd_opts * opts, dsd_state * state)
 {
+
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
+  
   // extracts IMBE frames from LDU frame
   int i;
   uint8_t mi[73];

src/p25p1_mdpu.c

@@ -32,6 +32,10 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
   memset (state->s_r4, 0, sizeof(state->s_r4));
   opts->slot_preference = 2;
 
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
+
   //reset some strings when returning from a call in case they didn't get zipped already
   sprintf (state->call_string[0], "%s", "                     "); //21 spaces
   sprintf (state->call_string[1], "%s", "                     "); //21 spaces

src/p25p1_tdu.c

@@ -9,6 +9,11 @@
 void
 processTDU (dsd_opts* opts, dsd_state* state)
 {
+
+    //push current slot to 0, just in case swapping p2 to p1
+    //or stale slot value from p2 and then decoding a pdu
+    state->currentslot = 0;
+
     AnalogSignal analog_signal_array[14];
     int status_count;
 

src/p25p1_tdulc.c

@@ -215,6 +215,11 @@ read_zeros(dsd_opts* opts, dsd_state* state, AnalogSignal* analog_signal_array,
 void
 processTDULC (dsd_opts* opts, dsd_state* state)
 {
+
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
+  
   int i;
   uint8_t lcinfo[57], lcformat[9], mfid[9];
 

src/p25p1_tsbk.c

@@ -18,6 +18,9 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
   memset (state->s_r4, 0, sizeof(state->s_r4));
   opts->slot_preference = 2;
 
+  //push current slot to 0, just in case swapping p2 to p1
+  //or stale slot value from p2 and then decoding a pdu
+  state->currentslot = 0;
 
   //reset some strings when returning from a call in case they didn't get zipped already
   sprintf (state->call_string[0], "%s", "                     "); //21 spaces