diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 8cad265..ee2fdaa 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -482,6 +482,33 @@ message ModuleConfig { * air quality metrics to the mesh */ uint32 air_quality_interval = 7; + + /* + * Interval in seconds of how often we should try to send our + * air quality metrics to the mesh + */ + bool power_measurement_enabled = 8; + + /* + * Interval in seconds of how often we should try to send our + * air quality metrics to the mesh + */ + uint32 power_update_interval = 9; + + /* + * Interval in seconds of how often we should try to send our + * air quality metrics to the mesh + */ + bool power_screen_enabled = 10; + + + + + + + + + } /* diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index 041acc5..3843631 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -58,16 +58,51 @@ message EnvironmentMetrics { float gas_resistance = 4; /* - * Voltage measured + * Voltage measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x) */ float voltage = 5; /* - * Current measured + * Current measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x) */ float current = 6; } +/* + * Power Metrics (voltage / current / etc) + */ +message PowerMetrics { + /* + * Voltage (Ch1) + */ + float ch1_voltage = 1; + + /* + * Current (Ch1) + */ + float ch1_current = 2; + + /* + * Voltage (Ch2) + */ + float ch2_voltage = 3; + + /* + * Current (Ch2) + */ + float ch2_current = 4; + + /* + * Voltage (Ch3) + */ + float ch3_voltage = 5; + + /* + * Current (Ch3) + */ + float ch3_current = 6; +} + /* * Air quality metrics */ @@ -157,6 +192,11 @@ message Telemetry { * Air quality metrics */ AirQualityMetrics air_quality_metrics = 4; + + /* + * Power Metrics + */ + PowerMetrics power_metrics = 5; } } @@ -233,4 +273,12 @@ enum TelemetrySensorType { * PM2.5 air quality sensor */ PMSA003I = 13; + + /* + * INA3221 3 Channel Voltage / Current Sensor + */ + INA3221 = 14; + + + } \ No newline at end of file