Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warning: extra tokens at end of #endif directive. #4432

Merged
merged 98 commits into from
Aug 10, 2024
Merged
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
d83ab16
Fix LED pinout for T-Echo board marked v1.0, date 2021-6-28
Mictronics Jan 4, 2024
5e09667
Merge branch 'meshtastic:master' into master
Mictronics Jan 5, 2024
42d819c
Merge branch 'meshtastic:master' into master
Mictronics Jan 6, 2024
9ddca82
Merge branch 'master' into master
thebentern Jan 6, 2024
839de5b
Merge branch 'meshtastic:master' into master
Mictronics Jan 7, 2024
904e060
Merge branch 'master' into master
thebentern Jan 7, 2024
7b8fd4e
Merge branch 'meshtastic:master' into master
Mictronics Jan 7, 2024
9afad9a
Merge branch 'meshtastic:master' into master
Mictronics Jan 7, 2024
8f8829f
Merge branch 'meshtastic:master' into master
Mictronics Jan 10, 2024
32f1aea
Merge PR #420
Mictronics Jan 10, 2024
7043c3f
Merge branch 'meshtastic:master' into master
Mictronics Jan 12, 2024
a22c366
Merge branch 'meshtastic:master' into master
Mictronics Jan 13, 2024
61e0ff6
Merge branch 'meshtastic:master' into master
Mictronics Jan 14, 2024
83381c7
Merge branch 'meshtastic:master' into master
Mictronics Jan 15, 2024
16eaf42
Merge branch 'meshtastic:master' into master
Mictronics Jan 15, 2024
a6a640c
Merge branch 'meshtastic:master' into master
Mictronics Jan 16, 2024
42e7e04
Merge branch 'meshtastic:master' into master
Mictronics Jan 18, 2024
b0e98c9
Merge branch 'meshtastic:master' into master
Mictronics Jan 19, 2024
7e650d4
Merge branch 'meshtastic:master' into master
Mictronics Jan 20, 2024
6ccfca8
Merge branch 'meshtastic:master' into master
Mictronics Jan 20, 2024
8ab0c18
Merge branch 'meshtastic:master' into master
Mictronics Jan 21, 2024
8fb73cd
Merge branch 'meshtastic:master' into master
Mictronics Jan 22, 2024
c7a1523
Merge branch 'meshtastic:master' into master
Mictronics Jan 23, 2024
bb7075f
Merge branch 'meshtastic:master' into master
Mictronics Jan 25, 2024
8101351
Merge branch 'meshtastic:master' into master
Mictronics Jan 26, 2024
c5e9636
Merge branch 'meshtastic:master' into master
Mictronics Jan 27, 2024
b9293d4
Merge branch 'meshtastic:master' into master
Mictronics Jan 28, 2024
ee92162
Merge branch 'meshtastic:master' into master
Mictronics Jan 29, 2024
deda8a0
Merge branch 'meshtastic:master' into master
Mictronics Jan 30, 2024
bac5f69
Merge branch 'meshtastic:master' into master
Mictronics Jan 31, 2024
0b4c647
Merge branch 'meshtastic:master' into master
Mictronics Feb 1, 2024
430be4a
Merge branch 'meshtastic:master' into master
Mictronics Feb 2, 2024
5e69479
Merge branch 'meshtastic:master' into master
Mictronics Feb 5, 2024
5ec5b45
Merge branch 'meshtastic:master' into master
Mictronics Feb 9, 2024
abf75d9
Merge branch 'meshtastic:master' into master
Mictronics Feb 10, 2024
f70eeec
Merge branch 'meshtastic:master' into master
Mictronics Feb 10, 2024
95dd77e
Merge branch 'meshtastic:master' into master
Mictronics Feb 11, 2024
6ce43ba
Merge branch 'meshtastic:master' into master
Mictronics Feb 11, 2024
bc4bbbb
Merge branch 'meshtastic:master' into master
Mictronics Feb 12, 2024
59c4321
Merge branch 'meshtastic:master' into master
Mictronics Feb 13, 2024
f1e3f42
Merge branch 'meshtastic:master' into master
Mictronics Feb 14, 2024
b575f16
Merge branch 'meshtastic:master' into master
Mictronics Feb 15, 2024
1c47281
Merge branch 'meshtastic:master' into master
Mictronics Feb 16, 2024
10500da
Merge branch 'meshtastic:master' into master
Mictronics Feb 17, 2024
6d9d14d
Merge branch 'meshtastic:master' into master
Mictronics Feb 18, 2024
be06d8e
Merge branch 'meshtastic:master' into master
Mictronics Feb 19, 2024
fe920c2
Merge branch 'meshtastic:master' into master
Mictronics Feb 20, 2024
45b7f14
Merge branch 'meshtastic:master' into master
Mictronics Feb 21, 2024
f41c5f5
Merge branch 'meshtastic:master' into master
Mictronics Feb 24, 2024
4e9a522
Merge branch 'meshtastic:master' into master
Mictronics Feb 25, 2024
3971f1f
Merge branch 'meshtastic:master' into master
Mictronics Feb 26, 2024
8a85b0f
Merge branch 'meshtastic:master' into master
Mictronics Feb 27, 2024
2c2fea6
Merge branch 'meshtastic:master' into master
Mictronics Feb 28, 2024
ca63ab5
Merge branch 'meshtastic:master' into master
Mictronics Feb 29, 2024
a8455b9
Merge branch 'meshtastic:master' into master
Mictronics Mar 2, 2024
f2f51c2
Merge branch 'meshtastic:master' into master
Mictronics Mar 3, 2024
214b0b3
Merge branch 'meshtastic:master' into master
Mictronics Mar 4, 2024
d703850
Merge branch 'meshtastic:master' into master
Mictronics Mar 10, 2024
c8aa089
Merge branch 'meshtastic:master' into master
Mictronics Mar 10, 2024
c11247e
Merge branch 'meshtastic:master' into master
Mictronics Mar 10, 2024
4427f80
Merge branch 'meshtastic:master' into master
Mictronics Mar 12, 2024
505fc18
Merge branch 'meshtastic:master' into master
Mictronics Mar 12, 2024
0f37f2d
Merge branch 'meshtastic:master' into master
Mictronics Mar 13, 2024
7042c9e
Merge branch 'meshtastic:master' into master
Mictronics Mar 15, 2024
058e96d
Merge branch 'meshtastic:master' into master
Mictronics Mar 17, 2024
61932e4
Merge branch 'meshtastic:master' into master
Mictronics Mar 18, 2024
7261cf1
Merge branch 'meshtastic:master' into master
Mictronics Mar 19, 2024
0dd9ce3
Fixed double and missing Default class.
Mictronics Mar 19, 2024
382bd0e
Merge branch 'meshtastic:master' into master
Mictronics Mar 21, 2024
ffe991f
Merge branch 'meshtastic:master' into master
Mictronics Mar 22, 2024
5eaa8dd
Merge branch 'meshtastic:master' into master
Mictronics Mar 24, 2024
c02260d
Merge branch 'meshtastic:master' into master
Mictronics Mar 28, 2024
30461b6
Merge branch 'meshtastic:master' into master
Mictronics Mar 29, 2024
41e7f4d
Merge branch 'meshtastic:master' into master
Mictronics Mar 31, 2024
a4973ce
Merge branch 'meshtastic:master' into master
Mictronics Apr 16, 2024
ec6208b
Merge branch 'meshtastic:master' into master
Mictronics Apr 18, 2024
3729424
Merge branch 'meshtastic:master' into master
Mictronics Apr 21, 2024
55e0a84
Use correct format specifier and fixed typo.
Mictronics Apr 21, 2024
ebdeb78
Merge branch 'meshtastic:master' into master
Mictronics May 1, 2024
c81b5d2
Merge branch 'meshtastic:master' into master
Mictronics May 11, 2024
7820325
Merge branch 'meshtastic:master' into master
Mictronics May 21, 2024
168c611
Merge branch 'meshtastic:master' into master
Mictronics Jun 9, 2024
336162f
Merge branch 'meshtastic:master' into master
Mictronics Jun 12, 2024
d98d5a9
Merge branch 'meshtastic:master' into master
Mictronics Jun 25, 2024
c7f9d98
Merge branch 'meshtastic:master' into master
Mictronics Jul 1, 2024
dfdea67
Merge branch 'meshtastic:master' into master
Mictronics Jul 10, 2024
d2f7652
Merge branch 'meshtastic:master' into master
Mictronics Jul 13, 2024
1952018
Merge branch 'meshtastic:master' into master
Mictronics Jul 20, 2024
328becf
Removed duplicate code.
Mictronics Jul 20, 2024
ff10e99
Fix error: #if with no expression
Mictronics Jul 20, 2024
3e27881
Merge branch 'meshtastic:master' into master
Mictronics Jul 24, 2024
905bc1d
Merge branch 'meshtastic:master' into master
Mictronics Jul 25, 2024
35ee9e5
Merge branch 'meshtastic:master' into master
Mictronics Jul 27, 2024
2198618
Merge branch 'meshtastic:master' into master
Mictronics Jul 29, 2024
cb5e7ec
Merge branch 'meshtastic:master' into master
Mictronics Aug 10, 2024
f56d93d
Merge https://github.com/meshtastic/firmware
Mictronics Aug 10, 2024
2527df3
Merge branch 'master' of https://github.com/Mictronics/meshtastic_fir…
Mictronics Aug 10, 2024
072aaae
Fix warning: extra tokens at end of #endif directive.
Mictronics Aug 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/modules/AdminModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,8 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
conn.serial.is_connected = powerFSM.getState() == &stateSERIAL;
#else
conn.serial.is_connected = powerFSM.getState();
#endif conn.serial.baud = SERIAL_BAUD;
#endif
conn.serial.baud = SERIAL_BAUD;

r.get_device_connection_status_response = conn;
r.which_payload_variant = meshtastic_AdminMessage_get_device_connection_status_response_tag;
Expand Down
Loading