pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-18 08:12:57 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/meshtastic/firmware

Browse Source
This commit is contained in:
Mark Edwards 2025-03-04 12:14:59 +11:00
commit 8930b8e54b
9 changed files with 127 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platformio.ini
View File

@ -7,6 +7,8 @@ default_envs = tbeam
extra_configs =
arch/*/*.ini
variants/*/platformio.ini
src/graphics/niche/InkHUD/PlatformioConfig.ini
description = Meshtastic
[env]
@ -77,7 +79,7 @@ lib_deps =
${env.lib_deps}
end2endzone/NonBlockingRTTTL@1.3.0
build_flags = ${env.build_flags} -Os
build_src_filter = ${env.build_src_filter} -<platform/portduino/>
build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
; Common libs for communicating over TCP/IP networks such as MQTT
[networking_base]

2
protobufs

@ -1 +1 @@
Subproject commit 2a3a67f0431926dc3f32a8b216d264daab09b9bf
Subproject commit eb42f6d262400fb32f8c242985af1acf12d9e7a9

3
src/graphics/niche/InkHUD/PlatformioConfig.ini
View File

@ -1,6 +1,5 @@
[inkhud]
board_level = extra
build_src_filter = +<../variants/$PIOENV> ; Include nicheGraphics.h
build_src_filter = +<../variants/$PIOENV> +<graphics/niche/>; Include nicheGraphics.h
build_flags =
-D MESHTASTIC_INCLUDE_NICHE_GRAPHICS ; Use NicheGraphics
-D MESHTASTIC_INCLUDE_INKHUD ; Use InkHUD (a NicheGraphics UI)

17
src/mesh/generated/meshtastic/interdevice.pb.cpp Normal file
View File

@ -0,0 +1,17 @@
/* Automatically generated nanopb constant definitions */
/* Generated by nanopb-0.4.9.1 */
#include "meshtastic/interdevice.pb.h"
#if PB_PROTO_HEADER_VERSION != 40
#error Regenerate this file with the current version of nanopb generator.
#endif
PB_BIND(meshtastic_SensorData, meshtastic_SensorData, AUTO)
PB_BIND(meshtastic_InterdeviceMessage, meshtastic_InterdeviceMessage, 2)

105
src/mesh/generated/meshtastic/interdevice.pb.h Normal file
View File

