From 279def79110c9ea0b5656f9d103fa516a77d96fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 11:31:13 -0500 Subject: [PATCH] [create-pull-request] automated change (#1356) Co-authored-by: thebentern --- proto | 2 +- src/mesh/generated/mesh.pb.h | 2 ++ src/mesh/generated/telemetry.pb.h | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/proto b/proto index 31eaff092..e1ef519d0 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 31eaff092449a75ebbbf0114cf120c746dc96349 +Subproject commit e1ef519d07b180a05298857374fd60a6165b7a75 diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index 653c36e2d..b4a9dbf90 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -63,6 +63,8 @@ typedef enum _HardwareModel { HardwareModel_RAK11200 = 40, /* B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano */ HardwareModel_NANO_G1 = 41, + /* nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ */ + HardwareModel_NRF52840_PCA10059 = 42, /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */ HardwareModel_PRIVATE_HW = 255 } HardwareModel; diff --git a/src/mesh/generated/telemetry.pb.h b/src/mesh/generated/telemetry.pb.h index 1fb5ea0d7..b3bf3df1d 100644 --- a/src/mesh/generated/telemetry.pb.h +++ b/src/mesh/generated/telemetry.pb.h @@ -40,10 +40,10 @@ typedef struct _EnvironmentMetrics { /* Types of Measurements the telemetry module is equipped to handle */ typedef struct _Telemetry { - /* This is usually not sent over the mesh (to save space), but it is sent - from the phone so that the local device can set its RTC If it is sent over - the mesh (because there are devices on the mesh without GPS), it will only - be sent by devices which has a hardware GPS clock (IE Mobile Phone). + /* This is usually not sent over the mesh (to save space), but it is sent + from the phone so that the local device can set its RTC If it is sent over + the mesh (because there are devices on the mesh without GPS), it will only + be sent by devices which has a hardware GPS clock (IE Mobile Phone). seconds since 1970 */ uint32_t time; /* Key native device metrics such as battery level */