pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-10 14:41:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
6,672 Commits 28 Branches 280 Tags 129 MiB
87396d9105
Commit Graph

1419 Commits

Author SHA1 Message Date
Thomas Göttgens
bec0cda175
Merge branch 'master' into printFixes 2023-01-20 14:32:03 +01:00
Ben Meadors
ca298d8a7d
Merge branch 'master' into sx126x-rx-boosted-gain 2023-01-20 07:08:53 -06:00
a_filonichev
3eaa054c68 Fix vulnerability with "h.from == 0" 
// altered packed with "from == 0" can do Remote Node Administration without permission
 2023-01-20 01:38:13 +02:00
caveman99
fda1e29c4d [create-pull-request] automated change 2023-01-19 14:14:12 +00:00
GUVWAF
836559cda1 Fix two print format specifiers 2023-01-19 15:01:44 +01:00
Ben Meadors
293625924d
Merge branch 'master' into sx126x-rx-boosted-gain 2023-01-18 16:57:41 -06:00
Ben Meadors
ff029ad752 Formatting 2023-01-18 15:37:23 -06:00
Thomas Göttgens
fdf7c3a812
Merge branch 'master' into rsyslog-client 2023-01-18 22:13:38 +01:00
thebentern
ee25a488ef [create-pull-request] automated change 2023-01-18 21:12:03 +00:00
Ben Meadors
9046dacec8 I don't like this formatting but I need trunk to STFU 2023-01-18 14:51:48 -06:00
Thomas Göttgens
f86eef66c8 Simple UDP calls, if wired up a fair bit of this can go again. 
this is preliminary work
 2023-01-18 21:35:51 +01:00
Ben Meadors
b218ea9ec7 Hopefully ignore generated files 2023-01-18 11:04:06 -06:00
thebentern
80f259cc6c [create-pull-request] automated change 2023-01-18 16:19:47 +00:00
thebentern
5189e328b6 [create-pull-request] automated change 2023-01-18 14:57:44 +00:00
Ben Meadors
4d4af7de59 generated paths experiment 2023-01-18 08:56:47 -06:00
Ben Meadors
1b932c6bbe Fix scripts patch and remove files in previous dir 2023-01-18 07:53:19 -06:00
thebentern
cf39628222 [create-pull-request] automated change 2023-01-18 13:42:53 +00:00
Andrew Moroz
0a2539650e sx126x-rx-boosted-gain: add support for setting Rx gain mode on SX126x chipsets 2023-01-17 00:56:15 -05:00
Thomas Göttgens
0e51a42ce2
Merge branch 'master' into xmodem-proto 2023-01-16 20:11:02 +01:00
Thomas Göttgens
d5a3acb83a Trigger rebuild 2023-01-16 17:55:17 +01:00
Krezalis
efbdb273c3 Update RadioInterface.cpp 2023-01-16 17:55:17 +01:00
Krezalis
011013ab1a Update RadioInterface.cpp 2023-01-16 17:55:17 +01:00
Krezalis
49279e56d0 Update RadioInterface.cpp 2023-01-16 17:55:17 +01:00
Krezalis
1cfda77356 Add 868 MHz Ukrainian Band 2023-01-16 17:55:17 +01:00
caveman99
f4779bd93f [create-pull-request] automated change 2023-01-16 17:51:45 +01:00
Thomas Göttgens
aca1241a7f Having a first stab at flawfinder errors 2023-01-16 10:55:40 +01:00
Thomas Göttgens
80d1a993dd Merge branch 'develop' of github.com:meshtastic/firmware into xmodem-proto 2023-01-12 10:00:04 +01:00
thebentern
440b965e71 [create-pull-request] automated change 2023-01-12 01:38:21 +00:00
GUVWAF
fc775012ea Don't send NodeInfo and DeviceTelemetry at high Tx air util 
Also move airtime checking to airtime class
 2023-01-11 21:52:19 +01:00
thebentern
721f87af7e [create-pull-request] automated change 2023-01-11 20:35:13 +00:00
Ben Meadors
17a2589b35
Allow time from phone to be sent to the mesh 2023-01-11 07:50:07 -06:00
GUVWAF
ab9d0ba543 Report actual RoutingError 2023-01-10 21:12:40 +01:00
GUVWAF
e13fb9919e Send NAK only to the API upon duty cycle limit 2023-01-10 21:12:17 +01:00
GUVWAF
a3b93a4dcf Better not to compare float directly 2023-01-10 21:10:09 +01:00
Thomas Göttgens
6b0f18e1e4
Merge pull request #2113 from meshtastic/mqtt-fix 
Find the downlink channel to post packet to.
 2023-01-10 20:49:18 +01:00
Thomas Göttgens
8f2155f8f9
Merge branch 'develop' into mqtt-fix 2023-01-09 23:28:08 +01:00
Thomas Göttgens
1fc5d70221 let the library handle the reconnect, manually do it after 5 seconds 2023-01-09 23:26:47 +01:00
Ben Meadors
e7d425ef6e Until we figure out what's going on 2023-01-09 16:19:42 -06:00
Thomas Göttgens
c63536d948 switch to 16 bit packet number 2023-01-09 20:23:32 +01:00
Thomas Göttgens
9c1cfe9358
Merge pull request #2114 from meshtastic/refactor-apiserver 
make a template class for API Server
 2023-01-09 20:11:01 +01:00
Thomas Göttgens
971565aed3
Merge branch 'develop' into xmodem-proto 2023-01-09 20:08:37 +01:00
Thomas Göttgens
3a6e3464e6 notify phoneAPI about new packages to process 2023-01-09 20:06:11 +01:00
Thomas Göttgens
0181e186ac
Merge pull request #2106 from meshtastic/assert-cleanup 
initial cleanup work
 2023-01-09 19:45:23 +01:00
