Skip to content

Commit aeb6d50

Browse files
f1smfjp-bennettgithub-actions[bot]thebenternCopilot
committed
Merge master into develop (#2)
* Hostmetrics user string (meshtastic#6850) * [create-pull-request] automated change (meshtastic#6857) Co-authored-by: thebentern <[email protected]> * Increase the debt ceiling * Add basic handling for is_manually_validated (meshtastic#6856) * If a contact is add from a QR, it's "verified" manually (meshtastic#6858) * If a contact is add from a QR, it's "verified" manually * Update src/mesh/NodeDB.cpp Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]> * Update meshtastic/device-ui digest to 405ca49 (meshtastic#6865) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * InkHUD Extended ASCII (meshtastic#6768) * Custom AdafruitGFX fonts with extended ASCII encodings * AppletFont handles re-encoding of UTF-8 text * Manual parsing of text which may contain non-ASCII chars * Display emoji reactions, even when unprintable Important to indicate to users that a message has been received, even if meaning is unclear. * Superstitious shrink_to_fit I don't think these help, but they're not hurting! * Use Windows-1252 fonts by default * Spelling * Tidy up nicheGraphics.h * Documentation * Fix inverted logic Slipped in during a last minute renaming while tidying up to push.. * Added map report precision bounds (meshtastic#6862) * Added map report precision bounds * Log warning * Precision range should be 12-15 * Missed commit * Update tests * That method was renamed * Removed now-defunct test call * Remove defunct test * update seeed solar node led pin (meshtastic#6871) * Update Adafruit PM25 AQI Sensor to v2 (meshtastic#6778) * Bosch bsec2: Switch back to official releases (meshtastic#6870) * Update meshtastic/device-ui digest to 0e9bb79 (meshtastic#6880) fix bluetooth fixedPin during restart (meshtastic#135) * Update meshtastic/device-ui digest to 2fba9de (meshtastic#6882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * graphics: Add GDEY0213B74 E-Ink display driver (meshtastic#6879) Implement the GDEY0213B74 driver with configuration methods for scanning, waveform, update sequence, and polling for refresh completion. This driver supports both fast and full update types for the 2.13 inch E-Ink display. Signed-off-by: ChihoSin [email protected] Signed-off-by: ChihoSin [email protected] * feat(RadioInterface): Tx power gain calculation rework (meshtastic#6796) - Rename REGULATORY_GAIN_LORA to TX_GAIN_LORA - Move gain-based Tx power clamping from RadioInterface::applyModemConfig() to RadioInterface::limitPower() - User-configured Tx power now matches the Tx power out of the device connector - Re-order [LoRa Chip]Interface.cpp limitPower() to take place before the final Tx power clamping so we clamp based on the pre-PA Tx power rather than user-configured Tx power Tested on XIAO BLE variant. Signed-off-by: Andrew Yong <[email protected]> Co-authored-by: Ben Meadors <[email protected]> * Upgrade trunk (meshtastic#6843) Co-authored-by: sachaw <[email protected]> * [create-pull-request] automated change (meshtastic#6885) Co-authored-by: thebentern <[email protected]> * chore(deps): update meshtastic/device-ui digest to e63b219 (meshtastic#6883) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix is_unmessagable plumbing (meshtastic#6886) * Add PCT2075 Temperature Sensor (meshtastic#6829) This is an I2C temperature sensor. It is intended to be a drop-in compatible sensor for the LM75, however it is more accurate. Co-authored-by: Ben Meadors <[email protected]> * Add heap metrics to Local stats (meshtastic#6887) * Add missing parsing of UTF-8 chars (meshtastic#6889) * automated bumps (meshtastic#6890) Co-authored-by: thebentern <[email protected]> * Linux: Adjust udev rules for gpio (meshtastic#6891) * Upgrade trunk (meshtastic#6898) Co-authored-by: sachaw <[email protected]> * [create-pull-request] automated change (meshtastic#6905) Co-authored-by: jp-bennett <[email protected]> * Don't cancel sending ReTx for relayer if we're ROUTER(_LATE)/REPEATER (meshtastic#6904) Co-authored-by: Ben Meadors <[email protected]> * Add LINK32 (Lilygo) Board with Light+Environment sensors (meshtastic#6899) * Add LINK32 (Lilygo) Board with Light+Environment sensors TODO: replace PRIVATE_HW with actual HWID * Add LINK32 (Lilygo) Board with Light+Environment sensors TODO: replace PRIVATE_HW with actual HWID * Update to real HWID and trunk fmt * [create-pull-request] automated change (meshtastic#6909) Co-authored-by: thebentern <[email protected]> * Coerce user.id to always be derive from the nodenum (meshtastic#6906) * Coerce user.id to always be derive from the nodenum * Additionally null it out on send * Revert "Additionally null it out on send" This reverts commit 22a2d68. * Parse own short name in LogoApplet (meshtastic#6913) * chore(deps): update meshtastic/device-ui digest to 3dfcc97 (meshtastic#6912) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * add support for seeed wio tracker L1 (meshtastic#6907) * add support for seeed wio tracker l1 * add support in nrf52 arch * fix ADC problem and comments incorrect * fix gps wakeup pin * fix gps pin * Trunk * Upgrade trunk to 1.24.0 (meshtastic#6915) Co-authored-by: sachaw <[email protected]> * Added full support for LTR390UV readings of UV and Lux (meshtastic#6872) * Added full support for LTR390UV readings of UV and Lux * Trunk formatting * Added full support for LTR390UV readings of UV and Lux * Trunk formatting * fix library check and unnecessary bit resolution change * fixed log info messages and removed unused dependency * Hopefully fixes git mess * fix variable scope and getMetrics returns * set metrics flags bavk to false in case something wrong happens while reading LTR390UV mode --------- Co-authored-by: Domingo <[email protected]> Co-authored-by: Ben Meadors <[email protected]> * Add a new screen for heltec_wireless_paper. (meshtastic#6894) Co-authored-by: Ben Meadors <[email protected]> * Revert "Add a new screen for heltec_wireless_paper. (meshtastic#6894)" (meshtastic#6918) This reverts commit ba53543. * Fix renovate for Adafruit PCT2075 (meshtastic#6919) * Update TSL2591Sensor.cpp (meshtastic#6921) Lower gain and timing to avoid saturation in bright light * Upgrade trunk (meshtastic#6922) Co-authored-by: sachaw <[email protected]> * chore(deps): update meshtastic/device-ui digest to 37e2fb8 (meshtastic#6925) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Don't give LOG_INFO a null * chore(deps): update meshtastic/device-ui digest to 04e3a07 (meshtastic#6942) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Upgrade trunk (meshtastic#6941) Co-authored-by: sachaw <[email protected]> Co-authored-by: Ben Meadors <[email protected]> * chore(deps): update meshtastic/device-ui digest to 649e095 (meshtastic#6943) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add --1200bps-reset param to device-install/update scripts (meshtastic#6752) * add change-mode support * add change-mode support * tab to space * fix if check * change param name to 1200bps-reset * update help section * missed one in help seciton --------- Co-authored-by: Ben Meadors <[email protected]> * automated bumps (meshtastic#6944) Co-authored-by: thebentern <[email protected]> --------- Signed-off-by: ChihoSin [email protected] Signed-off-by: Andrew Yong <[email protected]> Co-authored-by: Jonathan Bennett <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: thebentern <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: todd-herbert <[email protected]> Co-authored-by: dylanli <[email protected]> Co-authored-by: Austin <[email protected]> Co-authored-by: Chiho Sin <[email protected]> Co-authored-by: Andrew Yong <[email protected]> Co-authored-by: sachaw <[email protected]> Co-authored-by: Michael Cullen <[email protected]> Co-authored-by: jp-bennett <[email protected]> Co-authored-by: GUVWAF <[email protected]> Co-authored-by: Thomas Göttgens <[email protected]> Co-authored-by: dmarman <[email protected]> Co-authored-by: Domingo <[email protected]> Co-authored-by: Quency-D <[email protected]> Co-authored-by: ArgoNavi <[email protected]> Co-authored-by: Kalle Lilja <[email protected]>
1 parent 89a4589 commit aeb6d50

File tree

18 files changed

+218
-190
lines changed

18 files changed

+218
-190
lines changed

‎.trunk/trunk.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
version: 0.1
22
cli:
3-
version: 1.24.0
3+
version: 1.22.15
44
plugins:
55
sources:
66
- id: trunk
7-
ref: v1.7.0
7+
ref: v1.6.8
88
uri: https://github.com/trunk-io/plugins
99
lint:
1010
enabled:
11-
- [email protected].442
12-
- renovate@40.59.4
11+
- [email protected].435
12+
- renovate@40.36.2
1313
- [email protected]
14-
- trufflehog@3.89.2
14+
- trufflehog@3.88.35
1515
- [email protected]
16-
- [email protected].5
16+
- [email protected].3
1717
- [email protected]
1818
- [email protected]
19-
- [email protected].13
19+
- [email protected].12
2020
- [email protected]
2121
- [email protected]
2222
- [email protected]

‎bin/device-install.sh

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
44
WEB_APP=false
55
BPS_RESET=false
6+
BPS_RESET=false
67
TFT_BUILD=false
78
MCU=""
89

@@ -75,8 +76,8 @@ set -e
7576

7677
# Usage info
7778
show_help() {
78-
cat <<EOF
79-
Usage: $(basename "$0") [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web] [--1200bps-reset]
79+
cat <<EOF
80+
Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web]
8081
Flash image file to device, but first erasing and writing system information.
8182
8283
-h Display this help and exit.
@@ -90,46 +91,48 @@ EOF
9091
}
9192
# Parse arguments using a single while loop
9293
while [ $# -gt 0 ]; do
93-
case "$1" in
94-
-h | --help)
95-
show_help
96-
exit 0
97-
;;
98-
-p)
99-
ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
100-
shift
101-
;;
102-
-P)
103-
PYTHON="$2"
104-
shift
105-
;;
106-
-f)
107-
FILENAME="$2"
108-
shift
109-
;;
110-
--web)
111-
WEB_APP=true
112-
;;
113-
--1200bps-reset)
114-
BPS_RESET=true
115-
;;
116-
--) # Stop parsing options
117-
shift
118-
break
119-
;;
120-
*)
121-
echo "Unknown argument: $1" >&2
122-
exit 1
123-
;;
124-
esac
125-
shift # Move to the next argument
94+
case "$1" in
95+
-h | --help)
96+
show_help
97+
exit 0
98+
;;
99+
-p)
100+
ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
101+
shift
102+
;;
103+
-P)
104+
PYTHON="$2"
105+
shift
106+
;;
107+
-f)
108+
FILENAME="$2"
109+
shift
110+
;;
111+
--web)
112+
WEB_APP=true
113+
;;
114+
--) # Stop parsing options
115+
shift
116+
break
117+
;;
118+
*)
119+
echo "Unknown argument: $1" >&2
120+
exit 1
121+
;;
122+
esac
123+
shift # Move to the next argument
126124
done
127125

