Output modulation added

nanovna.h

@@ -123,6 +123,10 @@ enum {
   M_LOW, M_HIGH, M_GENLOW, M_GENHIGH,
 };
 
+enum {
+  MO_NONE, MO_AM, MO_NFM, MO_WFM,
+};
+
 #define MODE_OUTPUT(x)  ((x) == M_GENLOW || (x) == M_GENHIGH )
 #define MODE_INPUT(x)  ((x) == M_LOW || (x) == M_HIGH )
 #define MODE_HIGH(x)  ((x) == M_HIGH || (x) == M_GENHIGH )

plot.c

@@ -1503,7 +1503,7 @@ draw_all_cells(bool flush_markmap)
 #endif
       spi_buffer[i] = RGB565(r,g,b);
     }
-    ili9341_bulk(5*5,HEIGHT+3, 290,1);
+    ili9341_bulk(5*5,HEIGHT+3, area_width,1);
   }
 #endif
 }

sa_core.c

@@ -64,7 +64,7 @@ int scandirty = true;
 //---------------- menu system -----------------------
 
 int settingAttenuate = 0;
-int settingGenerate = 0;
+// int settingGenerate = 0;
 int settingBandwidth = 0;
 
 //int settingLevelOffset = 0;
@@ -80,6 +80,7 @@ int settingDrive=0; // 0-3 , 3=+20dBm
 int settingAGC = true;
 int settingLNA = false;
 int extraVFO = false;
+int settingModulation = MO_NONE;
 int settingStepDelay = 0;
 float rbw = 0;
 float vbw = 0;
@@ -98,11 +99,13 @@ int get_refer_output(void)
   return(settingRefer);
 }
 
+#if 0
 void SetGenerate(int g)
 {
   settingGenerate = g;
   dirty = true;
 }
+#endif
 
 void SetDrive(int d)
 {
@@ -110,6 +113,11 @@ void SetDrive(int d)
   dirty = true;
 }
 
+void SetModulation(int m)
+{
+  settingModulation = m;
+  dirty = true;
+}
 void SetIF(int f)
 {
   frequency_IF = f;
@@ -157,6 +165,12 @@ void SetMode(int m)
 
 void SetAttenuation(int a)
 {
+  if (a<0)
+    a = 0;
+  if (a> 31)
+    a=31;
+  if (settingAttenuate == a)
+    return;
   settingAttenuate = a;
   dirty = true;
 }
@@ -610,6 +624,7 @@ void update_rbw(uint32_t delta_f)
 }
 
 static int old_lf = -1;
+static int modulation_counter = 0;
 
 float perform(bool break_on_operation, int i, int32_t f, int extraV)
 {
@@ -631,6 +646,16 @@ float perform(bool break_on_operation, int i, int32_t f, int extraV)
 
     int p = settingAttenuate * 2;
     PE4302_Write_Byte(p);
+    if (settingModulation == MO_NFM ) {
+      SI4432_Sel = 1;
+      SI4432_Write_Byte(0x7A, 1);  // Use frequency hopping channel width for FM modulation
+    } else if (settingModulation == MO_WFM ) {
+      SI4432_Sel = 1;
+      SI4432_Write_Byte(0x7A, 10);  // Use frequency hopping channel width for FM modulation
+    } else {
+      SI4432_Sel = 1;
+      SI4432_Write_Byte(0x79, 0);  // IF no FM back to channel 0
+    }
     SetRX(settingMode);
     SI4432_SetReference(settingRefer);
     temppeakLevel = -150;
@@ -641,6 +666,23 @@ float perform(bool break_on_operation, int i, int32_t f, int extraV)
       dirty = false;
 //    }
   }
+  if (settingModulation == MO_AM) {
+    int p = settingAttenuate * 2 + modulation_counter;
+    PE4302_Write_Byte(p);
+    if (modulation_counter == 3)
+      modulation_counter = 0;
+    else
+      modulation_counter++;
+    chThdSleepMicroseconds(250);
+  } else if (settingModulation == MO_NFM || settingModulation == MO_WFM ) {
+      SI4432_Sel = 1;
+      SI4432_Write_Byte(0x79, modulation_counter);  // Use frequency hopping channel for FM modulation
+      if (modulation_counter == 3)
+        modulation_counter = 0;
+      else
+        modulation_counter++;
+      chThdSleepMicroseconds(250);
+  }
   volatile int subSteps = ((int)(2 * vbw / rbw));
   float RSSI = -150.0;
   int t = 0;