@ -0,0 +1,105 @@
/* Automatically generated nanopb header */
/* Generated by nanopb-0.4.9.1 */
#ifndef PB_MESHTASTIC_MESHTASTIC_INTERDEVICE_PB_H_INCLUDED
#define PB_MESHTASTIC_MESHTASTIC_INTERDEVICE_PB_H_INCLUDED
#include <pb.h>
#if PB_PROTO_HEADER_VERSION != 40
#error Regenerate this file with the current version of nanopb generator.
#endif
/* Enum definitions */
typedef enum _meshtastic_MessageType {
meshtastic_MessageType_ACK = 0,
meshtastic_MessageType_COLLECT_INTERVAL = 160, /* in ms */
meshtastic_MessageType_BEEP_ON = 161, /* duration ms */
meshtastic_MessageType_BEEP_OFF = 162, /* cancel prematurely */
meshtastic_MessageType_SHUTDOWN = 163,
meshtastic_MessageType_POWER_ON = 164,
meshtastic_MessageType_SCD41_TEMP = 176,
meshtastic_MessageType_SCD41_HUMIDITY = 177,
meshtastic_MessageType_SCD41_CO2 = 178,
meshtastic_MessageType_AHT20_TEMP = 179,
meshtastic_MessageType_AHT20_HUMIDITY = 180,
meshtastic_MessageType_TVOC_INDEX = 181
} meshtastic_MessageType;
/* Struct definitions */
typedef struct _meshtastic_SensorData {
/* The message type */
meshtastic_MessageType type;
pb_size_t which_data;
union {
float float_value;
uint32_t uint32_value;
} data;
} meshtastic_SensorData;
typedef struct _meshtastic_InterdeviceMessage {
pb_size_t which_data;
union {
char nmea[1024];
meshtastic_SensorData sensor;
} data;
} meshtastic_InterdeviceMessage;
#ifdef __cplusplus
extern "C" {
#endif
/* Helper constants for enums */
#define _meshtastic_MessageType_MIN meshtastic_MessageType_ACK
#define _meshtastic_MessageType_MAX meshtastic_MessageType_TVOC_INDEX
#define _meshtastic_MessageType_ARRAYSIZE ((meshtastic_MessageType)(meshtastic_MessageType_TVOC_INDEX+1))
#define meshtastic_SensorData_type_ENUMTYPE meshtastic_MessageType
/* Initializer values for message structs */
#define meshtastic_SensorData_init_default {_meshtastic_MessageType_MIN, 0, {0}}
#define meshtastic_InterdeviceMessage_init_default {0, {""}}
#define meshtastic_SensorData_init_zero {_meshtastic_MessageType_MIN, 0, {0}}
#define meshtastic_InterdeviceMessage_init_zero {0, {""}}
/* Field tags (for use in manual encoding/decoding) */
#define meshtastic_SensorData_type_tag 1
#define meshtastic_SensorData_float_value_tag 2
#define meshtastic_SensorData_uint32_value_tag 3
#define meshtastic_InterdeviceMessage_nmea_tag 1
#define meshtastic_InterdeviceMessage_sensor_tag 2
/* Struct field encoding specification for nanopb */
#define meshtastic_SensorData_FIELDLIST(X, a) \
X(a, STATIC, SINGULAR, UENUM, type, 1) \
X(a, STATIC, ONEOF, FLOAT, (data,float_value,data.float_value), 2) \
X(a, STATIC, ONEOF, UINT32, (data,uint32_value,data.uint32_value), 3)
#define meshtastic_SensorData_CALLBACK NULL
#define meshtastic_SensorData_DEFAULT NULL
#define meshtastic_InterdeviceMessage_FIELDLIST(X, a) \
X(a, STATIC, ONEOF, STRING, (data,nmea,data.nmea), 1) \
X(a, STATIC, ONEOF, MESSAGE, (data,sensor,data.sensor), 2)
#define meshtastic_InterdeviceMessage_CALLBACK NULL
#define meshtastic_InterdeviceMessage_DEFAULT NULL
#define meshtastic_InterdeviceMessage_data_sensor_MSGTYPE meshtastic_SensorData
extern const pb_msgdesc_t meshtastic_SensorData_msg;
extern const pb_msgdesc_t meshtastic_InterdeviceMessage_msg;
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
#define meshtastic_SensorData_fields &meshtastic_SensorData_msg
#define meshtastic_InterdeviceMessage_fields &meshtastic_InterdeviceMessage_msg
/* Maximum encoded size of messages (where known) */
#define MESHTASTIC_MESHTASTIC_INTERDEVICE_PB_H_MAX_SIZE meshtastic_InterdeviceMessage_size
#define meshtastic_InterdeviceMessage_size 1026
#define meshtastic_SensorData_size 9
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif

3
variants/heltec_vision_master_e213/platformio.ini
View File

@ -19,9 +19,6 @@ lib_deps =
lewisxhe/PCF8563_Library@^1.0.1
upload_speed = 115200
; Using experimental InkHUD UI (work in progress)
[platformio]
extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
[env:heltec-vision-master-e213-inkhud]
extends = esp32s3_base, inkhud
board = heltec_vision_master_e213

3
variants/heltec_vision_master_e290/platformio.ini
View File

@ -23,9 +23,6 @@ lib_deps =
lewisxhe/PCF8563_Library@^1.0.1
upload_speed = 115200
; Using experimental InkHUD UI (work in progress)
[platformio]
extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
[env:heltec-vision-master-e290-inkhud]
extends = esp32s3_base, inkhud
board = heltec_vision_master_e290

3
variants/heltec_wireless_paper/platformio.ini
View File

@ -20,9 +20,6 @@ lib_deps =
lewisxhe/PCF8563_Library@^1.0.1
upload_speed = 115200
; Using experimental InkHUD UI (work in progress)
[platformio]
extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
[env:heltec-wireless-paper-inkhud]
extends = esp32s3_base, inkhud
board = heltec_wifi_lora_32_V3

3
variants/t-echo/platformio.ini
View File

@ -24,9 +24,6 @@ lib_deps =
lewisxhe/PCF8563_Library@^1.0.1
;upload_protocol = fs
; Using experimental InkHUD UI (work in progress)
[platformio]
extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
[env:t-echo-inkhud]
extends = nrf52840_base, inkhud
board = t-echo