Dispatcher: skip the periodic AGC reset while packets are being received

examples/companion_radio/MyMesh.cpp

@@ -1175,7 +1175,9 @@ void MyMesh::handleCmdFrame(size_t len) {
                         ? ERR_CODE_NOT_FOUND
                         : ERR_CODE_UNSUPPORTED_CMD); // unknown recipient, or unsupported TXT_TYPE_*
     }
-  } else if (cmd_frame[0] == CMD_SEND_CHANNEL_TXT_MSG) { // send GroupChannel text msg
+  } else if (cmd_frame[0] == CMD_SEND_CHANNEL_TXT_MSG && len >= 7) { // send GroupChannel text msg
+    // 7 = code, txt_type, channel_idx and the 4 byte timestamp; the text may be empty.
+    // Without this the text length below is computed as len - 7 and turns negative.
     int i = 1;
     uint8_t txt_type = cmd_frame[i++]; // should be TXT_TYPE_PLAIN
     uint8_t channel_idx = cmd_frame[i++];
@@ -2122,6 +2124,23 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
     return true;
   }
 
+#ifdef PIN_BUZZER
+  if (strcmp(command, "get buzzer") == 0) {
+    sprintf(reply, "> %s", _prefs.buzzer_quiet ? "off" : "on");
+    return true;
+  }
+  if (memcmp(command, "set buzzer ", 11) == 0) {
+    if (strcmp(&command[11], "on") == 0 || strcmp(&command[11], "off") == 0) {
+      _prefs.buzzer_quiet = strcmp(&command[11], "off") == 0;
+      savePrefs();
+      strcpy(reply, "OK");
+    } else {
+      strcpy(reply, "Error: state must be on or off");
+    }
+    return true;
+  }
+#endif
+
   if (memcmp(command, "set pin ", 8) == 0) {
     _prefs.ble_pin = atoi(&command[8]);
     savePrefs();
@@ -2192,11 +2211,12 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
   }
 
   if (strcmp(command, "get tz.offset") == 0) {
-    sprintf(reply, "> %d", _prefs.tz_offset);
+    float q = _prefs.tz_offset * 4;
+    sprintf(reply, (q == (int)q && ((int)q & 1)) ? "> %.2f" : "> %.1f", _prefs.tz_offset);
     return true;
   }
   if (memcmp(command, "set tz.offset ", 14) == 0) {
-    int8_t tz = atof(&command[14]);
+    float tz = atof(&command[14]);
     if (tz < -12 || tz > 14) {
       strcpy(reply, "Error, must be from -12 to +14");
     } else {
@@ -2206,6 +2226,108 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
     }
     return true;
   }