@@ -651,6 +693,8 @@ float perform(bool break_on_operation, int i, int32_t f, int extraV)
     if (lf != old_lf)                                           // only set on change
       setFreq (1, local_IF + lf);
     old_lf = lf;
+    if (MODE_OUTPUT(settingMode))
+      return(0);
     float subRSSI = SI4432_RSSI(lf, MODE_SELECT(settingMode))+settingLevelOffset()+settingAttenuate;
     if (RSSI < subRSSI)
       RSSI = subRSSI;

ui.c

@@ -1095,6 +1095,10 @@ menu_push_submenu(const menuitem_t *submenu)
   if (menu_is_form(submenu)) {
     redraw_frame();
     area_width = 0;
+  } else {
+    redraw_frame();
+    request_to_redraw_grid();
+    area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH;
   }
   draw_menu();
 }

ui_sa.c

@@ -38,13 +38,16 @@ extern int extraVFO;
 extern int settingDrive;
 extern int settingLNA;
 extern int settingAGC;
+void SetModulation(int);
+extern int settingModulation;
 // extern int settingSpeed;
 extern int settingStepDelay;
 
 
 
 enum {
-  KM_START=1, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_REFPOS, KM_SCALE, KM_ATTENUATION, KM_ACTUALPOWER, KM_IF, KM_SAMPLETIME, KM_DRIVE
+  KM_START=1, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_REFPOS, KM_SCALE, KM_ATTENUATION,
+  KM_ACTUALPOWER, KM_IF, KM_SAMPLETIME, KM_DRIVE, KM_LOWOUTLEVEL, KM_HIGHOUTLEVEL
 };
 
 
@@ -136,6 +139,7 @@ static const keypads_t keypads_level[] = {
 
 
 static const keypads_t * const keypads_mode_tbl[] = {
+  NULL,         // never used
   keypads_freq, // start
   keypads_freq, // stop
   keypads_freq, // center
@@ -148,6 +152,8 @@ static const keypads_t * const keypads_mode_tbl[] = {
   keypads_freq, // IF
   keypads_level, // sample time
   keypads_scale, // drive
+  keypads_level,    // KM_LOWOUTLEVEL
+  keypads_level,    // KM_HIGHOUTLEVEL
 };
 
 #ifdef __VNA__
@@ -157,7 +163,7 @@ static const char * const keypad_mode_label[] = {
 #endif
 #ifdef __SA__
 static const char * const keypad_mode_label[] = {
-  "START", "STOP", "CENTER", "SPAN", "CW FREQ", "REFPOS", "SCALE", "ATTENUATION", "ACTUALPOWER", "IF", "SAMPLE TIME", "DRIVE"
+  "error", "START", "STOP", "CENTER", "SPAN", "CW FREQ", "REFPOS", "SCALE", "ATTENUATION", "ACTUALPOWER", "IF", "SAMPLE TIME", "DRIVE", "LEVEL", "LEVEL"
 };
 #endif
 
@@ -169,6 +175,7 @@ int generator_enabled = false;
 
 extern const menuitem_t  menu_lowoutputmode[];
 extern const menuitem_t  menu_highoutputmode[];
+extern const menuitem_t  menu_modulation[];
 extern const menuitem_t  menu_top[];
 
 static void menu_mode_cb(int item, uint8_t data)
@@ -213,15 +220,20 @@ void menu_autosettings_cb(int item, uint8_t data)
   set_trace_refpos(2, - value / get_trace_scale(0) + NGRIDY);
 
   active_marker = 0;
-  menu_marker_type_cb(M_REFERENCE,M_REFERENCE);
 
-  set_refer_output(1);
+  for (int i = 0; i<MARKER_COUNT; i++ ) {
+      markers[i].mtype = M_NORMAL;
+  }
+  markers[0].mtype = M_REFERENCE;
+
+  //  set_refer_output(1);
+
   SetAttenuation(0);
-  SetPowerLevel(100); // Reset
+//  SetPowerLevel(100); // Reset
   SetClearStorage();
   SetRBW(0);
   dirty = true;
-  menu_move_back();
+//  menu_move_back();   // stay in input menu
   ui_mode_normal();
   draw_cal_status();
 }
@@ -264,6 +276,19 @@ static void menu_dfu_cb(int item, uint8_t data)
   }
 }
 
