Merge branch 'develop' into fix-radio-init

platformio.ini

@@ -119,7 +119,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/69739b84f87a91568d3c421498bc89977937a141.zip
+	https://github.com/meshtastic/device-ui/archive/37ad715b76cd6ca4aa500a4a4d9740e3cdf3e3cb.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/graphics/draw/MessageRenderer.cpp

@@ -431,6 +431,45 @@ static int getDrawnLinePixelBottom(int lineTopY, const std::string &line, bool i
     return iconTop + tallest - 1;
 }
 
+static void drawRoundedRectOutline(OLEDDisplay *display, int x, int y, int w, int h, int r)
+{
+    if (w <= 1 || h <= 1)
+        return;
+
+    if (r < 0)
+        r = 0;
+
+    int maxR = (std::min(w, h) / 2) - 1;
+    if (r > maxR)
+        r = maxR;
+
+    if (r == 0) {
+        display->drawRect(x, y, w, h);
+        return;
+    }
+
+    const int x0 = x;
+    const int y0 = y;
+    const int x1 = x + w - 1;
+    const int y1 = y + h - 1;
+
+    // sides
+    if (x0 + r <= x1 - r) {
+        display->drawLine(x0 + r, y0, x1 - r, y0); // top
+        display->drawLine(x0 + r, y1, x1 - r, y1); // bottom
+    }
+    if (y0 + r <= y1 - r) {
+        display->drawLine(x0, y0 + r, x0, y1 - r); // left
+        display->drawLine(x1, y0 + r, x1, y1 - r); // right
+    }
+
+    // corner arcs
+    display->drawCircleQuads(x0 + r, y0 + r, r, 2); // top left
+    display->drawCircleQuads(x1 - r, y0 + r, r, 1); // top right
+    display->drawCircleQuads(x1 - r, y1 - r, r, 8); // bottom right
+    display->drawCircleQuads(x0 + r, y1 - r, r, 4); // bottom left
+}
+
 static std::vector<MessageBlock> buildMessageBlocks(const std::vector<bool> &isHeaderVec, const std::vector<bool> &isMineVec)
 {
     std::vector<MessageBlock> blocks;
@@ -870,37 +909,27 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
             bubbleW = std::max(1, rightEdge - bubbleX);
 
         if (bubbleW > 1 && bubbleH > 1) {
+            int r = BUBBLE_RADIUS;
+            int maxR = (std::min(bubbleW, bubbleH) / 2) - 1;
+            if (maxR < 0)
+                maxR = 0;
+            if (r > maxR)
+                r = maxR;
+
+            drawRoundedRectOutline(display, bubbleX, topY, bubbleW, bubbleH, r);
+            const int extra = 3;
+            const int rr = r + extra;
             int x1 = bubbleX + bubbleW - 1;
             int y1 = topY + bubbleH - 1;
 
-            if (b.mine) {
-                // Send Message (Right side)
-                display->drawRect(x1 + 2 - bubbleW, y1 - bubbleH, bubbleW, bubbleH);
-                // Top Right Corner
-                display->drawRect(x1, topY, 2, 1);
-                display->drawRect(x1, topY, 1, 2);
-                // Bottom Right Corner
-                display->drawRect(x1 - 1, bottomY - 2, 2, 1);
-                display->drawRect(x1, bottomY - 3, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(x1 - bubbleW, topY - 1, 1, 1);
-                display->drawRect(x1 - bubbleW, bottomY - 1, 1, 1);
-                display->setColor(WHITE);
+            if (!b.mine) {
+                // top-left corner square
+                display->drawLine(bubbleX, topY, bubbleX + rr, topY);
+                display->drawLine(bubbleX, topY, bubbleX, topY + rr);
             } else {
-                // Received Message (Left Side)
-                display->drawRect(bubbleX, topY, bubbleW + 1, bubbleH);
-                // Top Left Corner
-                display->drawRect(bubbleX + 1, topY + 1, 2, 1);
-                display->drawRect(bubbleX + 1, topY + 1, 1, 2);
-                // Bottom Left Corner
-                display->drawRect(bubbleX + 1, bottomY - 1, 2, 1);
-                display->drawRect(bubbleX + 1, bottomY - 2, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(bubbleX + bubbleW, topY, 1, 1);
-                display->drawRect(bubbleX + bubbleW, bottomY, 1, 1);
-                display->setColor(WHITE);
+                // bottom-right corner square
+                display->drawLine(x1 - rr, y1, x1, y1);
+                display->drawLine(x1, y1 - rr, x1, y1);
             }
         }
     }

src/mesh/generated/meshtastic/admin.pb.cpp

@@ -27,15 +27,6 @@ PB_BIND(meshtastic_SharedContact, meshtastic_SharedContact, AUTO)
 PB_BIND(meshtastic_KeyVerificationAdmin, meshtastic_KeyVerificationAdmin, AUTO)
 
 
-PB_BIND(meshtastic_SensorConfig, meshtastic_SensorConfig, AUTO)
-
-
-PB_BIND(meshtastic_SCD4X_config, meshtastic_SCD4X_config, AUTO)
-
-
-PB_BIND(meshtastic_SEN5X_config, meshtastic_SEN5X_config, AUTO)
-
-
 
 
 

src/mesh/generated/meshtastic/admin.pb.h

@@ -171,48 +171,6 @@ typedef struct _meshtastic_KeyVerificationAdmin {
     uint32_t security_number;
 } meshtastic_KeyVerificationAdmin;
 
-typedef struct _meshtastic_SCD4X_config {
-    /* Set Automatic self-calibration enabled */
-    bool has_set_asc;
-    bool set_asc;
-    /* Recalibration target CO2 concentration in ppm (FRC or ASC) */
-    bool has_set_target_co2_conc;
-    uint32_t set_target_co2_conc;
-    /* Reference temperature in degC */
-    bool has_set_temperature;
-    float set_temperature;
-    /* Altitude of sensor in meters above sea level. 0 - 3000m (overrides ambient pressure) */
-    bool has_set_altitude;
-    uint32_t set_altitude;
-    /* Sensor ambient pressure in Pa. 70000 - 120000 Pa (overrides altitude) */
-    bool has_set_ambient_pressure;
-    uint32_t set_ambient_pressure;
-    /* Perform a factory reset of the sensor */
-    bool has_factory_reset;
-    bool factory_reset;
-    /* Power mode for sensor (true for low power, false for normal) */
-    bool has_set_power_mode;
-    bool set_power_mode;
-} meshtastic_SCD4X_config;
-
-typedef struct _meshtastic_SEN5X_config {
-    /* Reference temperature in degC */
-    bool has_set_temperature;
-    float set_temperature;
-    /* One-shot mode (true for low power - one-shot mode, false for normal - continuous mode) */
-    bool has_set_one_shot_mode;
-    bool set_one_shot_mode;
-} meshtastic_SEN5X_config;
-
-typedef struct _meshtastic_SensorConfig {
-    /* SCD4X CO2 Sensor configuration */
-    bool has_scd4x_config;
-    meshtastic_SCD4X_config scd4x_config;
-    /* SEN5X PM Sensor configuration */
-    bool has_sen5x_config;
-    meshtastic_SEN5X_config sen5x_config;
-} meshtastic_SensorConfig;
-
 typedef PB_BYTES_ARRAY_T(8) meshtastic_AdminMessage_session_passkey_t;
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
  This message is used to do settings operations to both remote AND local nodes.
@@ -345,8 +303,6 @@ typedef struct _meshtastic_AdminMessage {
         bool nodedb_reset;
         /* Tell the node to reset into the OTA Loader */
         meshtastic_AdminMessage_OTAEvent ota_request;
-        /* Parameters and sensor configuration */
-        meshtastic_SensorConfig sensor_config;
     };
     /* The node generates this key and sends it with any get_x_response packets.
  The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
@@ -395,9 +351,6 @@ extern "C" {
 #define meshtastic_KeyVerificationAdmin_message_type_ENUMTYPE meshtastic_KeyVerificationAdmin_MessageType
 
 
-
-
-
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_default {0, 0, 0, 0}
@@ -406,9 +359,6 @@ extern "C" {
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_SharedContact_init_default    {0, false, meshtastic_User_init_default, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
-#define meshtastic_SensorConfig_init_default     {false, meshtastic_SCD4X_config_init_default, false, meshtastic_SEN5X_config_init_default}
-#define meshtastic_SCD4X_config_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_SEN5X_config_init_default     {false, 0, false, 0}
 #define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_zero {0, 0, 0, 0}
 #define meshtastic_AdminMessage_OTAEvent_init_zero {_meshtastic_OTAMode_MIN, {0, {0}}}
@@ -416,9 +366,6 @@ extern "C" {
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 #define meshtastic_SharedContact_init_zero       {0, false, meshtastic_User_init_zero, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_zero {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
-#define meshtastic_SensorConfig_init_zero        {false, meshtastic_SCD4X_config_init_zero, false, meshtastic_SEN5X_config_init_zero}
-#define meshtastic_SCD4X_config_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_SEN5X_config_init_zero        {false, 0, false, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_AdminMessage_InputEvent_event_code_tag 1
@@ -440,17 +387,6 @@ extern "C" {
 #define meshtastic_KeyVerificationAdmin_remote_nodenum_tag 2
 #define meshtastic_KeyVerificationAdmin_nonce_tag 3
 #define meshtastic_KeyVerificationAdmin_security_number_tag 4
-#define meshtastic_SCD4X_config_set_asc_tag      1
-#define meshtastic_SCD4X_config_set_target_co2_conc_tag 2
-#define meshtastic_SCD4X_config_set_temperature_tag 3
-#define meshtastic_SCD4X_config_set_altitude_tag 4
-#define meshtastic_SCD4X_config_set_ambient_pressure_tag 5
-#define meshtastic_SCD4X_config_factory_reset_tag 6
-#define meshtastic_SCD4X_config_set_power_mode_tag 7
-#define meshtastic_SEN5X_config_set_temperature_tag 1
-#define meshtastic_SEN5X_config_set_one_shot_mode_tag 2
-#define meshtastic_SensorConfig_scd4x_config_tag 1
-#define meshtastic_SensorConfig_sen5x_config_tag 2
 #define meshtastic_AdminMessage_get_channel_request_tag 1
 #define meshtastic_AdminMessage_get_channel_response_tag 2
 #define meshtastic_AdminMessage_get_owner_request_tag 3
@@ -507,7 +443,6 @@ extern "C" {
 #define meshtastic_AdminMessage_factory_reset_config_tag 99
 #define meshtastic_AdminMessage_nodedb_reset_tag 100
 #define meshtastic_AdminMessage_ota_request_tag  102
-#define meshtastic_AdminMessage_sensor_config_tag 103
 #define meshtastic_AdminMessage_session_passkey_tag 101
 
 /* Struct field encoding specification for nanopb */
@@ -568,8 +503,7 @@ X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_se
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_config,factory_reset_config),  99) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,nodedb_reset,nodedb_reset), 100) \
 X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sensor_config,sensor_config), 103)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102)
 #define meshtastic_AdminMessage_CALLBACK NULL
 #define meshtastic_AdminMessage_DEFAULT NULL
 #define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel
@@ -591,7 +525,6 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sensor_config,sensor_config)
 #define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
 #define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin
 #define meshtastic_AdminMessage_payload_variant_ota_request_MSGTYPE meshtastic_AdminMessage_OTAEvent
-#define meshtastic_AdminMessage_payload_variant_sensor_config_MSGTYPE meshtastic_SensorConfig
 
 #define meshtastic_AdminMessage_InputEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   event_code,        1) \
@@ -638,31 +571,6 @@ X(a, STATIC,   OPTIONAL, UINT32,   security_number,   4)
 #define meshtastic_KeyVerificationAdmin_CALLBACK NULL
 #define meshtastic_KeyVerificationAdmin_DEFAULT NULL
 
-#define meshtastic_SensorConfig_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  scd4x_config,      1) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  sen5x_config,      2)
-#define meshtastic_SensorConfig_CALLBACK NULL
-#define meshtastic_SensorConfig_DEFAULT NULL
-#define meshtastic_SensorConfig_scd4x_config_MSGTYPE meshtastic_SCD4X_config
-#define meshtastic_SensorConfig_sen5x_config_MSGTYPE meshtastic_SEN5X_config
-
-#define meshtastic_SCD4X_config_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_asc,           1) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_target_co2_conc,   2) \
-X(a, STATIC,   OPTIONAL, FLOAT,    set_temperature,   3) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_altitude,      4) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_ambient_pressure,   5) \
-X(a, STATIC,   OPTIONAL, BOOL,     factory_reset,     6) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_power_mode,    7)
-#define meshtastic_SCD4X_config_CALLBACK NULL
-#define meshtastic_SCD4X_config_DEFAULT NULL
-
-#define meshtastic_SEN5X_config_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, FLOAT,    set_temperature,   1) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_one_shot_mode,   2)
-#define meshtastic_SEN5X_config_CALLBACK NULL
-#define meshtastic_SEN5X_config_DEFAULT NULL
-
 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_InputEvent_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_OTAEvent_msg;