Thomas Göttgens
5fd00b2538 - make a template class for API Server 
- Skip a lot of duplicate code
- add a hexDump output - might come in handy
- refactor directory names
- remove unused debugOut that was generating template errors
 2023-01-09 17:03:52 +01:00
Thomas Göttgens
5cec370cf5 getByName was not used anywhere in the code so that change is safe. 
Please TEST this as i don't have a working Json setup in mqtt at the moment.
 2023-01-09 11:28:21 +01:00
Thomas Göttgens
0e7797f3bb Adding to generated for now, protobuf PR will come when it works ... :-) 2023-01-08 18:15:51 +01:00
Thomas Göttgens
81ee6dd799 first crash from stress test 2023-01-07 23:40:47 +01:00
Thomas Göttgens
8465467aa8 2nd batch 2023-01-07 14:57:00 +01:00
Thomas Göttgens
be2d3f7769 fix leak 2023-01-07 13:28:36 +01:00
Thomas Göttgens
03c5dfc7a8 initial cleanup work 2023-01-07 13:16:58 +01:00
Mark Trevor Birss
52cfd62031
Update SX128xInterface.cpp 2023-01-07 14:05:16 +02:00
Tim Wilkinson
0b9c8e62ea
Make sure we dont use a multicast MAC for ethernet 2023-01-05 22:31:57 -08:00
pavelb-techspark
30ae4c2a38
Add QueueStatus sending to the firmware (#1820) 
* Yank mqtt service envelope queue

* trybuildfix mqtt system

* removed too much

* no excessive heap debugging on release builds

* send QueueStatus messages

The QueueStatus message is sent as a response to the attempt to queue
an outgoing MeshPacket and contains statuses of the last queue
attempt, TX Queue space and capacity and MeshPacket.id that was
queued.

When TX Queue changes status from completely full to at least
a single slot free a QueueStatus message is also sent to notify
that user can queue more messages.

Signed-off-by: Pavel Boldin <pavel.b@techspark.engineering>

* WIP: update protobufs

Signed-off-by: Pavel Boldin <pavel.b@techspark.engineering>

* update protobufs

* regen protos

Signed-off-by: Pavel Boldin <pavel.b@techspark.engineering>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com>
 2023-01-04 23:56:52 +11:00
Thomas Göttgens
4f26a2a74a Update Unishox to latest V2 code, change is only cosmetic 2023-01-04 10:35:52 +01:00
Ben Meadors
e0002ef2d5 Merge remote-tracking branch 'origin/master' into develop-2-master 2023-01-03 11:34:53 -06:00
Ben Meadors
021fc8235c Renamed eth_mode to address_mode 2023-01-03 06:24:47 -06:00
thebentern
bca70d10d0 [create-pull-request] automated change 2023-01-03 12:20:39 +00:00
Thomas Göttgens
8a9af37d82
Merge branch 'develop' into nice-threads 2022-12-30 20:18:19 +01:00
Ben Meadors
f1cdfd163d Replaced all of the logging with proper log levels 2022-12-30 10:27:07 -06:00
Ben Meadors
8193215294 Trace 2022-12-30 08:14:37 -06:00
Thomas Göttgens
e73ae7cdac woops - was too fast there 2022-12-30 14:53:34 +01:00
Thomas Göttgens
65aad62702 tryfix - no mqtt if no mqtt wanted... 2022-12-30 14:51:00 +01:00
GUVWAF
5ccd66864b Report actual Routing_Error upon abort 2022-12-30 13:45:02 +01:00
Ben Meadors
0b5cae5393 Log levels refactoring 2022-12-29 20:41:37 -06:00
Ben Meadors
38a1315599 Refactor OSThread consumers to use disable() 2022-12-29 16:26:25 -06:00
Ben Meadors
8ebe0edc5a
Merge pull request #2075 from meshtastic/load-save-proto 
add storage for ringtone
 2022-12-29 15:50:16 -06:00
Thomas Göttgens
45e6e86ff9 - add RemoteHardware (and the missing S&F config) in 
- make the config boundaries automatic
 2022-12-29 21:35:32 +01:00
Thomas Göttgens
3c5710e65b - add storage for ringtone 
- Refactor file load and save
- fix a size error in Canned Messages
 2022-12-29 16:53:36 +01:00
Thomas Göttgens
41a1dfec79 a lot of thread housekeeping. Switch them off when not needed / disabled. 2022-12-29 15:45:49 +01:00
Thomas Göttgens
887405cc08 update protobufs on develop 2022-12-29 14:18:33 +01:00
Thomas Göttgens
3b19040590 protobuf update 2022-12-28 15:37:17 +01:00
Thomas Göttgens
14be4ee9f0 Release Develop to Master 2022-12-28 15:31:04 +01:00
Thomas Göttgens
94cb100e3f Master to Develop 2022-12-28 15:30:23 +01:00
Ben Meadors
f632933b93
Merge pull request #2069 from GUVWAF/wantAckDM 
Flood ACKs on DM back to original sender
 2022-12-28 08:00:52 -06:00
Thomas Göttgens
e25d05689b Updates to external notification and radiolib for SX128x. Rip out Godmode again for these 2022-12-28 14:57:40 +01:00
GUVWAF
5c859da4e4 Remove unnecessary changes 2022-12-28 14:40:10 +01:00
GUVWAF
6c5602e88d Cleanup 2022-12-28 14:13:48 +01:00
GUVWAF
b4735f4224 Don't resend ACK every time you receive the packet 2022-12-28 14:13:48 +01:00
GUVWAF
3b9b33a5ee Use hopLimit setting for ACKs as well 2022-12-28 14:13:14 +01:00
Thomas Göttgens
430908f5d6 TLORA_T3_S3 2022-12-28 13:56:56 +01:00
caveman99
b808ffa9ab [create-pull-request] automated change 2022-12-27 12:53:56 +00:00
Thomas Göttgens
2ac2b6d1b6 replace PB03 compat macros with the real deal. 2022-12-23 10:00:34 +01:00
Thomas Göttgens
b8657158be Remove unused parameter on save 2022-12-23 09:45:56 +01:00
Thomas Göttgens
a289406863 refactor classes to accomodate SerialModule 2022-12-22 18:24:42 +01:00
Thomas Göttgens
30240ac14b fix cppcheck complaints 2022-12-21 15:13:16 +01:00
Thomas Göttgens
fb41b0f5c8 update generated protos 2022-12-21 14:45:33 +01:00
caveman99
0992093f4d [create-pull-request] automated change 2022-12-21 12:55:50 +00:00
Thomas Göttgens
7396d0f241 Cherry Picking Stuff from develop... 2022-12-21 13:36:38 +01:00
Thomas Göttgens
941786669b fix compiler warnings 2022-12-21 13:28:29 +01:00
Thomas Göttgens
cea8393a7f Merge pull request #2026 from GUVWAF/develop 
TraceRouteModule
 2022-12-21 13:27:12 +01:00
Thomas Göttgens
a0f5e44967 Audio Module is finished for regression tests. 2022-12-21 13:27:00 +01:00
Thomas Göttgens
7d1b6f63b5 Definition cleanup and AudioModule WIP 2022-12-21 13:27:00 +01:00
Thomas Göttgens
8b58eaac20 fix compile 
# Conflicts:
#	protobufs
 2022-12-21 13:26:59 +01:00
Thomas Göttgens
8cbf292373 WIP: add digital audio. Needs a proto change, so checking in generated files for now. 
# Conflicts:
#	src/mesh/generated/localonly.pb.h
#	src/mesh/generated/module_config.pb.h
 2022-12-21 13:26:44 +01:00
Thomas Göttgens
efc3f4c0ee remove a few DSR Router bits for S&F Module 2022-12-21 13:25:12 +01:00
Thomas Göttgens
bd2bfd6822 update board definition, update copy/paste errors, fix SX1280. 2022-12-21 13:25:12 +01:00
Thomas Göttgens
ae2ca1d89c WIP: S&F Progress 2022-12-21 12:57:42 +01:00
Thomas Göttgens
6a5dd26907
need to trigger new CI run 2022-12-21 12:24:38 +01:00
Mykhailo Lesyk
4de557b4db [modules][serial] fix simple module ability to send 2022-12-21 01:35:19 -08:00
caveman99
8c66940b78 [create-pull-request] automated change 2022-12-17 17:41:39 +00:00
Thomas Göttgens
68f6cfde0c Improve Wifi Reconnect handling and add outgoing queue for MQTT packets to bridge short connection issues. 2022-12-16 20:28:28 +01:00
Thomas Göttgens
1c8181dc75 fix compiler warnings 2022-12-16 20:26:22 +01:00
Thomas Göttgens
0f0dbc3274 reboot nrf52 on critical error 8 2022-12-09 11:18:43 +01:00
Thomas Göttgens
edb674759f fixes critical error 8 does not reboot on nrf52 2022-12-09 11:15:49 +01:00
Thomas Göttgens
32d9a397aa Toggle up to 3 pins after output_ms till nag_timeout or user button press happens 2022-12-08 16:27:56 +01:00
Thomas Göttgens
60e6dc1134 update protobufs manually 2022-12-08 10:43:18 +01:00
Thomas Göttgens
a00187b97f manual master merge 2022-12-06 16:56:38 +01:00
Thomas Göttgens
b335b1c66b
Merge branch 'master' into 2022-bug-recording-critical-error-11-at-srcmeshradiolibinterfacecpp389 2022-12-06 14:08:48 +01:00
Thomas Göttgens
a42a9bf4fe
Merge pull request #2026 from GUVWAF/develop 
TraceRouteModule
 2022-12-06 14:08:04 +01:00
caveman99
fc5bf5a68f [create-pull-request] automated change 2022-12-06 13:03:26 +00:00
Thomas Göttgens
0f7e6b8964 update submodule protobufs to latest 2022-12-06 13:55:43 +01:00
GUVWAF
03bfdec1e1 TraceRouteModule 2022-12-05 20:38:06 +01:00
Thomas Göttgens
183ec2124f Add debug output 2022-12-05 11:48:46 +01:00
Thomas Göttgens
470e711383 Audio Module is finished for regression tests. 2022-12-02 12:58:26 +01:00
Thomas Göttgens
fb89828990 Definition cleanup and AudioModule WIP 2022-12-01 17:47:04 +01:00
Thomas Göttgens
628028475c fix compile 2022-11-29 17:45:57 +01:00
Thomas Göttgens
05e992ad67 WIP: add digital audio. Needs a proto change, so checking in generated files for now. 2022-11-29 17:19:10 +01:00
Thomas Göttgens
0dff05e881
Merge pull request #1998 from GUVWAF/dutyCycleLimit 
Completely refrain from transmitting if duty cycle limit exceeded
 2022-11-29 11:06:31 +01:00
Thomas Göttgens
f3c5a01daf remove a few DSR Router bits for S&F Module 2022-11-28 21:58:30 +01:00
Thomas Göttgens
c7681cb24d update board definition, update copy/paste errors, fix SX1280. 2022-11-27 14:03:50 +01:00
GUVWAF
330ac3be68 Update generated protobufs 2022-11-26 21:07:36 +01:00
GUVWAF
3b1e34efa1 Refrain from transmitting if duty cycle exceeded 2022-11-26 21:05:37 +01:00
Ben Meadors
a703ab4418
Merge branch 'master' into potential-sx1262-fix 2022-11-26 09:07:59 -06:00
caveman99
7c9cada50e [create-pull-request] automated change 2022-11-26 15:04:12 +00:00
Ben Meadors
63838a1632
Merge branch 'master' into potential-sx1262-fix 2022-11-26 08:19:13 -06:00
Ben Meadors
47a47f1e69
Merge branch 'master' into develop 2022-11-26 08:18:35 -06:00
Ben Meadors
71c0cf9b9a
Don't set DIO2 switch if TXEN is defined 2022-11-26 08:11:32 -06:00
Thomas Göttgens
39948c76de
Merge branch 'master' into develop 2022-11-26 14:19:27 +01:00
Ben Meadors
10f14d27b7
Merge branch 'master' into MESSAGES 2022-11-26 07:13:20 -06:00
Ben Meadors
84a9d95b1f
Merge branch 'master' into MESSAGES 2022-11-26 06:43:52 -06:00
lewis
cdd499f147 Add missing restart parameters 2022-11-26 12:10:10 +08:00
lewis
0dff4538f3 Add t-echo to the operation after the flash operation fails 2022-11-26 00:17:54 +08:00
Ihor Nehrutsa
6507683909 Squashed commit of the following: 
commit c8d1bcf04fae5f7ac5b639ddd15a738045014c95
Author: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date:   Fri Nov 25 15:11:18 2022 +0200

    Revert "variants\tbeam\variant.h: Use LORA_CS instead of RF95_NSS"

    This reverts commit 8d225ced9c.

commit 1c37097448393ea9364c2b9bf10522802c61d5c4
Author: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date:   Fri Nov 25 15:04:09 2022 +0200

    Some little debugs added

commit f1b55e11af
Author: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date:   Wed Nov 23 15:24:58 2022 +0200

    Update variant.h

commit 8d225ced9c
Author: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date:   Wed Nov 23 13:06:49 2022 +0200

    variants\tbeam\variant.h: Use LORA_CS instead of RF95_NSS
 2022-11-25 15:17:24 +02:00
Thomas Göttgens
32e5ced814 regen protos 2022-11-24 09:22:50 +01:00
Thomas Göttgens
8e3b500307 ---EXPERIMENTAL--- reboot the board if the NO_AP_FOUND error comes back. 2022-11-23 23:47:50 +01:00
Thomas Göttgens
d6f77bf07e
Merge pull request #1978 from meshtastic/master 
Master to Develop
 2022-11-23 23:44:42 +01:00
GUVWAF
70bf7c490c Revert "Override RoutingModule's ACK if on wrong channel" 
This reverts commit 71c163a8ee.
 2022-11-23 19:27:57 +01:00
Thomas Göttgens
adbed5de95 - fix NTP sync on connect 
- disable extended GPS mode again
- add --inline-suppr to cppflags
 2022-11-22 17:19:24 +01:00
Thomas Göttgens
fe989f0bff
Merge pull request #1973 from meshtastic/master 
Develop refresh to Master
 2022-11-22 17:08:04 +01:00
Thomas Göttgens
23466d8eee yank that dreaded json11 - first try 2022-11-22 14:29:00 +01:00
Ben Meadors
35d7e11678
Merge branch 'master' into master 2022-11-21 16:36:11 -06:00
GUVWAF
71c163a8ee Override RoutingModule's ACK if on wrong channel 2022-11-21 20:43:17 +01:00
GUVWAF
5d8e661807 Send NAK on primary channel if it cannot decode it 2022-11-21 20:43:17 +01:00
Ben Meadors
fb4f9bdc40
Merge branch 'master' into transactional-config-edits 2022-11-21 12:10:49 -06:00
Ben Meadors
abf8fdb661
Merge branch 'master' into develop 2022-11-21 09:39:22 -06:00
Ben Meadors
53cd6bdf15
Merge branch 'master' into develop 2022-11-21 07:35:46 -06:00
Ben Meadors
b1ba807ec9 Only save and reboot while a transaction isnt open 2022-11-20 19:50:45 -06:00
Ben Meadors
c844f153e1
Merge branch 'master' into mqtt-init-defaults 2022-11-20 15:31:54 -06:00
Ben Meadors
1c5292ac86 Init default mqtt configurations 2022-11-20 12:29:10 -06:00
Thomas Göttgens
b54044fd00 if we have a filename, 'address' is the line number. Don't print that in hex ;-) 
If it's really a hex address, prefix it with 0x
 2022-11-20 12:00:57 +01:00
Thomas Göttgens
95cc328b5c That wifi update didn't go down well. 2022-11-18 19:37:56 +01:00
Thomas Göttgens
144afee29e trigger wifi reconnect by mqtt or ntp failures. 2022-11-18 18:03:30 +01:00
Thomas Göttgens
70d44b8838 next try. 2022-11-17 20:19:11 +01:00
Thomas Göttgens
b260c8b058 tryfix wifi issues 2022-11-17 20:09:08 +01:00
Thomas Göttgens
5991b59ba3 try fixing Wifi reconnects - don't manually reconnect and set auto-reconnect at the same time. 2022-11-17 17:48:46 +01:00
Thomas Göttgens
5bfc58ed64 testing issues with RAK11200/13300 2022-11-15 21:55:27 +01:00
Thomas Göttgens
79eff42c3c Fix and Break radiolib 2022-11-14 10:53:16 +01:00
Thomas Göttgens
50a301899e start to sort radiolib out. If we have macros, use them! :-) 
Also we need Godmode for the SX1280 for now, hopefully can revert to more sane operation.
 2022-11-14 09:49:50 +01:00