+int menu_modulation_value[]={0, MO_NONE,MO_AM, MO_NFM, MO_WFM};
+char *menu_modulation_text[]={"NONE","AM","NARROW FM","WIDE FM"};
+static void menu_modulation_cb(int item, uint8_t data)
+{
+  (void)data;
+//Serial.println(item);
+  SetModulation(menu_modulation_value[item]);
+  menu_move_back();
+//  ui_mode_normal();   // Stay in menu mode
+  draw_cal_status();
+}
+
+
 int menu_reffer_value[]={-1,0,1,2,3,4,5,6};
 char *menu_reffer_text[]={"OFF","30MHz","15MHz","10MHz","4MHz","3MHz","2MHz","1MHz"};
 static void menu_reffer_cb(int item, uint8_t data)
@@ -294,7 +319,7 @@ static void menu_spur_cb(int item, uint8_t data)
     SetSpur(0);
   else
     SetSpur(1); // must be 0 or 1 !!!!
-  menu_move_back();
+//  menu_move_back();
   ui_mode_normal();
   draw_cal_status();
 }
@@ -426,7 +451,13 @@ static void menu_lowoutputmode_cb(int item, uint8_t data)
 //  if (km == KM_SCALE && trace[uistat.current_trace].type == TRC_DELAY) {
 //    km = KM_SCALEDELAY;
 //  }
+
   status = btn_wait_release();
+
+  if (item == 3) {
+    menu_push_submenu(menu_modulation);
+  } else
+  {
     if (status & EVT_BUTTON_DOWN_LONG) {
       ui_mode_numeric(km);
       //    ui_process_numeric();
@@ -436,9 +467,10 @@ static void menu_lowoutputmode_cb(int item, uint8_t data)
       ui_mode_keypad(km);
       ui_process_keypad();
     }
+  }
   draw_cal_status();
 }
-
+#if 0
 static void menu_highoutputmode_cb(int item, uint8_t data)
 {
   int status;
@@ -460,7 +492,7 @@ static void menu_highoutputmode_cb(int item, uint8_t data)
   }
   draw_cal_status();
 }
