From 1babf60ca28e5a718bf68ae7c2ec8daf254324b5 Mon Sep 17 00:00:00 2001 From: Fabrizio Zellini Date: Fri, 31 May 2024 15:05:31 +0200 Subject: [PATCH] merged telemetry.pb.h --- src/mesh/generated/meshtastic/telemetry.pb.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h index 74d300e4b4..08f0e410d5 100644 --- a/src/mesh/generated/meshtastic/telemetry.pb.h +++ b/src/mesh/generated/meshtastic/telemetry.pb.h @@ -58,11 +58,7 @@ typedef enum _meshtastic_TelemetrySensorType { meshtastic_TelemetrySensorType_LTR390UV = 21, /* AMS TSL25911FN RGB Light Sensor */ meshtastic_TelemetrySensorType_TSL25911FN = 22, -<<<<<<< trackerd /* AHT10/20 Temperature Sensor */ -======= - /* AHT10 Integrated temperature and humidity sensor */ ->>>>>>> master meshtastic_TelemetrySensorType_AHT10 = 23 } meshtastic_TelemetrySensorType; @@ -323,4 +319,4 @@ extern const pb_msgdesc_t meshtastic_Telemetry_msg; } /* extern "C" */ #endif -#endif +#endif \ No newline at end of file