Ben Meadors
916f3cac41 Sync protos 2022-11-13 14:40:18 -06:00
Thomas Göttgens
7a67388a97 Merge branch 'master' of github.com:meshtastic/firmware into develop 2022-11-12 14:34:51 +01:00
Thomas Göttgens
65197a8e48 - Add new Compass Sensor 
- speed up I2C Scanning
- make adding sensors less error prone
 2022-11-12 11:03:29 +01:00
puzzled-pancake
3737252d39
Update NZ_865 to 36dBm 
Updated NZ_865 to 36dBm as per:
https://rrf.rsm.govt.nz/smart-web/smart/page/-smart/domain/licence/LicenceSummary.wdk?id=219752

6dBW = 36dBm/4watt
 2022-11-12 17:55:28 +13:00
Thomas Göttgens
f25f902c20 max power for the 1280 is +13dBm 2022-11-11 08:59:16 +01:00
Thomas Göttgens
74f31d7d68 Fix SX1280 init 2022-11-10 23:00:01 +01:00
Ben Meadors
30a87e3145 Switch to a smaller sample of devices for cppcheck 2022-11-10 07:26:28 -06:00
Thomas Göttgens
d1acf02ee8 Master Merge 2022-11-10 11:01:36 +01:00
GUVWAF
1213ec2d57 Set preamble length back to 32 2022-11-09 21:21:50 +01:00
Ben Meadors
32223a818c Updated admin module and protobufs 2022-11-08 15:04:24 -06:00
Thomas Göttgens
9f9bd40343 rename wifi_mode to eth_mode 2022-11-08 21:53:44 +01:00
Ben Meadors
d6eeda7136
Merge pull request #1917 from meshtastic/master 
Master Rollup
 2022-11-08 07:25:40 -06:00
