datac14 freedv_api port

5 files changed, 22 insertions, 6 deletions

diff --git a/src/freedv_700.c b/src/freedv_700.c
index 3dc4329..7c8536c 100644
--- a/src/freedv_700.c
+++ b/src/freedv_700.c
@@ -197,6 +197,7 @@ void freedv_ofdm_data_open(struct freedv *f) {
   if (f->mode == FREEDV_MODE_DATAC3) strcpy(mode, "datac3");
   if (f->mode == FREEDV_MODE_DATAC4) strcpy(mode, "datac4");
   if (f->mode == FREEDV_MODE_DATAC13) strcpy(mode, "datac13");
+  if (f->mode == FREEDV_MODE_DATAC14) strcpy(mode, "datac14");
 
   ofdm_init_mode(mode, &ofdm_config);
   f->ofdm = ofdm_create(&ofdm_config);
diff --git a/src/freedv_api.c b/src/freedv_api.c
index 5172959..3ccf63d 100644
--- a/src/freedv_api.c
+++ b/src/freedv_api.c
@@ -125,7 +125,8 @@ struct freedv *freedv_open_advanced(int mode, struct freedv_advanced *adv) {
        FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, mode) ||
        FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, mode) ||
        FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, mode) ||
-       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, mode)) == false)
+       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, mode) ||
+       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, mode)) == false)
     return NULL;
 
   /* set everything to zero just in case */
@@ -154,6 +155,7 @@ struct freedv *freedv_open_advanced(int mode, struct freedv_advanced *adv) {
   if (FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, mode)) freedv_ofdm_data_open(f);
   if (FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, mode)) freedv_ofdm_data_open(f);
   if (FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, mode)) freedv_ofdm_data_open(f);
+  if (FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, mode)) freedv_ofdm_data_open(f);
 
   varicode_decode_init(&f->varicode_dec_states, 1);
 
@@ -235,7 +237,8 @@ void freedv_close(struct freedv *freedv) {
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, freedv->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, freedv->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, freedv->mode) ||
-      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, freedv->mode)) {
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, freedv->mode) ||
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, freedv->mode)) {
     FREE(freedv->rx_syms);
     FREE(freedv->rx_amps);
     FREE(freedv->ldpc);
@@ -266,7 +269,8 @@ static int is_ofdm_mode(struct freedv *f) {
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, f->mode) ||
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, f->mode) ||
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, f->mode) ||
-         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode);
+         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode) ||
+         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, f->mode);
 }
 
 static int is_ofdm_data_mode(struct freedv *f) {
@@ -274,7 +278,8 @@ static int is_ofdm_data_mode(struct freedv *f) {
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, f->mode) ||
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, f->mode) ||
          FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, f->mode) ||
-         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode);
+         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode) ||
+         FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, f->mode);
 }
 
 /*---------------------------------------------------------------------------*\
@@ -464,7 +469,8 @@ void freedv_rawdatacomptx(struct freedv *f, COMP mod_out[],
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, f->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, f->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, f->mode) ||
-      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode))
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode) ||
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, f->mode))
     freedv_comptx_ofdm(f, mod_out);
 
   if (FDV_MODE_ACTIVE(FREEDV_MODE_FSK_LDPC, f->mode)) {
@@ -1063,7 +1069,8 @@ int freedv_rawdatacomprx(struct freedv *f, unsigned char *packed_payload_bits,
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC1, f->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC3, f->mode) ||
       FDV_MODE_ACTIVE(FREEDV_MODE_DATAC4, f->mode) ||
-      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode))
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC13, f->mode) ||
+      FDV_MODE_ACTIVE(FREEDV_MODE_DATAC14, f->mode))
     rx_status = freedv_comp_short_rx_ofdm(f, (void *)demod_in, 0, 1.0f);
   if (FDV_MODE_ACTIVE(FREEDV_MODE_FSK_LDPC, f->mode)) {
     rx_status = freedv_rx_fsk_ldpc_data(f, demod_in);
diff --git a/src/freedv_api.h b/src/freedv_api.h
index ce95a55..e4ca468 100644
--- a/src/freedv_api.h
+++ b/src/freedv_api.h
@@ -61,6 +61,7 @@ extern "C" {
 #define FREEDV_MODE_DATAC0 14
 #define FREEDV_MODE_DATAC4 18
 #define FREEDV_MODE_DATAC13 19
+#define FREEDV_MODE_DATAC14 20
 
 // Sample rates used
 #define FREEDV_FS_8000 8000
@@ -140,6 +141,9 @@ extern "C" {
 #if !defined(FREEDV_MODE_DATAC13_EN)
 #define FREEDV_MODE_DATAC13_EN FREEDV_MODE_EN_DEFAULT
 #endif
+#if !defined(FREEDV_MODE_DATAC14_EN)
+#define FREEDV_MODE_DATAC14_EN FREEDV_MODE_EN_DEFAULT
+#endif
 
 #define FDV_MODE_ACTIVE(mode_name, var) \
   ((mode_name##_EN) == 0 ? 0 : (var) == mode_name)
diff --git a/src/freedv_data_raw_rx.c b/src/freedv_data_raw_rx.c
index 1957e10..0353ae5 100644
--- a/src/freedv_data_raw_rx.c
+++ b/src/freedv_data_raw_rx.c
@@ -214,6 +214,8 @@ int main(int argc, char *argv[]) {
     mode = FREEDV_MODE_DATAC4;
   if (!strcmp(argv[dx], "DATAC13") || !strcmp(argv[dx], "datac13"))
     mode = FREEDV_MODE_DATAC13;
+  if (!strcmp(argv[dx], "DATAC14") || !strcmp(argv[dx], "datac14"))
+    mode = FREEDV_MODE_DATAC14;
   if (mode == -1) {
     fprintf(stderr, "Error in mode: %s\n", argv[dx]);
     exit(1);
diff --git a/src/freedv_data_raw_tx.c b/src/freedv_data_raw_tx.c
index 44d53e9..cb74107 100644
--- a/src/freedv_data_raw_tx.c
+++ b/src/freedv_data_raw_tx.c
@@ -236,6 +236,8 @@ int main(int argc, char *argv[]) {
     mode = FREEDV_MODE_DATAC4;
   if (!strcmp(argv[dx], "DATAC13") || !strcmp(argv[dx], "datac13"))
     mode = FREEDV_MODE_DATAC13;
+  if (!strcmp(argv[dx], "DATAC14") || !strcmp(argv[dx], "datac14"))
+    mode = FREEDV_MODE_DATAC14;
   if (mode == -1) {
     fprintf(stderr, "Error: in mode: %s", argv[dx]);
     exit(1);