+#ifdef DISPLAY_CLASS
+  if (memcmp(command, "set ui.show_clock", 17) == 0) {
+    _prefs.ui_show_clock = atoi(&command[17]) ? 1 : 0;
+    savePrefs();
+    sprintf(reply, "> now %d", _prefs.ui_show_clock);
+    return true;
+  }
+  if (memcmp(command, "set ui.auto_off_delay", 21) == 0) {
+    _prefs.ui_auto_off_delay = atoi(&command[21]);
+    savePrefs();
+    sprintf(reply, "> now %d seconds", _prefs.ui_auto_off_delay);
+    return true;
+  }
+  if (memcmp(command, "set ui.backlight_delay", 22) == 0) {
+    _prefs.ui_backlight_delay = atoi(&command[22]);
+    savePrefs();
+    if (_prefs.ui_backlight_delay >= 0)    
+      sprintf(reply, "> now %d seconds", _prefs.ui_backlight_delay);
+    else if (_prefs.ui_backlight_delay == -1)
+      sprintf(reply, "> now always on (-1)");
+    else
+      sprintf(reply, "> now disabled (<-1)");
+    return true;
+  }
+  if (memcmp(command, "set ui.backlight_on_keys", 24) == 0) {
+    _prefs.ui_backlight_on_keys = atoi(&command[24]);
+    savePrefs();
+    sprintf(reply, "> now %d", _prefs.ui_backlight_on_keys);
+    return true;
+  }
+  if (memcmp(command, "set ui.backlight_on_msgs", 24) == 0) {
+    _prefs.ui_backlight_on_msgs = atoi(&command[24]);
+    savePrefs();
+    sprintf(reply, "> now %d", _prefs.ui_backlight_on_msgs);
+    return true;
+  }
+  if (memcmp(command, "set ui.auto_off_blank", 21) == 0) {
+    _prefs.ui_auto_off_blank = atoi(&command[21]);
+    savePrefs();
+    sprintf(reply, "> now %d", _prefs.ui_auto_off_blank);
+    return true;
+  }
+  if (memcmp(command, "set ui.auto_off_keep_msgs", 25) == 0) {
+    _prefs.ui_auto_off_keep_msgs = atoi(&command[25]);
+    savePrefs();
+    sprintf(reply, "> now %d", _prefs.ui_auto_off_keep_msgs);
+    return true;
+  }
+  if (memcmp(command, "set ui.max_partial", 18) == 0) {
+    _prefs.ui_max_partial = atoi(&command[18]);
+    savePrefs();
+    sprintf(reply, "> now %d (applied at next screen wakeup)", _prefs.ui_max_partial);
+    return true;
+  }
+  if (memcmp(command, "set ui.nd_name", 14) == 0) {
+    _prefs.ui_nd_name = atoi(&command[14]);
+    savePrefs();
+    sprintf(reply, "> ui.nd_name is now %d", _prefs.ui_nd_name);
+    return true;
+  }
+  if (memcmp(command, "get ui.show_clock", 17) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_show_clock);
+    return true;
+  }
+  if (memcmp(command, "get ui.auto_off_delay", 21) == 0) {
+    sprintf(reply, "> %d seconds", _prefs.ui_auto_off_delay);
+    return true;
+  }
+  if (memcmp(command, "get ui.backlight_delay", 22) == 0) {
+    if (_prefs.ui_backlight_delay >= 0)    
+      sprintf(reply, "> %d seconds", _prefs.ui_backlight_delay);
+    else if (_prefs.ui_backlight_delay == -1)
+      sprintf(reply, "> always on (-1)");
+    else
+      sprintf(reply, "> disabled (<-1)");
+    return true;
+  }
+  if (memcmp(command, "get ui.backlight_on_keys", 24) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_backlight_on_keys);
+    return true;
+  }
+  if (memcmp(command, "get ui.backlight_on_msgs", 24) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_backlight_on_msgs);
+    return true;
+  }
+  if (memcmp(command, "get ui.auto_off_blank", 21) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_auto_off_blank);
+    return true;
+  }
+  if (memcmp(command, "get ui.auto_off_keep_msgs", 25) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_auto_off_keep_msgs);
+    return true;
+  }
+  if (memcmp(command, "get ui.max_partial", 18) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_max_partial);
+    return true;
+  }
+  if (memcmp(command, "get ui.nd_name", 14) == 0) {
+    sprintf(reply, "> %d", _prefs.ui_nd_name);
+    return true;
+  }
+#endif
 
   return false;  // not handled
 }

examples/companion_radio/NodePrefs.h