-
+#endif
 
 static void menu_settings_cb(int item, uint8_t data)
 {
@@ -500,22 +532,23 @@ static void menu_stimulus_cb(int item, uint8_t data)
 {
   (void) data;
   int status;
-  switch (item) {
+  int km = item+KM_START;
-  case 0: /* START */
+  switch (km) {
-  case 1: /* STOP */
+  case KM_START: /* START */
-  case 2: /* CENTER */
+  case KM_STOP: /* STOP */
-  case 3: /* SPAN */
+  case KM_CENTER: /* CENTER */
-  case 4: /* CW */
+  case KM_SPAN: /* SPAN */
+  case KM_CW: /* CW */
     status = btn_wait_release();
     if (status & EVT_BUTTON_DOWN_LONG) {
-      ui_mode_numeric(item);
+      ui_mode_numeric(km);
 //      ui_process_numeric();
     } else {
-      ui_mode_keypad(item);
+      ui_mode_keypad(km);
       ui_process_keypad();
     }
     break;
-  case 5: /* PAUSE */
+  case KM_CW+1: /* PAUSE */
     toggle_sweep();
     menu_move_back();
     ui_mode_normal();
@@ -564,18 +597,30 @@ static const menuvalue_t menu_value[] = {
 
 // ===[MENU DEFINITION]=========================================================
 
+const menuitem_t  menu_modulation[] = {
+  { MT_FORM | MT_TITLE,    0,  "MODULATION",NULL},
+  { MT_FORM | MT_CALLBACK, 0,  "NONE",      menu_modulation_cb},
+  { MT_FORM | MT_CALLBACK, 0,  "AM",        menu_modulation_cb},
+  { MT_FORM | MT_CALLBACK, 0,  "NARROW FM", menu_modulation_cb},
+  { MT_FORM | MT_CALLBACK, 0,  "WIDE FM",   menu_modulation_cb},
+  { MT_FORM | MT_CANCEL,   0,             S_LARROW" BACK",NULL },
+  { MT_NONE, 0, NULL, NULL } // sentinel
+};
+
 const menuitem_t  menu_lowoutputmode[] = {
   { MT_FORM | MT_TITLE,    0,             "LOW OUTPUT",  NULL},
   { MT_FORM | MT_CALLBACK, KM_CENTER,     "FREQ: %s",    menu_lowoutputmode_cb},
-  { MT_FORM | MT_CALLBACK, KM_ATTENUATION,"LEVEL: %s",   menu_lowoutputmode_cb},
+  { MT_FORM | MT_CALLBACK, KM_LOWOUTLEVEL, "LEVEL: %s",   menu_lowoutputmode_cb},
+  { MT_FORM | MT_SUBMENU,  0,              "MODULATION: %s",   menu_modulation},
   { MT_FORM | MT_CANCEL,   0,             S_LARROW" BACK",NULL },
   { MT_NONE, 0, NULL, NULL } // sentinel
 };
 
 const menuitem_t  menu_highoutputmode[] = {
   { MT_FORM | MT_TITLE,    0,             "HIGH OUTPUT", NULL},
-  { MT_FORM | MT_CALLBACK, KM_CENTER,     "FREQ: %s",    menu_highoutputmode_cb},
+  { MT_FORM | MT_CALLBACK, KM_CENTER,     "FREQ: %s",    menu_lowoutputmode_cb},    // same menu as low mode
-  { MT_FORM | MT_CALLBACK, KM_DRIVE,      "LEVEL",       menu_highoutputmode_cb},
+  { MT_FORM | MT_CALLBACK, KM_HIGHOUTLEVEL,      "LEVEL: %s",   menu_lowoutputmode_cb},
+  { MT_FORM | MT_SUBMENU,  0,              "MODULATION: %s",   menu_modulation},
   { MT_FORM | MT_CANCEL,   0,             S_LARROW" BACK",NULL },
   { MT_NONE, 0, NULL, NULL } // sentinel
 };
@@ -786,6 +831,10 @@ static void menu_item_modify_attribute(
     } else if (item == 5) {
       plot_printf(uistat.text, sizeof uistat.text, menu_reffer_text[get_refer_output()+1]);
     }
+  } else if (menu == menu_lowoutputmode || menu == menu_highoutputmode) {
+    if (item == 3) {
+      plot_printf(uistat.text, sizeof uistat.text, menu_modulation_text[settingModulation]);
+    }
   } else if (menu == menu_reffer) {
     if (item < 5 && item == get_refer_output() + 1){
       *bg = DEFAULT_MENU_TEXT_COLOR;
@@ -928,8 +977,6 @@ static void fetch_numeric_target(void)
     break;
   case KM_ATTENUATION:
     uistat.value = settingAttenuate;
-    if (GetMode() == M_GENLOW)
-      uistat.value += 10;           // compensation for dB offset during low output mode
     plot_printf(uistat.text, sizeof uistat.text, "%ddB", uistat.value);
      break;
   case KM_ACTUALPOWER:
@@ -948,7 +995,15 @@ static void fetch_numeric_target(void)
     uistat.value = settingDrive;
     plot_printf(uistat.text, sizeof uistat.text, "%3ddB", uistat.value);
     break;
-
+  case KM_LOWOUTLEVEL:
+    uistat.value = settingAttenuate;
+    uistat.value = -10 - uistat.value;           // compensation for dB offset during low output mode
+    plot_printf(uistat.text, sizeof uistat.text, "%ddB", uistat.value);
+    break;
+  case KM_HIGHOUTLEVEL:
+    uistat.value = settingDrive*5 + 5;
+    plot_printf(uistat.text, sizeof uistat.text, "%3ddB", uistat.value);
+    break;
   }
   
   {
@@ -991,8 +1046,6 @@ set_numeric_value(void)
     set_trace_refpos(2, NGRIDY - uistat.value / get_trace_scale(0));
     break;
   case KM_ATTENUATION:
-    if (GetMode() == M_GENLOW)
-      uistat.value -= 10;           // compensation for dB offset during low output mode
     SetAttenuation(uistat.value);
     break;
   case KM_ACTUALPOWER:
@@ -1009,5 +1062,13 @@ set_numeric_value(void)
   case KM_DRIVE:
     SetDrive(uistat.value);
     break;
+  case KM_LOWOUTLEVEL:
+    uistat.value = -10 - uistat.value ;           // compensation for dB offset during low output mode
+    SetAttenuation(uistat.value);
+    break;
+  case KM_HIGHOUTLEVEL:
+    uistat.value = uistat.value / 5 - 1 ;           // compensation for dB offset during high output mode
+    SetDrive(uistat.value);
+    break;
   }
 }