optional checksum status display, output more chars of RTTY string

git-svn-id: https://svn.code.sf.net/p/freetel/code@3488 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/horus_api.c b/codec2-dev/src/horus_api.c
index a2964e1cae195e0004e30475890e7e876b4ac1cf..fcf33a522c2fc753e5ff78b4f3117070fad93185 100644 (file)
--- a/codec2-dev/src/horus_api.c
+++ b/codec2-dev/src/horus_api.c
@@ -43,16 +43,17 @@
 struct horus {
     int         mode;
     int         verbose;
-    struct FSK *fsk;                 /* states for FSK modem              */
-    int         Fs;                  /* sample rate in Hz                 */
-    int         mFSK;                /* number of FSK tones               */
-    int         Rs;                  /* symbol rate in Hz                 */
-    int8_t      uw[MAX_UW_LENGTH];   /* unique word bits mapped to +/-1   */
-    int         uw_thresh;           /* threshold for UW detection        */
-    int         uw_len;              /* length of unique word             */
-    int         max_packet_len;      /* max length of a telemetry packet  */
-    uint8_t    *rx_bits;             /* buffer of received bits           */
-    int         rx_bits_len;         /* length of rx_bits buffer          */
+    struct FSK *fsk;                 /* states for FSK modem                */
+    int         Fs;                  /* sample rate in Hz                   */
+    int         mFSK;                /* number of FSK tones                 */
+    int         Rs;                  /* symbol rate in Hz                   */
+    int8_t      uw[MAX_UW_LENGTH];   /* unique word bits mapped to +/-1     */
+    int         uw_thresh;           /* threshold for UW detection          */
+    int         uw_len;              /* length of unique word               */
+    int         max_packet_len;      /* max length of a telemetry packet    */
+    uint8_t    *rx_bits;             /* buffer of received bits             */
+    int         rx_bits_len;         /* length of rx_bits buffer            */
+    int         crc_ok;              /* most recent packet checksum results */
 };
 
 /* Unique word for Horus RTTY 7 bit '$' character, 3 sync bits,
@@ -119,6 +120,8 @@ struct horus *horus_open (int mode) {
     for(i=0; i<hstates->rx_bits_len; i++) {
         hstates->rx_bits[i] = 0;
     }
+
+    hstates->crc_ok = 0;
     
     return hstates;
 }
@@ -188,7 +191,7 @@ int hex2int(char ch) {
 int extract_horus_rtty(struct horus *hstates, char ascii_out[], int uw_loc) {
     const int nfield = 7;                               /* 7 bit ASCII                    */
     const int npad   = 3;                               /* 3 sync bits between characters */
-    int st = uw_loc + hstates->uw_len;                  /* first bit of first char        */
+    int st = uw_loc;                                    /* first bit of first char        */
     int en = hstates->max_packet_len - nfield;          /* last bit of max length packet  */
 
     int      i, j, endpacket, nout, crc_ok;