128126
if [[ $BPS_RESET == true ]]; then
129127
$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
130128
exit 0
131129
fi
132130

131+
if [[ $BPS_RESET == true ]]; then
132+
$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
133+
exit 0
134+
fi
135+
133136
[ -z "$FILENAME" ] && [ -n "$1" ] && {
134137
FILENAME="$1"
135138
shift

‎bin/device-update.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,13 @@ if [[ $CHANGE_MODE == true ]]; then
6060
exit 0
6161
fi
6262

63+
<<<<<<< HEAD
6364
[ -z "$FILENAME" ] && [ -n "$1" ] && {
6465
FILENAME="$1"
66+
=======
67+
[ -z "$FILENAME" -a -n "$1" ] && {
68+
FILENAME=$1
69+
>>>>>>> 49353c40 (Merge master into develop (#2))
6570
shift
6671
}
6772

‎bin/org.meshtastic.meshtasticd.metainfo.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@
8787
</screenshots>
8888

8989
<releases>
90-
<release version="2.6.13" date="2025-06-16">
91-
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.13</url>
92-
</release>
93-
<release version="2.6.12" date="2025-06-15">
94-
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.12</url>
95-
</release>
9690
<release version="2.6.11" date="2025-06-02">
9791
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.11</url>
9892
</release>

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
meshtasticd (2.6.13.0) UNRELEASED; urgency=medium
1+
meshtasticd (2.6.11.0) UNRELEASED; urgency=medium
22

33
[ Austin Lane ]
44
* Initial packaging
@@ -23,3 +23,4 @@ meshtasticd (2.6.13.0) UNRELEASED; urgency=medium
2323
* GitHub Actions Automatic version bump
2424

2525
-- <github-actions[bot]@users.noreply.github.com> Mon, 16 Jun 2025 02:10:49 +0000
26+
-- <github-actions[bot]@users.noreply.github.com> Mon, 02 Jun 2025 20:00:55 +0000

‎platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ lib_deps =
108108
[device-ui_base]
109109
lib_deps =
110110
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
111-
https://github.com/meshtastic/device-ui/archive/301f11e584cbeccf08af923bb2a0e02b669bda0b.zip
111+
https://github.com/meshtastic/device-ui/archive/649e0953508ee4aabf1171519ee2eb69fb125647.zip
112112

113113
; Common libs for environmental measurements in telemetry module
114114
[environmental_base]

‎src/graphics/niche/Drivers/EInk/GDEY0213B74.cpp

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,66 @@ void GDEY0213B74::configUpdateSequence()
4242
}
4343
}
4444

45+
// Once the refresh operation has been started,
46+
// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
47+
// Only used when refresh is "async"
48+
void GDEY0213B74::detachFromUpdate()
49+
{
50+
switch (updateType) {
51+
case FAST:
52+
return beginPolling(50, 500); // At least 500ms for fast refresh
53+
case FULL:
54+
default:
55+
return beginPolling(100, 2000); // At least 2 seconds for full refresh
56+
}
57+
}
58+
#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS#include "./GDEY0213B74.h"
59+
60+
#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
61+
62+
using namespace NicheGraphics::Drivers;
63+
64+
// Map the display controller IC's output to the connected panel
65+
void GDEY0213B74::configScanning()
66+
{
67+
// "Driver output control"
68+
sendCommand(0x01);
69+
sendData(0xF9);
70+
sendData(0x00);
71+
sendData(0x00);
72+
73+
// To-do: delete this method?
74+
// Values set here might be redundant: F9, 00, 00 seems to be default
75+
}
76+
77+
// Specify which information is used to control the sequence of voltages applied to move the pixels
78+
// - For this display, configUpdateSequence() specifies that a suitable LUT will be loaded from
79+
// the controller IC's OTP memory, when the update procedure begins.
80+
void GDEY0213B74::configWaveform()
81+
{
82+
sendCommand(0x3C); // Border waveform:
83+
sendData(0x05); // Screen border should follow LUT1 waveform (actively drive pixels white)
84+
85+
sendCommand(0x18); // Temperature sensor:
86+
sendData(0x80); // Use internal temperature sensor to select an appropriate refresh waveform
87+
}
88+
89+
void GDEY0213B74::configUpdateSequence()
90+
{
91+
switch (updateType) {
92+
case FAST:
93+
sendCommand(0x22); // Set "update sequence"
94+
sendData(0xFF); // Will load LUT from OTP memory, Display mode 2 "differential refresh"
95+
break;
96+
97+
case FULL:
98+
default:
99+
sendCommand(0x22); // Set "update sequence"
100+
sendData(0xF7); // Will load LUT from OTP memory
101+
break;
102+
}
103+
}
104+
45105
// Once the refresh operation has been started,
46106
// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
47107
// Only used when refresh is "async"

‎src/graphics/niche/Drivers/EInk/GDEY0213B74.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,45 @@ class GDEY0213B74 : public SSD16XX
4141

4242
} // namespace NicheGraphics::Drivers
4343

44+
#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS/*
45+
46+
E-Ink display driver
47+
- GDEY0213B74
48+
- Manufacturer: Goodisplay
49+
- Size: 2.13 inch
50+
- Resolution: 250px x 122px
51+
- Flex connector marking: FPC-A002
52+
53+
*/
54+
55+
#pragma once
56+
57+
#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
58+
59+
#include "configuration.h"
60+
61+
#include "./SSD16XX.h"
62+
63+
namespace NicheGraphics::Drivers
64+
{
65+
class GDEY0213B74 : public SSD16XX
66+
{
67+
// Display properties
68+
private:
69+
static constexpr uint32_t width = 122;
70+
static constexpr uint32_t height = 250;
71+
static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
72+
73+
public:
74+
GDEY0213B74() : SSD16XX(width, height, supported) {}
75+
76+
protected:
77+
virtual void configScanning() override;
78+
virtual void configWaveform() override;
79+
virtual void configUpdateSequence() override;
80+
void detachFromUpdate() override;
81+
};
82+
83+
} // namespace NicheGraphics::Drivers
84+
4485
#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

‎src/mesh/NodeDB.cpp

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,23 +1547,12 @@ void NodeDB::addFromContact(meshtastic_SharedContact contact)
15471547
info->num = contact.node_num;
15481548
info->has_user = true;
15491549
info->user = TypeConversions::ConvertToUserLite(contact.user);
1550-
if (contact.should_ignore) {
1551-
// If should_ignore is set,
1552-
// we need to clear the public key and other cruft, in addition to setting the node as ignored
1553-
info->is_ignored = true;
1554-
info->has_device_metrics = false;
1555-
info->has_position = false;
1556-
info->user.public_key.size = 0;
1557-
info->user.public_key.bytes[0] = 0;
1558-
} else {
1559-
info->last_heard = getValidTime(RTCQualityNTP);
1560-
info->is_favorite = true;
1561-
info->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
1562-
// Mark the node's key as manually verified to indicate trustworthiness.
1563-
updateGUIforNode = info;
1564-
powerFSM.trigger(EVENT_NODEDB_UPDATED);
1565-
notifyObservers(true); // Force an update whether or not our node counts have changed
1566-
}
1550+
info->is_favorite = true;
1551+
// Mark the node's key as manually verified to indicate trustworthiness.
1552+
info->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
1553+
updateGUIforNode = info;
1554+
powerFSM.trigger(EVENT_NODEDB_UPDATED);
1555+
notifyObservers(true); // Force an update whether or not our node counts have changed
15671556
saveNodeDatabaseToDisk();
15681557
}
15691558

