rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-03 00:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into StandaloneAddons

Browse Source
This commit is contained in:
HarukiToreda
2025-05-19 20:00:03 -04:00
parent 6db585051e c70fa0ef13
commit ec50801726
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -1303,10 +1303,6 @@ void setup()
LOG_DEBUG("Free heap : %7d bytes", ESP.getFreeHeap());
LOG_DEBUG("Free PSRAM : %7d bytes", ESP.getFreePsram());
#endif
#if !defined(ARCH_STM32WL)
if (accelerometerThread)
accelerometerThread->calibrate(30);
#endif
}
#endif

4
src/mesh/generated/meshtastic/telemetry.pb.cpp
View File

@@ -24,10 +24,10 @@ PB_BIND(meshtastic_LocalStats, meshtastic_LocalStats, AUTO)
PB_BIND(meshtastic_HealthMetrics, meshtastic_HealthMetrics, AUTO)
PB_BIND(meshtastic_HostMetrics, meshtastic_HostMetrics, AUTO)
PB_BIND(meshtastic_HostMetrics, meshtastic_HostMetrics, 2)
PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, AUTO)
PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, 2)
PB_BIND(meshtastic_Nau7802Config, meshtastic_Nau7802Config, AUTO)

24
src/mesh/generated/meshtastic/telemetry.pb.h
View File

@@ -89,7 +89,9 @@ typedef enum _meshtastic_TelemetrySensorType {
/* RAKWireless RAK12035 Soil Moisture Sensor Module */
meshtastic_TelemetrySensorType_RAK12035 = 37,
/* MAX17261 lipo battery gauge */
meshtastic_TelemetrySensorType_MAX17261 = 38
meshtastic_TelemetrySensorType_MAX17261 = 38,
/* PCT2075 Temperature Sensor */
meshtastic_TelemetrySensorType_PCT2075 = 39
} meshtastic_TelemetrySensorType;
/* Struct definitions */
@@ -310,6 +312,10 @@ typedef struct _meshtastic_HostMetrics {
uint16_t load5;
/* Host system fifteen minute load in 1/100ths */
uint16_t load15;
/* Optional User-provided string for arbitrary host system information
that doesn't make sense as a dedicated entry. */
bool has_user_string;
char user_string[200];
} meshtastic_HostMetrics;
/* Types of Measurements the telemetry module is equipped to handle */
@@ -350,8 +356,8 @@ extern "C" {
/* Helper constants for enums */
#define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_MAX17261
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_MAX17261+1))
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_PCT2075
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_PCT2075+1))
@@ -370,7 +376,7 @@ extern "C" {
#define meshtastic_AirQualityMetrics_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}
#define meshtastic_LocalStats_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#define meshtastic_HealthMetrics_init_default {false, 0, false, 0, false, 0}
#define meshtastic_HostMetrics_init_default {0, 0, 0, false, 0, false, 0, 0, 0, 0}
#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_DeviceMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0}
@@ -379,7 +385,7 @@ extern "C" {
#define meshtastic_AirQualityMetrics_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}
#define meshtastic_LocalStats_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#define meshtastic_HealthMetrics_init_zero {false, 0, false, 0, false, 0}
#define meshtastic_HostMetrics_init_zero {0, 0, 0, false, 0, false, 0, 0, 0, 0}
#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}
@@ -452,6 +458,7 @@ extern "C" {
#define meshtastic_HostMetrics_load1_tag 6
#define meshtastic_HostMetrics_load5_tag 7
#define meshtastic_HostMetrics_load15_tag 8
#define meshtastic_HostMetrics_user_string_tag 9
#define meshtastic_Telemetry_time_tag 1
#define meshtastic_Telemetry_device_metrics_tag 2
#define meshtastic_Telemetry_environment_metrics_tag 3
@@ -556,7 +563,8 @@ X(a, STATIC, OPTIONAL, UINT64, diskfree2_bytes, 4) \
X(a, STATIC, OPTIONAL, UINT64, diskfree3_bytes, 5) \
X(a, STATIC, SINGULAR, UINT32, load1, 6) \
X(a, STATIC, SINGULAR, UINT32, load5, 7) \
X(a, STATIC, SINGULAR, UINT32, load15, 8)
X(a, STATIC, SINGULAR, UINT32, load15, 8) \
X(a, STATIC, OPTIONAL, STRING, user_string, 9)
#define meshtastic_HostMetrics_CALLBACK NULL
#define meshtastic_HostMetrics_DEFAULT NULL
@@ -612,11 +620,11 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
#define meshtastic_DeviceMetrics_size 27
#define meshtastic_EnvironmentMetrics_size 113
#define meshtastic_HealthMetrics_size 11
#define meshtastic_HostMetrics_size 62
#define meshtastic_HostMetrics_size 264
#define meshtastic_LocalStats_size 60
#define meshtastic_Nau7802Config_size 16
#define meshtastic_PowerMetrics_size 30
#define meshtastic_Telemetry_size 120
#define meshtastic_Telemetry_size 272
#ifdef __cplusplus
} /* extern "C" */

3
src/modules/Telemetry/HostMetrics.cpp
View File

@@ -69,8 +69,9 @@ meshtastic_MeshPacket *HostMetricsModule::allocReply()
meshtastic_Telemetry HostMetricsModule::getHostMetrics()
{
std::string file_line;
meshtastic_Telemetry t = meshtastic_HostMetrics_init_zero;
meshtastic_Telemetry t = meshtastic_Telemetry_init_zero;
t.which_variant = meshtastic_Telemetry_host_metrics_tag;
t.variant.host_metrics = meshtastic_HostMetrics_init_zero;
if (access("/proc/uptime", R_OK) == 0) {
std::ifstream proc_uptime("/proc/uptime");

12
src/motion/ICM20948Sensor.cpp
View File

@@ -189,12 +189,12 @@ bool ICM20948Singleton::init(ScanI2C::FoundDevice device)
enableDebugging();
#endif
// startup
#if defined(WIRE_INTERFACES_COUNT) && (WIRE_INTERFACES_COUNT > 1)
TwoWire &bus = (device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
TwoWire &bus = Wire; // fallback if only one I2C interface
#endif
// startup
#if defined(WIRE_INTERFACES_COUNT) && (WIRE_INTERFACES_COUNT > 1)
TwoWire &bus = (device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
TwoWire &bus = Wire; // fallback if only one I2C interface
#endif
bool bAddr = (device.address.address == 0x69);
delay(100);