mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-08 14:12:05 +00:00
Merge remote-tracking branch 'upstream/master' into StandaloneAddons
This commit is contained in:
HarukiToreda
commit
ec50801726
2
.github/workflows/test_native.yml
vendored
2
.github/workflows/test_native.yml
vendored
@ -143,7 +143,7 @@ jobs:
|
||||
merge-multiple: true
|
||||
|
||||
- name: Test Report
|
||||
uses: dorny/test-reporter@v2.0.0
|
||||
uses: dorny/test-reporter@v2.1.0
|
||||
with:
|
||||
name: PlatformIO Tests
|
||||
path: testreport.xml
|
||||
|
||||
@ -108,7 +108,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/7dee10ad31a0c6ea04880cba399e240be743d752.zip
|
||||
https://github.com/meshtastic/device-ui/archive/c9a55f661a735d1f393a02657e5183ccf39cf1a2.zip
|
||||
|
||||
; Common libs for environmental measurements in telemetry module
|
||||
[environmental_base]
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 4eb0aebaef1304a5516b6fa864cb4c55daed9147
|
||||
Subproject commit d8b709aa5da85959a80a06a6624761678a96f9c0
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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" */
|
||||
|
||||
@ -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");
|
||||
|
||||
@ -189,12 +189,12 @@ bool ICM20948Singleton::init(ScanI2C::FoundDevice device)
|
||||
enableDebugging();
|
||||
#endif
|
||||
|
||||
// startup
|
||||
#if defined(WIRE_INTERFACES_COUNT) && (WIRE_INTERFACES_COUNT > 1)
|
||||
// startup
|
||||
#if defined(WIRE_INTERFACES_COUNT) && (WIRE_INTERFACES_COUNT > 1)
|
||||
TwoWire &bus = (device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
|
||||
#else
|
||||
#else
|
||||
TwoWire &bus = Wire; // fallback if only one I2C interface
|
||||
#endif
|
||||
#endif
|
||||
|
||||
bool bAddr = (device.address.address == 0x69);
|
||||
delay(100);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user