@@ -47,7 +47,7 @@ class NodePrefs : public ConfigSerializer {  // persisted to file
   uint8_t agc_reset_interval = 0;  // secs / 4
   char default_scope_name[31];
   uint8_t default_scope_key[16];
-  int8_t tz_offset = 0;
+  float tz_offset = 0;
 #ifdef ENABLE_WIFI_INTERFACE
   #ifndef WIFI_SSID
     #define WIFI_SSID ""
@@ -58,6 +58,34 @@ class NodePrefs : public ConfigSerializer {  // persisted to file
   // use ssid from prefs, or fallback to ssid from build flags
   const char* getWifiSSID() const { return wifi_ssid[0] ? wifi_ssid : WIFI_SSID; }
 #endif
+#ifdef DISPLAY_CLASS
+  #ifndef UI_SHOW_CLOCK
+    #define UI_SHOW_CLOCK 0
+  #endif
+  #ifndef AUTO_OFF_MILLIS
+    #define AUTO_OFF_MILLIS 15000
+  #endif
+  #ifndef EINK_MAX_PARTIAL_REFRESH
+    #define EINK_MAX_PARTIAL_REFRESH 0
+  #endif
+  uint8_t ui_show_clock = UI_SHOW_CLOCK;
+  uint32_t ui_auto_off_delay = AUTO_OFF_MILLIS / 1000;
+  int32_t ui_backlight_delay = 5;
+  #if defined(BACKLIGHT_BTN)
+  uint8_t ui_backlight_on_keys = 0;
+  #else
+  uint8_t ui_backlight_on_keys = 1;
+  #endif
+  uint8_t ui_backlight_on_msgs = 0;
+#ifdef UI_SCREENOFF_BLANK
+  uint8_t ui_auto_off_blank = 1;
+#else
+  uint8_t ui_auto_off_blank = 0;
+#endif
+  uint8_t ui_auto_off_keep_msgs = 1;
+  uint8_t ui_max_partial = EINK_MAX_PARTIAL_REFRESH;
+  uint8_t ui_nd_name = 1;
+#endif
 
 private:
   class RadioPrefs : public CommonRadioPrefs {
@@ -102,8 +130,8 @@ class NodePrefs : public ConfigSerializer {  // persisted to file
     void setIntThresh(uint8_t t) override { _parent->interference_threshold = t; markDirty(); }
     uint8_t getRxGain() const override { return _parent->rx_boosted_gain; }
     void setRxGain(uint8_t g) override { _parent->rx_boosted_gain = g; markDirty(); }
-    uint8_t getTxPower() const override { return _parent->tx_power_dbm; }
-    void setTxPower(uint8_t dbm) override { _parent->tx_power_dbm = dbm; markDirty(); }
+    int8_t getTxPower() const override { return _parent->tx_power_dbm; }
+    void setTxPower(int8_t dbm) override { _parent->tx_power_dbm = dbm; markDirty(); }
     float getRxDelay() const override { return _parent->rx_delay_base; }
     void setRxDelay(float d) override { _parent->rx_delay_base = d; markDirty(); }
     uint16_t getAgcResetInt() const override { return _parent->agc_reset_interval * 4; }
@@ -189,6 +217,27 @@ class NodePrefs : public ConfigSerializer {  // persisted to file
   WiFiPrefs wifi;
 #endif
 
+#ifdef DISPLAY_CLASS
+  class UI_Prefs : public ConfigSerializer {
+    NodePrefs* _parent;
+  protected:
+    void structure() override {
+  	def("show_clock", _parent->ui_show_clock);
+  	def("auto_off", _parent->ui_auto_off_delay);
+  	def("bl_dly", _parent->ui_backlight_delay);
+  	def("bl_keys", _parent->ui_backlight_on_keys);
+  	def("bl_msgs", _parent->ui_backlight_on_msgs);
+    def("max_partial", _parent->ui_max_partial);
+  	def("off_blank", _parent->ui_auto_off_blank);
+  	def("off_keep_msgs", _parent->ui_auto_off_keep_msgs);
+    def("nd_name", _parent->ui_nd_name);
+    }
+  public:
+    UI_Prefs(NodePrefs* parent) : _parent(parent) {}
+  };
+  UI_Prefs ui;
+#endif
+
 protected:
   void structure() override {
     def("name", node_name, sizeof(node_name));
@@ -203,12 +252,18 @@ class NodePrefs : public ConfigSerializer {  // persisted to file
     def("custom", custom);
 #ifdef ENABLE_WIFI_INTERFACE
     def("wifi", wifi);
+#endif
+#ifdef DISPLAY_CLASS
+    def("ui", ui);
 #endif
   }
 public:
   NodePrefs() : radio(this), gps(this), companion(this), custom(&radio)
 #ifdef ENABLE_WIFI_INTERFACE
     , wifi(this)
+#endif
+#ifdef DISPLAY_CLASS
+    , ui(this)
 #endif
   {
     node_name[0] = 0;