Add modulation type to flags

Supports 2GFSK, 2FSK, and CW
UBNanosatLab · Jan 30, 2019 · f48af99 · f48af99
1 parent 05c4766
commit f48af99
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/cmd_handler.c b/cmd_handler.c
@@ -110,7 +110,23 @@ void cmd_abort_tx()
 void cmd_tx_psr()
 {
     int err;
-    err = si446x_set_mod_type(&dev, MOD_SRC_RAND | MOD_TYPE_2GFSK);
+
+    if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_CW) {
+        err = si446x_set_mod_type(&dev, MOD_SRC_RAND | MOD_TYPE_CW);
+    } else if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_FSK) {
+        err = si446x_set_mod_type(&dev, MOD_SRC_RAND | MOD_TYPE_2FSK);
+    } else if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_GFSK) {
+        err = si446x_set_mod_type(&dev, MOD_SRC_RAND | MOD_TYPE_2GFSK);
+    } else {
+        err = si446x_set_mod_type(&dev, MOD_SRC_RAND | MOD_TYPE_2GFSK);
+    }
+
+    if (err) {
+        reply_error(sys_stat, (uint8_t) -err);
+        return;
+    }
+
+    err = pre_transmit();
     if (err) {
         reply_error(sys_stat, (uint8_t) -err);
         return;

diff --git a/lfr.c b/lfr.c
@@ -164,6 +164,20 @@ int reload_config()
         return err;
     }
 
+    if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_CW) {
+        err = si446x_set_mod_type(&dev, MOD_TYPE_CW);
+    } else if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_FSK) {
+        err = si446x_set_mod_type(&dev, MOD_TYPE_2FSK);
+    } else if ((settings.flags & FLAG_MOD_MASK) == FLAG_MOD_GFSK) {
+        err = si446x_set_mod_type(&dev, MOD_TYPE_2GFSK);
+    } else {
+        err = si446x_set_mod_type(&dev, MOD_TYPE_2GFSK);
+    }
+
+    if (err) {
+        return err;
+    }
+
     return 0;
 }
 

diff --git a/settings.c b/settings.c
@@ -30,7 +30,7 @@
     .tx_vdd = 5000,       /* 5V will wake the PA up, but dissipate little heat even with a lot of gate bias */ \
     .pa_ilimit = 1000,    /* 1A is a bit more than the RA07H4047M draws at Vdd=5V, Vgg=3.5V, Pin=13dBm */ \
     .tx_vdd_delay = 2000, /* 2ms is plenty for the example 5V/1A values */ \
-    .flags = FLAG_CRC_CHECK,\
+    .flags = FLAG_MOD_GFSK | FLAG_CRC_CHECK,\
     .callsign = "NOCALL  "\
 };
 

diff --git a/settings.h b/settings.h
@@ -24,7 +24,13 @@
 
 #define SETTINGS_VER 0x02
 
-#define FLAG_CRC_CHECK 0x0001
+#define FLAG_CRC_CHECK  0x0001
+
+#define FLAG_MOD_MASK   0x000C
+#define FLAG_MOD_GFSK   0x0000
+#define FLAG_MOD_FSK    0x0004
+#define FLAG_MOD_CW     0x0008
+
 
 struct lfr_settings {
     uint32_t freq;