Ben Meadors
fb92e498f0
Merge pull request #1902 from GUVWAF/develop 
Change preambleLength to 8 symbols to reduce airtime
 2022-11-08 07:25:02 -06:00
Ben Meadors
bf8d8886fd
Merge branch 'develop' into master 2022-11-08 07:20:29 -06:00
Thomas Göttgens
6934e0bce7
Fix assert 2022-11-06 18:36:17 +01:00
Thomas Göttgens
16444c190d Ignore Band power limits for licensed HAMs 2022-11-05 20:13:47 +01:00
GUVWAF
c0e630522c
Merge branch 'meshtastic:develop' into develop 2022-11-05 19:09:36 +01:00
Ben Meadors
950d5defda
Master to develop (resolves conflicts) (#1903) 
* Rearranging deck chairs, 900M22S working, 30S not

* We do have wire, just not where it's expected

* Put more of the module specific pins in their blocks

* tryfix compile with NO_SCREEN

* Portduino only: don't continue to try rebooting (#1887)

Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>

* Support for TLORA 2.1-1.8

* Don't allow arbitrary channel name for admin (#1886)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

* Experimental DIY nrf52840 feather support (#1884)

* Experimental DIY nrf52840 feather support

* Fix target

* sx1262 wiring

* Remove lib

* Don't consider Response as ACK for FloodingRouter (#1885)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

* Fix feather diy (#1892)

* Fix variant

* Fix feather diy target

* [modules][external notifications] allow select channel to listen to

* Fix feather diy pin mapping (#1894)

Thanks to @markbirss

* [create-pull-request] automated change

* Override Screen Autodtect

* Maybe fix crash of this board.

* Fixes reset loop with new espressif32 platform on tlora-v2

 Sending a pulse to the OLED_RESET Pin 16 results in a reset loop using recent version of the espressif32 platform.

* Experiment with self hosted action runner

* Fix MQTT on ETH

* revert the tryfix

* Cheating

* Cleanup artifacts older than 1 month

* Update cleanup_artifacts.yml

* Update cleanup_artifacts.yml

* Update cleanup_artifacts.yml

* Delete cleanup_artifacts.yml

* fix: use RF95_IRQ for wakeup source in doLightSleep (#1899)

Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

* Update protos

* Update protos

Co-authored-by: code8buster <communismisgreat@national.shitposting.agency>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Mykhailo Lesyk <m@lesyk.org>
Co-authored-by: Mykhailo Lesyk <lesykm@users.noreply.github.com>
Co-authored-by: caveman99 <caveman99@users.noreply.github.com>
Co-authored-by: he-leon <he-leon@users.noreply.github.com>
Co-authored-by: Lars Weber <weber@weber-software.com>
 2022-11-05 09:28:41 -05:00
Thomas Göttgens
1716c4d6f9 Allow static IP for WLAN 
and portentially fix reconnect issues
 2022-11-05 15:02:06 +01:00
Ben Meadors
cda7a60734 Update protos 2022-11-05 08:43:44 -05:00
Thomas Göttgens
8874a6e488 update protos 2022-11-05 14:18:57 +01:00
GUVWAF
176072801b Change preambleLength to 8 symbols to reduce airtime 2022-11-05 09:58:10 +01:00
Thomas Göttgens
09cdc20440 manual merge of changes from Master 2022-11-04 19:56:44 +01:00
Thomas Göttgens
4ccb4393c5 Fix MQTT on ETH 2022-11-04 19:44:45 +01:00
caveman99
f1afbf2c0f [create-pull-request] automated change 2022-11-03 21:35:06 +00:00
Thomas Göttgens
20686cc66a Show boot logo / OEM Logo longer - 5 seconds each now. 2022-11-03 09:46:32 +01:00
GUVWAF
5715ddc361
Don't consider Response as ACK for FloodingRouter (#1885) 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-11-02 14:32:18 -05:00
GUVWAF
ac4e88e0d2 Don't allow arbitrary channel name for admin (#1886) 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-11-02 18:19:09 +01:00
Thomas Göttgens
3e82cd7dd4 Support for TLORA 2.1-1.8 2022-11-02 18:19:09 +01:00
Ben Meadors
6d3028f213
Merge branch 'master' into TLORA-18 2022-11-02 07:20:39 -05:00
GUVWAF
b2969b2faf
Don't allow arbitrary channel name for admin (#1886) 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-11-02 07:18:15 -05:00
Thomas Göttgens
12df55c3d4 Support for TLORA 2.1-1.8 2022-11-02 13:12:15 +01:00
Sacha Weatherstone
5b648be2a5
More renaming 2022-10-31 18:47:10 +10:00
Sacha Weatherstone
b24caa1e06
Update links 2022-10-31 17:32:38 +10:00
Ben Meadors
311835a231
Implement extended device metadata (#1874) 
* Implement extended device metadata

* HAS_BLUETOOTH should be global
 2022-10-30 10:02:11 -05:00
Ben Meadors
d6c9327aef
Opposite logic for use_preset based channel name (#1871) 2022-10-29 11:40:05 -05:00
Thomas Göttgens
8a4341fec4
use new lora.use_preset bool (#1868) 2022-10-27 19:15:16 -05:00
Ben Meadors
82bcd391cd Fix those refs 2022-10-26 16:50:58 -05:00
thebentern
23c9fa0b56 [create-pull-request] automated change 2022-10-26 21:29:46 +00:00
Thomas Göttgens
d5a9e3114a
Update ethClient.cpp 2022-10-26 18:37:51 +02:00
Thomas Göttgens
7417729482
debug removed 2022-10-26 18:37:20 +02:00
Thomas Göttgens
d5c407c098
remove accidental commit 2022-10-26 18:36:41 +02:00
Thomas Göttgens
689cec14aa Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-10-26 18:15:07 +02:00
Thomas Göttgens
04225826f6
Bump ConfigDB Version. 
this forces a factory reset on upgrade.
 2022-10-26 18:12:31 +02:00
caveman99
0c3ec9254d [create-pull-request] automated change 2022-10-26 15:56:26 +00:00
Thomas Göttgens
d7c98062ce Merge remote-tracking branch 'remotes/origin/master' into remove-softap 2022-10-26 17:54:21 +02:00
Thomas Göttgens
497c0b7a47 don't rush failed time updates 2022-10-26 17:38:53 +02:00
Thomas Göttgens
b7ebe03ca8 API Server and DHCP Lease Management 2022-10-26 11:09:59 +02:00
Thomas Göttgens
a66538fe55 MQTT is working over ethernet 2022-10-26 00:07:02 +02:00
Thomas Göttgens
338c9c1e0c Remove Captive Portal and SoftAP Mode 2022-10-25 11:53:22 +02:00
Thomas Göttgens
aab52f1e8d Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-10-23 16:41:04 +02:00
Ben Meadors
568434d0fa
Use preset wiring (#1845) 
* When we init default, set use_preset to true

* Only use modem_preset when we use_preset

* When we init default, set use_preset to true (#1843) (#1844)
 2022-10-22 18:51:22 -05:00
Ben Meadors
2c1bbf1ac6
When we init default, set use_preset to true (#1843) 2022-10-22 15:42:21 -05:00
Thomas Göttgens
f3fee5f4fb first murmurs of ethernet support 2022-10-22 16:29:50 +02:00
caveman99
cb26bc3871 [create-pull-request] automated change 2022-10-22 14:18:18 +00:00
Thomas Göttgens
be8da851a6 fix json filebrowser in web server 2022-10-22 11:55:01 +02:00
Ben Meadors
97968213ff
Factory reset should include modules and channels (#1828) 2022-10-20 07:51:52 -05:00
Thomas Göttgens
7c8c479b96 wire in OEM.proto keystore 2022-10-19 15:39:06 +02:00
caveman99
2236f74a55 [create-pull-request] automated change 2022-10-19 11:44:12 +00:00
Thomas Göttgens
b56f9b3b16 Dont retransmit packets destined for ourselves. 
Solves assert failed: virtual ErrorCode Router::send(MeshPacket*) Router.cpp:189 (p->to != nodeDB.getNodeNum())
 2022-10-19 11:44:26 +02:00
caveman99
227cd93e67 [create-pull-request] automated change 2022-10-18 10:20:06 +00:00
Thomas Göttgens
3b7c0be842 don't irritate people with non working options 2022-10-18 10:30:50 +02:00
Thomas Göttgens
49378a9145 If wifi credentials ever go stale, dump them. 
This solves the dreaded 5 - STA_DISCONNECTED / 2 - AUTH_EXPIRE loops
 2022-10-18 10:16:47 +02:00
Thomas Göttgens
e65d9e8ccd
Add support for SX1281 on 2.4 GHz (#1809) 
* Add support for SX1281 on 2.4 GHz

* only allow wide BW settings when the right chip is detected

* portduino cannot use this chip yet as it uses an old modified version of radiolib

* missed a spot

* Attempt to supress false positive

* Attempt to supress false positive

* Trying casing from the cpp-check manual

* Trying casing from the cpp-check manual

* Inline suppr should be default but...

* Maybe casting it will make the damn thing shut up

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-10-17 08:33:41 -05:00
caveman99
7dcc981a2c [create-pull-request] automated change 2022-10-17 08:04:36 +00:00
Ben Meadors
45f9dee89a
Telemetry phone api guard (#1805) 
* Delay start of telemetry modules

* Don't send unless our toPhoneQueue is empty

* Get wrecked, checks!
 2022-10-16 09:58:58 -05:00
caveman99
7a9673dc37 [create-pull-request] automated change 2022-10-16 14:24:27 +00:00
Thomas Göttgens
18af9d734d fixes #1787 2022-10-12 13:13:02 +02:00
Ben Meadors
434db4347b
Send device telemetry to phone every minute (#1784) 2022-10-11 10:21:30 -05:00
Ben Meadors
f88dde2f60
Send channels over phoneapi on want config (#1780) 
* Send channels

* Doh!

* Adjust comments

* Missed a spot

* Consolidate

* Skipped disabled ones

* Fixed bounding

* Change order

* comment out disabled check for build artefact

* Remove loop

* Off by one

* Probably should start at zero

* Zero

* Oops

* enable dubug log

* Reset to index zero

Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com>
 2022-10-10 10:36:49 -05:00
Thomas Göttgens
984f0ca12c check allowed range for lora.channel_num 2022-10-10 12:28:31 +02:00
caveman99
dd4c4fba80 [create-pull-request] automated change 2022-10-09 08:55:33 +00:00
Thomas Göttgens
6e40102f26 - use bigger screen fonts on Wiphone 
- erase oldest entry from NodeDB if it is full.
 2022-10-08 17:07:16 +02:00
GUVWAF
3d45c4dbd8
Don't resend ACK if another module sent a response (#1772) 
* strcmp returns zero if strings are equal

* Make debug message more clear

* Don't resend ACK if another module sent a response

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
 2022-10-08 07:27:59 -05:00
Ben Meadors
bf4115a80f
Telemetry sensors re-map (#1765) 
* Add factory erase uf2 to the release assets

* Sensors map

* Uncomment sensors
 2022-10-07 08:33:07 -05:00
Thomas Göttgens
f3042ddf37
Update NodeDB.cpp 2022-10-05 08:56:00 +02:00
Thomas Göttgens
54816231e9 Calculate CRC32 of Protobuf and compare before save. 2022-10-05 08:52:27 +02:00
Thomas Göttgens
063c4904ff only save files when they changed - also clamp app version 2022-10-04 17:25:03 +02:00
Thomas Göttgens
3597685b23 Only save the changed parts of config to disk. 2022-10-04 14:32:07 +02:00
Thomas Göttgens
0f7a126828 fix compiler warning 2022-10-04 09:11:24 +02:00
Ben Meadors
7e5a26fde5
Merge branch 'master' into channel_num 2022-10-02 19:45:32 -05:00
Ben Meadors
e85af2f732 regen protos 2022-10-02 19:45:15 -05:00
Sacha Weatherstone
4df81008bc
Merge branch 'master' into channel_num 2022-10-03 10:32:56 +10:00
GUVWAF
076c1ed2ee Merge branch 'EnhancedSimRadio' of https://github.com/GUVWAF/Meshtastic-device into EnhancedSimRadio 2022-10-01 17:05:49 +02:00
GUVWAF
e54be07dc0 Update include path in MeshService 2022-10-01 17:04:19 +02:00
GUVWAF
d439d00e25 Move SimRadio to platform/portduino 2022-10-01 17:03:40 +02:00
GUVWAF
c4bea793af Mark WifiServerPort constructor as explicit 2022-10-01 17:02:16 +02:00
Thomas Göttgens
1970d0c00f
Merge branch 'master' into EnhancedSimRadio 2022-10-01 15:59:44 +02:00
github-actions[bot]
1dd7aa935f
[create-pull-request] automated change (#1738) 
Co-authored-by: thebentern <thebentern@users.noreply.github.com>
 2022-10-01 08:47:35 -05:00
GUVWAF
82ba95833b
strcmp returns zero if strings are equal (#1736) 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-10-01 08:18:25 -05:00
GUVWAF
aee06f4738 Suppress debug messages in PhoneAPI as they flood the logs when a TCP connection is open 2022-10-01 12:09:43 +02:00
GUVWAF
ab282765d4 Let SimRadio start receive a packet if its PortNum is Simulator_App 2022-10-01 12:06:59 +02:00
GUVWAF
5d464badc8 Give TCP port as argument to API server 2022-10-01 12:05:20 +02:00
GUVWAF
e66d9d0add Add content to SimRadio, similar to RadioInterface 2022-10-01 11:59:20 +02:00
GUVWAF
067bde321b Remove old SimRadio from RadioInterface 2022-10-01 11:57:27 +02:00
GUVWAF
84ec364ac2 Add enhanced SimRadio files 2022-10-01 11:56:16 +02:00
andrekir
8f84d7089c move channel_num to loraConfig 2022-09-30 17:33:43 -03:00
Ben Meadors
ac235bcabb
Reset nodedb wiring (#1724) 2022-09-28 16:47:26 -05:00
Thomas Göttgens
18bb373219
switch Bluetooth back on when wifi is disabled and bluetooth is enabled. This still had the old behaviour to check for a set ssid... (#1719) 2022-09-23 15:10:33 -05:00
Thomas Göttgens
e8f4a8b739
Merge branch 'master' into ESPIDF-Littlefs 2022-09-23 18:45:37 +02:00
Thomas Göttgens
544c89460f
Nullify older saved proto files once more 
this will be neccessary for the 1.3.42 release, since we renumbered some protos again. Subsequent additions to protos don't need this, just when we reshuffle.
 2022-09-23 12:28:32 +02:00
Thomas Göttgens
b5a8efa16b Filesystem fixes for LittleFS 2022-09-21 16:47:10 +02:00
Thomas Göttgens
fc729b0cbb
Send PROTOBUF over serial without delay 2022-09-21 15:36:17 +02:00
Thomas Göttgens
4c6f3ead60 fixing I2C requests and Wifi Power Saving Modes. 2022-09-19 12:05:57 +02:00
Thomas Göttgens
1f96d5d957
Merge branch 'master' into ESPIDF-Rollup 2022-09-19 09:33:50 +02:00
Andre K
80ddb81fac
fix yet another typo 2022-09-18 17:31:59 -03:00
Andre K
4bc29200be
fix default channel names (#1701) 2022-09-18 09:41:27 -05:00
Ben Meadors
128d20b290
tx_enabled fix (#1699) 
* Defaults

* Print
 2022-09-17 12:18:32 -05:00
Ben Meadors
e0d3ac01b0
Merge branch 'master' into ESPIDF-Rollup 2022-09-17 08:22:44 -05:00
Ben Meadors
0f87adad7b
Power state lies and other fixes (#1698) 
* Power interval defaults and factory reset

* Ternary

* Fixes
 2022-09-16 11:00:05 -05:00
Ben Meadors
accd23eddc
Factory reset on device state expired (#1695) 2022-09-15 12:15:16 -05:00
Thomas Göttgens
7c202b6069
Merge branch 'master' into ESPIDF-Rollup 2022-09-13 19:18:20 +02:00
caveman99
b1ac2cf821 [create-pull-request] automated change 2022-09-13 12:31:51 +00:00
Ben Meadors
ade66cd8f4
Merge branch 'master' into ESPIDF-Rollup 2022-09-12 18:07:42 -05:00
Ben Meadors
397030b5a6
GPS intervals (#1693) 
* GPS intervals

* Backwards logic

* Oops
 2022-09-12 18:07:21 -05:00
Ben Meadors
adc50f40b1
Merge branch 'master' into ESPIDF-Rollup 2022-09-12 14:56:09 -05:00
Ben Meadors
18f37981bb Spelling and fixing defaults 2022-09-12 07:55:17 -05:00
Ben Meadors
a8711bc54a Add tbeam-s3-core 2022-09-12 07:39:41 -05:00
Thomas Göttgens
cc054a13e2 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-12 09:25:04 +02:00
Sacha Weatherstone
60b4dbfdcd
More default inits. (#1689) 
* More default inits.

* update protobufs

* Try checking has_device first

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-09-11 08:36:47 -05:00
Ben Meadors
f98e96cf1b Slots for upcoming telemetry sensor support 2022-09-10 17:28:01 -05:00
Ben Meadors
7f18c0fb77
Init default intervals (#1688) 
* Init default intervals

* Spacing

* move isrouter check

* Line break

* Oops
 2022-09-10 12:35:36 -05:00
Sacha Weatherstone
7aaca3d486
Merge branch 'master' into pref_defaults 2022-09-10 18:11:16 +10:00
Thomas Göttgens
bf3306fbc8 use the new ESP Framework for our older boards too 2022-09-09 22:31:30 +02:00
Thomas Göttgens
7f293bfda3
Merge branch 'master' into master 2022-09-09 21:39:29 +02:00
Ben Meadors
47ffb9c70d
Make a change to trigger CI (#1686) 2022-09-09 13:41:01 -05:00
Thomas Göttgens
03580f5be8 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-09 13:11:23 +02:00
caveman99
c8d7b1aba0 [create-pull-request] automated change 2022-09-09 11:10:31 +00:00
Thomas Göttgens
f7b12f0695 Adapt to new protobufs - TODO: factory_reset rewire 2022-09-09 12:51:41 +02:00
caveman99
96cab75ccd [create-pull-request] automated change 2022-09-09 10:04:11 +00:00
caveman99
11590e33d3 [create-pull-request] automated change 2022-09-09 09:19:18 +00:00
lewishe
a50a461675 Change mesh.pd.h t-beam-s3-core index to 12 2022-09-08 10:28:53 +08:00
lewishe
b8f862ac46 Merge remote-tracking branch 'origin/master' 2022-09-07 09:48:39 +08:00
Ben Meadors
94a572aee6
Merge branch 'master' into pref_defaults 2022-09-06 20:25:20 -05:00
Ben Meadors
e87ecc210a
Wifi enabled plumbed in (#1677) 
* Wifi enabled

* Wifi requires reboot

* Increment DEVICESTATE_CUR_VER
 2022-09-06 14:06:44 -05:00
lewis he
a9e7a33473
Merge branch 'master' into master 2022-09-06 18:53:22 +08:00
lewishe
5621719eef Add tbeam esp32s3 version support, replace AXP202X_Library with XPowersLIb 2022-09-06 15:58:33 +08:00
Ben Meadors
a27a07956f
Merge branch 'master' into pref_defaults 2022-09-03 22:10:37 -05:00
Ben Meadors
285ba9639e
Fix screen on secs (#1673) 
* Fix screen on secs

* getIntervalOrDefaultMs

* Display correction

* Paren
 2022-09-03 22:10:11 -05:00
Ben Meadors
f54f60c31c
Merge branch 'master' into pref_defaults 2022-09-03 14:06:27 -05:00
Ben Meadors
84e438f72f
Mqtt json_enabled (#1672) 
* Payload variants

* Waypoints and fixes

* Remove json send to mesh. I think protobuf messages already do that

* whoops

* Added json_enabled mqtt config
 2022-09-03 14:06:10 -05:00
lewis
f767fd5075 Modified to be compatible with the new version of sdk, compatible with esp32s3 2022-09-03 23:38:40 +08:00