@@ -670,9 +578,6 @@ extern const pb_msgdesc_t meshtastic_HamParameters_msg;
 extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
 extern const pb_msgdesc_t meshtastic_SharedContact_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
-extern const pb_msgdesc_t meshtastic_SensorConfig_msg;
-extern const pb_msgdesc_t meshtastic_SCD4X_config_msg;
-extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
@@ -682,9 +587,6 @@ extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 #define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
 #define meshtastic_SharedContact_fields &meshtastic_SharedContact_msg
 #define meshtastic_KeyVerificationAdmin_fields &meshtastic_KeyVerificationAdmin_msg
-#define meshtastic_SensorConfig_fields &meshtastic_SensorConfig_msg
-#define meshtastic_SCD4X_config_fields &meshtastic_SCD4X_config_msg
-#define meshtastic_SEN5X_config_fields &meshtastic_SEN5X_config_msg
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
@@ -694,9 +596,6 @@ extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 #define meshtastic_HamParameters_size            31
 #define meshtastic_KeyVerificationAdmin_size     25
 #define meshtastic_NodeRemoteHardwarePinsResponse_size 496
-#define meshtastic_SCD4X_config_size             29
-#define meshtastic_SEN5X_config_size             7
-#define meshtastic_SensorConfig_size             40
 #define meshtastic_SharedContact_size            127
 
 #ifdef __cplusplus