‎src/mesh/generated/meshtastic/admin.pb.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ extern "C" {
310310

311311

312312

313+
#define meshtastic_KeyVerificationAdmin_message_type_ENUMTYPE meshtastic_KeyVerificationAdmin_MessageType
314+
313315

314316
#define meshtastic_KeyVerificationAdmin_message_type_ENUMTYPE meshtastic_KeyVerificationAdmin_MessageType
315317

@@ -319,13 +321,21 @@ extern "C" {
319321
#define meshtastic_AdminMessage_InputEvent_init_default {0, 0, 0, 0}
320322
#define meshtastic_HamParameters_init_default {"", 0, 0, ""}
321323
#define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
324+
<<<<<<< HEAD
322325
#define meshtastic_SharedContact_init_default {0, false, meshtastic_User_init_default, 0}
326+
=======
327+
#define meshtastic_SharedContact_init_default {0, false, meshtastic_User_init_default}
328+
>>>>>>> 49353c40 (Merge master into develop (#2))
323329
#define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
324330
#define meshtastic_AdminMessage_init_zero {0, {0}, {0, {0}}}
325331
#define meshtastic_AdminMessage_InputEvent_init_zero {0, 0, 0, 0}
326332
#define meshtastic_HamParameters_init_zero {"", 0, 0, ""}
327333
#define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
334+
<<<<<<< HEAD
328335
#define meshtastic_SharedContact_init_zero {0, false, meshtastic_User_init_zero, 0}
336+
=======
337+
#define meshtastic_SharedContact_init_zero {0, false, meshtastic_User_init_zero}
338+
>>>>>>> 49353c40 (Merge master into develop (#2))
329339
#define meshtastic_KeyVerificationAdmin_init_zero {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
330340

331341
/* Field tags (for use in manual encoding/decoding) */
@@ -340,7 +350,10 @@ extern "C" {
340350
#define meshtastic_NodeRemoteHardwarePinsResponse_node_remote_hardware_pins_tag 1
341351
#define meshtastic_SharedContact_node_num_tag 1
342352
#define meshtastic_SharedContact_user_tag 2
353+
<<<<<<< HEAD
343354
#define meshtastic_SharedContact_should_ignore_tag 3
355+
=======
356+
>>>>>>> 49353c40 (Merge master into develop (#2))
344357
#define meshtastic_KeyVerificationAdmin_message_type_tag 1
345358
#define meshtastic_KeyVerificationAdmin_remote_nodenum_tag 2
346359
#define meshtastic_KeyVerificationAdmin_nonce_tag 3
@@ -478,6 +491,7 @@ X(a, STATIC, SINGULAR, BYTES, session_passkey, 101)
478491
#define meshtastic_AdminMessage_payload_variant_store_ui_config_MSGTYPE meshtastic_DeviceUIConfig
479492
#define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
480493
#define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin
494+
<<<<<<< HEAD
481495

482496
#define meshtastic_AdminMessage_InputEvent_FIELDLIST(X, a) \
483497
X(a, STATIC, SINGULAR, UINT32, event_code, 1) \
@@ -486,6 +500,8 @@ X(a, STATIC, SINGULAR, UINT32, touch_x, 3) \
486500
X(a, STATIC, SINGULAR, UINT32, touch_y, 4)
487501
#define meshtastic_AdminMessage_InputEvent_CALLBACK NULL
488502
#define meshtastic_AdminMessage_InputEvent_DEFAULT NULL
503+
=======
504+
>>>>>>> 49353c40 (Merge master into develop (#2))
489505

490506
#define meshtastic_HamParameters_FIELDLIST(X, a) \
491507
X(a, STATIC, SINGULAR, STRING, call_sign, 1) \

‎src/mesh/generated/meshtastic/deviceonly.pb.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ typedef struct _meshtastic_NodeInfoLite {
9797
/* Last byte of the node number of the node that should be used as the next hop to reach this node. */
9898
uint8_t next_hop;
9999
/* Bitfield for storing booleans.
100+
LSB 0 is_key_manually_verified */
101+
uint32_t bitfield;
102+
/* Bitfield for storing booleans.
100103
LSB 0 is_key_manually_verified */
101104
uint32_t bitfield;
102105
} meshtastic_NodeInfoLite;
@@ -360,7 +363,7 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
360363
/* Maximum encoded size of messages (where known) */
361364
/* meshtastic_NodeDatabase_size depends on runtime parameters */
362365
#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
363-
#define meshtastic_BackupPreferences_size 2271
366+
#define meshtastic_BackupPreferences_size 2267
364367
#define meshtastic_ChannelFile_size 718
365368
#define meshtastic_DeviceState_size 1722
366369
#define meshtastic_NodeInfoLite_size 196

0 commit comments

Comments
 (0)