@@ -218,7 +221,7 @@ int extract_horus_rtty(struct horus *hstates, char ascii_out[], int uw_loc) {
 
         if (!endpacket && (char_dec == 42)) {
             endpacket = 1;
-            rx_crc = horus_l2_gen_crc16((uint8_t*)ascii_out, nout);
+            rx_crc = horus_l2_gen_crc16((uint8_t*)&ascii_out[5], nout-5);
             ptx_crc = pout + 1; /* start of tx CRC */
         }
 
@@ -241,7 +244,7 @@ int extract_horus_rtty(struct horus *hstates, char ascii_out[], int uw_loc) {
             //fprintf(stderr, "ptx_crc[%d] %c 0x%02X tx_crc: 0x%04X\n", i, ptx_crc[i], hex2int(ptx_crc[i]), tx_crc);
         }
         crc_ok = (tx_crc == rx_crc);
-        *(ptx_crc-1) = 0;  /* terminate ASCII string */
+        *(ptx_crc+4) = 0;  /* terminate ASCII string */
     }
     else {
         *ascii_out = 0;
@@ -255,6 +258,8 @@ int extract_horus_rtty(struct horus *hstates, char ascii_out[], int uw_loc) {
     /* make sure we don't overrun storage */
     
     assert(nout <= horus_get_max_ascii_out_len(hstates));
+
+    hstates->crc_ok = crc_ok;
     
     return crc_ok;
 }
@@ -301,6 +306,14 @@ int extract_horus_binary(struct horus *hstates, char hex_out[], int uw_loc) {
     uint8_t payload_bytes[HORUS_BINARY_NUM_PAYLOAD_BYTES];
     horus_l2_decode_rx_packet(payload_bytes, rxpacket, HORUS_BINARY_NUM_PAYLOAD_BYTES);
 
+    uint16_t crc_tx, crc_rx;
+    crc_rx = horus_l2_gen_crc16(payload_bytes, HORUS_BINARY_NUM_PAYLOAD_BYTES-2);
+    crc_tx = *(uint16_t*)&payload_bytes[HORUS_BINARY_NUM_PAYLOAD_BYTES-2];
+    
+    if (hstates->verbose) {
+        fprintf(stderr, "crc_tx: %04X crc_rx: %04X\n", crc_tx, crc_rx);
+    }
+    
     /* convert to ASCII string of hex characters */
 
     hex_out[0] = 0;
@@ -313,16 +326,20 @@ int extract_horus_binary(struct horus *hstates, char hex_out[], int uw_loc) {
     if (hstates->verbose) {
         fprintf(stderr, "nout: %d\nDecoded Payload bytes:\n%s", nout, hex_out);
     }
+
+    hstates->crc_ok = (crc_tx == crc_rx);
+
+    /* binary packets always marked as OK, as next layer determines validity */
     
     return 1;
 }
 
 
 int horus_rx(struct horus *hstates, char ascii_out[], short demod_in[]) {
-    int i, j, uw_loc, valid_packet;
+    int i, j, uw_loc, packet_detected;
     
     assert(hstates != NULL);
-    valid_packet = 0;
+    packet_detected = 0;
 
     int Nbits = hstates->fsk->Nbits;
     int rx_bits_len = hstates->rx_bits_len;
@@ -359,10 +376,10 @@ int horus_rx(struct horus *hstates, char ascii_out[], short demod_in[]) {
            a packet, so lets try to extract valid packets */
 
         if (hstates->mode == HORUS_MODE_RTTY) {
-            valid_packet = extract_horus_rtty(hstates, ascii_out, uw_loc);
+            packet_detected = extract_horus_rtty(hstates, ascii_out, uw_loc);
         }
         if (hstates->mode == HORUS_MODE_BINARY) {
-            valid_packet = extract_horus_binary(hstates, ascii_out, uw_loc);
+            packet_detected = extract_horus_binary(hstates, ascii_out, uw_loc);
             //#define DUMP_BINARY_PACKET
             #ifdef DUMP_BINARY_PACKET
             FILE *f = fopen("packetbits.txt", "wt"); assert(f != NULL);
@@ -375,7 +392,7 @@ int horus_rx(struct horus *hstates, char ascii_out[], short demod_in[]) {
         }
     }
      
-    return valid_packet;
+    return packet_detected;
 }
 
 int horus_get_version(void) {
@@ -449,3 +466,8 @@ void horus_set_verbose(struct horus *hstates, int verbose) {
     hstates->verbose = verbose;
 }
 
+int horus_crc_ok(struct horus *hstates) {
+    assert(hstates != NULL);
+    return hstates->crc_ok;
+}
+

diff --git a/codec2-dev/src/horus_api.h b/codec2-dev/src/horus_api.h
index 36e171a339fe1c44d30696a1d534659afbb7c13a..80c824e8a1aab3916e11a33fec7bbde0fd1f29b2 100644 (file)
--- a/codec2-dev/src/horus_api.h
+++ b/codec2-dev/src/horus_api.h
@@ -64,6 +64,7 @@ int           horus_get_Fs                   (struct horus *hstates);
 int           horus_get_mFSK                 (struct horus *hstates);      
 void          horus_get_modem_stats          (struct horus *hstates, int *sync, float *snr_est);
 void          horus_get_modem_extended_stats (struct horus *hstates, struct MODEM_STATS *stats);
+int           horus_crc_ok                   (struct horus *hstates);
 
 /* how much storage you need for demod_in[] and  ascii_out[] */
       

diff --git a/codec2-dev/src/horus_demod.c b/codec2-dev/src/horus_demod.c
index d7d01c5085c5c1034fa9a6b6b33dddcc3691efe6..9d50fd39ece76be329193928ae64402615ebbcdc 100644 (file)
--- a/codec2-dev/src/horus_demod.c
+++ b/codec2-dev/src/horus_demod.c
@@ -49,14 +49,14 @@ int main(int argc, char *argv[]) {
     struct   MODEM_STATS stats;
     FILE    *fin,*fout;
     int      i,j,Ndft,mode;
-    int      stats_ctr,stats_loop, stats_rate, verbose;
+    int      stats_ctr,stats_loop, stats_rate, verbose, crc_results;
     float    loop_time;
     int      enable_stats = 0;
 
     stats_loop = 0;
     stats_rate = 8;
     mode = -1;
-    verbose = 0;
+    verbose = crc_results = 0;
     
     int o = 0;
     int opt_idx = 0;
@@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
             {0, 0, 0, 0}
         };
         
-        o = getopt_long(argc,argv,"hvm:t::",long_opts,&opt_idx);
+        o = getopt_long(argc,argv,"hvcm:t::",long_opts,&opt_idx);
         
         switch(o) {
             case 'm':
@@ -95,6 +95,9 @@ int main(int argc, char *argv[]) {
             case 'v':
                 verbose = 1;
             break;    
+            case 'c':
+                crc_results = 1;
+            break;    
             case 'h':
             case '?':
                 goto helpmsg;
@@ -112,15 +115,16 @@ int main(int argc, char *argv[]) {
     if( (argc - dx) > 5){
         fprintf(stderr, "Too many arguments\n");
     helpmsg:
-        fprintf(stderr,"usage: %s -m RTTY|binary [-v] [-t [r]] InputModemRawFile OutputAsciiFile\n",argv[0]);
+        fprintf(stderr,"usage: %s -m RTTY|binary [-v] [-c] [-t [r]] InputModemRawFile OutputAsciiFile\n",argv[0]);
         fprintf(stderr,"\n");
         fprintf(stderr,"InputModemRawFile      48 kHz 16 bit shorts real modem signal from radio\n");
         fprintf(stderr," -m RTTY|binary\n"); 
         fprintf(stderr,"--mode=RTTY|binary[r]  RTTY or binary Horus protcols\n");
         fprintf(stderr," -t[r] --stats=[r]     Print out modem statistics to stderr in JSON.\n");
         fprintf(stderr,"                       r, if provided, sets the number of modem frames\n"
-                "                       between statistic printouts\n");
+                       "                       between statistic printouts\n");
         fprintf(stderr," -v                    verbose debug info\n");
+        fprintf(stderr," -c                    display CRC results for each packet\n");
         exit(1);
     }
         
@@ -175,7 +179,15 @@ int main(int argc, char *argv[]) {
             fprintf(stderr, "read nin %d\n", horus_nin(hstates));
         }
         if (horus_rx(hstates, ascii_out, demod_in)) {
-            fprintf(stdout, "%s\n", ascii_out);
+            fprintf(stdout, "%s", ascii_out);
+            if (crc_results) {
+                if (horus_crc_ok(hstates)) {
+                    fprintf(stdout, "  CRC OK");
+                } else {
+                    fprintf(stdout, "  CRC BAD");
+                }
+            }
+            fprintf(stdout, "\n");
         }
         
         if (enable_stats && stats_ctr <= 0) {