src/mesh/generated/meshtastic/telemetry.pb.cpp

@@ -33,9 +33,6 @@ PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, 2)
 PB_BIND(meshtastic_Nau7802Config, meshtastic_Nau7802Config, AUTO)
 
 
-PB_BIND(meshtastic_SEN5XState, meshtastic_SEN5XState, AUTO)
-
-
 
 
 

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -435,25 +435,6 @@ typedef struct _meshtastic_Nau7802Config {
     float calibrationFactor;
 } meshtastic_Nau7802Config;
 
-/* SEN5X State, for saving to flash */
-typedef struct _meshtastic_SEN5XState {
-    /* Last cleaning time for SEN5X */
-    uint32_t last_cleaning_time;
-    /* Last cleaning time for SEN5X - valid flag */
-    bool last_cleaning_valid;
-    /* Config flag for one-shot mode (see admin.proto) */
-    bool one_shot_mode;
-    /* Last VOC state time for SEN55 */
-    bool has_voc_state_time;
-    uint32_t voc_state_time;
-    /* Last VOC state validity flag for SEN55 */
-    bool has_voc_state_valid;
-    bool voc_state_valid;
-    /* VOC state array (8x uint8t) for SEN55 */
-    bool has_voc_state_array;
-    uint64_t voc_state_array;
-} meshtastic_SEN5XState;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -474,7 +455,6 @@ extern "C" {
 
 
 
-
 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
@@ -485,7 +465,6 @@ extern "C" {
 #define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_Nau7802Config_init_default    {0, 0}
-#define meshtastic_SEN5XState_init_default       {0, 0, 0, false, 0, false, 0, false, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
@@ -495,7 +474,6 @@ extern "C" {
 #define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_zero           {0, 0, {meshtastic_DeviceMetrics_init_zero}}
 #define meshtastic_Nau7802Config_init_zero       {0, 0}
-#define meshtastic_SEN5XState_init_zero          {0, 0, 0, false, 0, false, 0, false, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_DeviceMetrics_battery_level_tag 1
@@ -603,12 +581,6 @@ extern "C" {
 #define meshtastic_Telemetry_host_metrics_tag    8
 #define meshtastic_Nau7802Config_zeroOffset_tag  1
 #define meshtastic_Nau7802Config_calibrationFactor_tag 2
-#define meshtastic_SEN5XState_last_cleaning_time_tag 1
-#define meshtastic_SEN5XState_last_cleaning_valid_tag 2
-#define meshtastic_SEN5XState_one_shot_mode_tag  3
-#define meshtastic_SEN5XState_voc_state_time_tag 4
-#define meshtastic_SEN5XState_voc_state_valid_tag 5
-#define meshtastic_SEN5XState_voc_state_array_tag 6
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceMetrics_FIELDLIST(X, a) \
@@ -759,16 +731,6 @@ X(a, STATIC,   SINGULAR, FLOAT,    calibrationFactor,   2)
 #define meshtastic_Nau7802Config_CALLBACK NULL
 #define meshtastic_Nau7802Config_DEFAULT NULL
 
-#define meshtastic_SEN5XState_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   last_cleaning_time,   1) \
-X(a, STATIC,   SINGULAR, BOOL,     last_cleaning_valid,   2) \
-X(a, STATIC,   SINGULAR, BOOL,     one_shot_mode,     3) \
-X(a, STATIC,   OPTIONAL, UINT32,   voc_state_time,    4) \
-X(a, STATIC,   OPTIONAL, BOOL,     voc_state_valid,   5) \
-X(a, STATIC,   OPTIONAL, FIXED64,  voc_state_array,   6)
-#define meshtastic_SEN5XState_CALLBACK NULL
-#define meshtastic_SEN5XState_DEFAULT NULL
-
 extern const pb_msgdesc_t meshtastic_DeviceMetrics_msg;
 extern const pb_msgdesc_t meshtastic_EnvironmentMetrics_msg;
 extern const pb_msgdesc_t meshtastic_PowerMetrics_msg;
@@ -778,7 +740,6 @@ extern const pb_msgdesc_t meshtastic_HealthMetrics_msg;
 extern const pb_msgdesc_t meshtastic_HostMetrics_msg;
 extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
-extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_DeviceMetrics_fields &meshtastic_DeviceMetrics_msg
@@ -790,7 +751,6 @@ extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 #define meshtastic_HostMetrics_fields &meshtastic_HostMetrics_msg
 #define meshtastic_Telemetry_fields &meshtastic_Telemetry_msg
 #define meshtastic_Nau7802Config_fields &meshtastic_Nau7802Config_msg
-#define meshtastic_SEN5XState_fields &meshtastic_SEN5XState_msg
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
@@ -802,7 +762,6 @@ extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 #define meshtastic_LocalStats_size               87
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             81
-#define meshtastic_SEN5XState_size               27
 #define meshtastic_Telemetry_size                272
 
 #ifdef __cplusplus

src/platform/nrf52/main-nrf52.cpp

@@ -464,6 +464,22 @@ void cpuDeepSleep(uint32_t msecToWake)
         // FIXME, use non-init RAM per
         // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled
 
+#ifdef ELECROW_ThinkNode_M1
+        nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
+        nrf_gpio_pin_sense_t sense = NRF_GPIO_PIN_SENSE_LOW;
+        nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense);
+
+        nrf_gpio_cfg_input(PIN_BUTTON2, NRF_GPIO_PIN_PULLUP);
+        nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
+        nrf_gpio_cfg_sense_set(PIN_BUTTON2, sense1);
+#endif
+
+#ifdef PROMICRO_DIY_TCXO
+        nrf_gpio_cfg_input(BUTTON_PIN, NRF_GPIO_PIN_PULLUP); // Enable internal pull-up on the button pin
+        nrf_gpio_pin_sense_t sense = NRF_GPIO_PIN_SENSE_LOW; // Configure SENSE signal on low edge
+        nrf_gpio_cfg_sense_set(BUTTON_PIN, sense);           // Apply SENSE to wake up the device from the deep sleep
+#endif
+
 #ifdef BATTERY_LPCOMP_INPUT
         // Wake up if power rises again
         nrf_lpcomp_config_t c;

variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini

@@ -1,17 +1,8 @@
 [env:heltec-wireless-tracker-v2]
-custom_meshtastic_support_level = 1
-custom_meshtastic_images = heltec_wireless_tracker_v2.svg
-custom_meshtastic_tags = Heltec
-
 extends = esp32s3_base
 board = heltec_wireless_tracker_v2
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
-custom_meshtastic_hw_model = 113
-custom_meshtastic_hw_model_slug = HELTEC_WIRELESS_TRACKER_V2
-custom_meshtastic_architecture = esp32s3
-custom_meshtastic_display_name = Heltec Wireless Tracker V2
-custom_meshtastic_actively_supported = true
 
 build_flags = 
   ${esp32s3_base.build_flags}

variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp

@@ -59,11 +59,4 @@ void variant_shutdown()
             NRF_GPIO->DIRCLR = (1 << pin);
         }
     }
-    nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
-    nrf_gpio_pin_sense_t sense = NRF_GPIO_PIN_SENSE_LOW;
-    nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense);
-
-    nrf_gpio_cfg_input(PIN_BUTTON2, NRF_GPIO_PIN_PULLUP);
-    nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
-    nrf_gpio_cfg_sense_set(PIN_BUTTON2, sense1);
 }

variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp

@@ -49,21 +49,3 @@ void initVariant()
     pinMode(Battery_LED_4, OUTPUT);
     ledOff(Battery_LED_4);
 }
-
-/// called from main-nrf52.cpp during the cpuDeepSleep() function
-void variant_shutdown()
-{
-    for (int pin = 0; pin < 48; pin++) {
-        if (pin == PIN_GPS_EN || pin == PIN_BUTTON1) {
-            continue;
-        }
-        pinMode(pin, OUTPUT);
-        digitalWrite(pin, LOW);
-        if (pin >= 32) {
-            NRF_P1->DIRCLR = (1 << (pin - 32));
-        } else {
-            NRF_GPIO->DIRCLR = (1 << pin);
-        }
-    }
-    digitalWrite(PIN_GPS_EN, HIGH);
-}

variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.cpp

@@ -36,10 +36,3 @@ void initVariant()
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
 }
-
-void variant_shutdown()
-{
-    nrf_gpio_cfg_input(BUTTON_PIN, NRF_GPIO_PIN_PULLUP); // Enable internal pull-up on the button pin
-    nrf_gpio_pin_sense_t sense = NRF_GPIO_PIN_SENSE_LOW; // Configure SENSE signal on low edge
-    nrf_gpio_cfg_sense_set(BUTTON_PIN, sense);           // Apply SENSE to wake up the device from the deep sleep
-}