Commit Graph

4883 Commits

Author SHA1 Message Date
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
Ben Meadors
803dc69ccd
Update radiolib 2022-10-02 09:48:48 -05:00
Thomas Göttgens
42308cca5b
Merge branch 'master' into pcf8563rtc 2022-10-01 17:31:02 +02:00
Thomas Göttgens
ea991a4eee
Merge pull request #1737 from GUVWAF/EnhancedSimRadio
Let SimRadio communicate via TCP
2022-10-01 17:24:26 +02:00
GUVWAF
04db2d4410 Merge branch 'EnhancedSimRadio' of https://github.com/GUVWAF/Meshtastic-device into EnhancedSimRadio 2022-10-01 17:07:59 +02:00
GUVWAF
076c1ed2ee Merge branch 'EnhancedSimRadio' of https://github.com/GUVWAF/Meshtastic-device into EnhancedSimRadio 2022-10-01 17:05:49 +02:00
Thomas Göttgens
75aa4ea325
suppress cppcheck warning 2022-10-01 17:05:04 +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
GUVWAF
b53dcb932e Adapt conditional include 2022-10-01 17:01:25 +02:00
Thomas Göttgens
371428d6ab
Fix compile error on nRF52 2022-10-01 16:41:49 +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
Thomas Göttgens
6b40f9d95c
Unfork this lib, we're done here now. 2022-10-01 15:27:13 +02:00
Thomas Göttgens
b3717d0396
Merge branch 'master' into pcf8563rtc 2022-10-01 15:20:16 +02: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
Thomas Göttgens
28384df702
Merge pull request #1734 from meshtastic/Build-Image
Build image
2022-10-01 15:17:41 +02: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
68282682de Use new SimRadio in main for Portduino 2022-10-01 12:03:35 +02:00
GUVWAF
2696b04138 Allow Portduino to set the TCP port 2022-10-01 12:02:29 +02:00
GUVWAF
31dc37150b Fix typo 2022-10-01 12:00:31 +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
Thomas Göttgens
32990856e3
Merge branch 'master' into Build-Image 2022-10-01 10:31:59 +02:00
Thomas Göttgens
a1bd5c9ea0
Accomodate for new flash files 2022-10-01 10:31:25 +02:00
Thomas Göttgens
51f0e7879a use the right firmware artefact 2022-10-01 10:06:13 +02:00
Thomas Göttgens
0bdb90d133 remove hard to maintain system-info bootloader 2022-10-01 09:50:16 +02:00
Thomas Göttgens
e98c11ff89 The new combined firmware starts flashing at offset 0, no need to flash system-info or partitions any more. 2022-10-01 09:46:56 +02:00
andrekir
8f84d7089c move channel_num to loraConfig 2022-09-30 17:33:43 -03:00
Thomas Göttgens
b0712c4186 make other platforms happy again 2022-09-29 21:23:01 +02:00
Thomas Göttgens
8f92383ce4 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-29 17:05:11 +02:00
Thomas Göttgens
c571fc9e24 generate a monolithic flash image for the app. 2022-09-29 17:04:56 +02:00
Thomas Göttgens
05126bc6dc
Merge branch 'master' into pcf8563rtc 2022-09-29 16:33:43 +02:00
Thomas Göttgens
de56a370c6
Merge pull request #1733 from meshtastic/TLORA-fix
Tlora fix
2022-09-29 13:37:51 +02:00
Thomas Göttgens
daf189bf4b Check in variant.h change 2022-09-29 13:23:23 +02:00
Thomas Göttgens
d95ec7e6b9 fix TLORA-V2.1-1.6 2022-09-29 13:21:48 +02:00
Ben Meadors
ac235bcabb
Reset nodedb wiring (#1724) 2022-09-28 16:47:26 -05:00
Neil Hao
ab4b3a50ee
'battery_gauge_fix' (#1731) 2022-09-28 15:53:26 -05:00
Thomas Göttgens
7f0fb2a2b6 Move file to right spot in source tree 2022-09-28 20:13:41 +02:00
Richard McDougall
ade1edfdfc Adjust year, hour, minute for PCF8563 2022-09-27 22:51:40 -07:00
Thomas Göttgens
4723faa95f
Merge pull request #1728 from meshtastic/bug-1669
fixes #1669
2022-09-27 14:15:38 +02:00
Thomas Göttgens
93f83b0fcb
Merge branch 'master' into bug-1669 2022-09-27 14:03:48 +02:00
Thomas Göttgens
8f84f7c0a5 fixes #1669 2022-09-27 14:03:02 +02:00
Ben Meadors
48e4101f1c
Move it 2022-09-27 06:08:24 -05:00