diff --git a/platformio.ini b/platformio.ini index c40dd4c4d..0b7006eb9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -263,4 +263,4 @@ monitor_port = /dev/ttyUSB0 monitor_speed = 115200 # For experimenting with RAM sizes -# board_build.ldscript = linker/nrf52840_s140_sim832.ld +# board_build.ldscript = linker/nrf52840_s140_sim832.ld \ No newline at end of file diff --git a/proto b/proto index 6c39b5bf4..792027be9 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 6c39b5bf472677122b3ebf77b434af09038ff0dc +Subproject commit 792027be9390ae6eeafd0ca395c7dcf09f1860f0 diff --git a/src/mesh/generated/radioconfig.pb.h b/src/mesh/generated/radioconfig.pb.h index 6c37e695d..9a22c6504 100644 --- a/src/mesh/generated/radioconfig.pb.h +++ b/src/mesh/generated/radioconfig.pb.h @@ -97,7 +97,8 @@ typedef enum _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType { RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT21 = 3, RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT22 = 4, RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME280 = 5, - RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME680 = 6 + RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME680 = 6, + RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MCP9808 = 7 } RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType; /* Struct definitions */ @@ -223,8 +224,8 @@ typedef struct _RadioConfig { #define _InputEventChar_ARRAYSIZE ((InputEventChar)(InputEventChar_KEY_BACK+1)) #define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11 -#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MAX RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME680 -#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_ARRAYSIZE ((RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType)(RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME680+1)) +#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MAX RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MCP9808 +#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_ARRAYSIZE ((RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType)(RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MCP9808+1)) #ifdef __cplusplus