pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-05 04:10:07 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,074 Commits 28 Branches 280 Tags 118 MiB
aaefd2c2e7
Commit Graph

205 Commits

Author SHA1 Message Date
Kevin Hester
90576f44d8 Merge remote-tracking branch 'root/master' into dev1.2 
# Conflicts:
#	proto
 2021-03-23 12:17:46 +08:00
Kevin Hester
1fcec8ce3b always fix up channel list, even if we just did factory reset 2021-03-23 11:54:53 +08:00
Kevin Hester
d32386a027 Return errors for unauthorized requests or out of bound channel nums 2021-03-23 11:44:51 +08:00
Jm Casler
e193f63687 Update StoreForwardPlugin.cpp 2021-03-21 19:46:02 -07:00
Jm Casler
1eb37dded8 partial work for S&F 2021-03-21 19:45:35 -07:00
Jm Casler
baeb002245 Fix small bug in range test plugin. 
packetSequence was an unsigned int but i was using %d. oops
 2021-03-20 00:38:53 -07:00
Jm
0ce7a3f0ec Update to how S&F reserves space on PSRAM 2021-03-19 23:43:06 -07:00
Jm Casler
0befad82a7
Merge branch 'master' into master 2021-03-19 23:38:42 -07:00
Kevin Hester
c410f2d151 fix tlora 1.6 build 2021-03-19 23:40:41 +08:00
Kevin Hester
7c5ab885be geeksville todo 2021-03-19 15:24:24 +08:00
Kevin Hester
af5d82dbde Merge remote-tracking branch 'root/master' into portduino 2021-03-18 19:49:13 +08:00
Kevin Hester
cef6e248e7 add newline 2021-03-18 19:40:00 +08:00
Kevin Hester
b4c379f5fc add sim exit cmd 2021-03-18 19:09:31 +08:00
Jm
002532401d #743 - Stub out for "mode 10" - NMEA string. 2021-03-17 21:52:30 -07:00
Jm
1b8f41d353 Partial work on s&f 2021-03-17 21:03:11 -07:00
Kevin Hester
a07291d904 cleanup external notification plugin 2021-03-13 13:32:23 +08:00
Kevin Hester
c0ac457cad lockdown plugins that touch hardware 2021-03-13 13:14:27 +08:00
Kevin Hester
c227143b53 @mc-hamster, I think storeandforward was accidentally wrong (no worries though) 2021-03-13 08:41:50 +08:00
Kevin Hester
a5ed607261 fix memory corruption in storeandforward 2021-03-13 08:29:32 +08:00
Kevin Hester
b02212009a progress on remote settings 2021-03-12 14:10:36 +08:00
Kevin Hester
2d6261703a fix null pointer exception in storeandforwardplugin. if null the vtable is busted 
cc @mc-hamster.  In some cases storeForwardPluginRadio can be null ;-)

~/development/meshtastic/meshtastic-esp32$ bin/exception_decoder.py -e .pio/build/tbeam/firmware.elf ex
stack:
0x401db467: StoreForwardPluginRadio::sendPayload(unsigned int, bool) at /home/kevinh/development/meshtastic/meshtastic-esp32/src/plugins/esp32/StoreForwardPlugin.cpp:235
0x400e7cbd: StoreForwardPlugin::runOnce() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/plugins/esp32/StoreForwardPlugin.cpp:225
0x400d4cca: concurrency::OSThread::run() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/concurrency/OSThread.cpp:45
0x400f015d: ThreadController::runOrDelay() at /home/kevinh/development/meshtastic/meshtastic-esp32/.pio/libdeps/tbeam/Thread/ThreadController.cpp:153
0x400da070: loop() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/main.cpp:621
0x400ff709: loopTask(void*) at /home/kevinh/.platformio/packages/framework-arduinoespressif32/cores/esp32/main.cpp:19

Signed-off-by: Kevin Hester <kevinh@geeksville.com>
 2021-03-11 18:53:17 +08:00
Kevin Hester
a97c2ae6eb minimize radioconfig file writes 2021-03-11 18:29:47 +08:00
Kevin Hester
ab9fe42f58 wip - move channels 2021-03-11 13:02:00 +08:00
Kevin Hester
959b540c02 begin restricting admin ops to the admin channel 2021-03-11 10:01:57 +08:00
Kevin Hester
0df01f2586 Merge remote-tracking branch 'root/master' into eink 2021-03-10 15:30:51 +08:00
Kevin Hester
ecaae87b79 make screen optional 2021-03-09 15:07:02 +08:00
Jm Casler
315cfe4f2d
Merge branch 'master' into master 2021-03-07 23:25:43 -08:00
Kevin Hester
707ed75138 fix warnings found in nrf52 build 2021-03-08 15:20:43 +08:00
Kevin Hester
d014ae0bff fix ls_sleeps communication to device clients 2021-03-07 09:51:17 +08:00
Kevin Hester
2c29e8b179 make nodeinfo & position plugins optional 2021-03-06 10:36:30 +08:00
Kevin Hester
d2d6b8e12f fix log formatting 2021-03-06 10:27:48 +08:00
Kevin Hester
0c0c0babba combine acks works 2021-03-05 11:44:45 +08:00
Kevin Hester
950b32232f don't send messages the phone sent us back towards the phone 2021-03-05 10:19:27 +08:00
Charles Crossan
1b71a0f436 refactor ENV to single multi-inheritance class with cleaner user preferences 
Fix merge issues

don't log when drawing blank frames

remove useless logging

re-comment stuff

fix comment

unused var
 2021-03-03 20:30:20 -05:00
Charles Crossan
2af9e1431e Improvements to EnvironmentalMeasurementPlugin 
Instead of holding onto only the last measurement, hold onto a copy of the last MeshPacket containing a measurement

This will make it easier to display the last time received

make DHT sensor reads more reliable

user preference for Farenheit vs Celsius
 2021-03-03 08:23:03 -05:00
Jm Casler
ee04d57a7f
Merge pull request #73 from meshtastic/master 
pulling 1.2 into my fork
 2021-03-02 20:46:21 -08:00
Jm
2cf704abe0 Crashes after 7 seconds. 2021-02-28 19:35:00 -08:00
Kevin Hester
ef612d0b58 Merge remote-tracking branch 'root/master' into dev1.2 
# Conflicts:
#	src/plugins/Plugins.cpp
#	version.properties
 2021-03-01 10:26:16 +08:00
Jm Casler
52d85c9a41 Partial work from laptop -- non-routers can send a heartbeat 2021-02-27 22:34:53 -08:00
Kevin Hester
63e0b53054 1 index channel index 2021-02-27 09:17:58 +08:00
Kevin Hester
989f52494d clean up ack packets 2021-02-26 20:36:22 +08:00
Kevin Hester
0307e4161e get settings message works 2021-02-26 20:10:41 +08:00
Kevin Hester
c7c8b34adf impl get channels/get radio remote api 2021-02-26 15:34:00 +08:00
Jm
5f041ea7e9 Update Plugins.cpp 2021-02-25 08:14:07 -08:00
Jm Casler
14271be816
Rename src/plugins/StoreForwardPlugin.h to src/plugins/esp32/StoreForwardPlugin.h 2021-02-25 08:12:57 -08:00
Jm Casler
30d600040b
Rename src/plugins/StoreForwardPlugin.cpp to src/plugins/esp32/StoreForwardPlugin.cpp 2021-02-25 08:12:30 -08:00
Kevin Hester
e4eb7ab589 Merge branch 'dev' into dev1.2 
# Conflicts:
#	proto
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
#	src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp
 2021-02-25 19:44:08 +08:00
Jm Casler
0fe046b92d
Merge pull request #72 from meshtastic/master 
Update from head
 2021-02-24 20:27:58 -08:00
Jm
fd6842cb5b Partial Work, stable build. 2021-02-24 20:27:21 -08:00
Kevin Hester
f8d8dc25c0 properly route messages to phone again 2021-02-23 14:35:34 +08:00
Jm
256ba8fa1b partial work, untested 2021-02-22 20:07:19 -08:00
Charles Crossan
ec41c11e58 initialize the last measurement values to something obviously "unread" 2021-02-22 21:00:41 -05:00
Charles Crossan
3f1ada29ac support independently enabling/disabling the on-device screen and actual measurement 2021-02-22 20:47:35 -05:00
Charles Crossan
0c9df6ccbd disable the app by default 2021-02-22 20:33:42 -05:00
Charles Crossan
b62b01fe7c consume the additional details from OLEDDisplayUiState to handle transitions to/from plugin screens better 
It's still a bit janky, but should work

https://github.com/meshtastic/esp8266-oled-ssd1306/pull/2
 2021-02-22 20:18:36 -05:00
Charles Crossan
efaf669479 update Environmental Measurement plugin to use radio config prefs 2021-02-22 19:50:51 -05:00
Jm Casler
d5cb7ebf3b check in partial work. 2021-02-21 20:15:31 -08:00
Kevin Hester
3088fe3f91 Stay up-to-date wrt master (cc @mc-hamster) 
# Conflicts:
#	src/plugins/Plugins.cpp
#	src/plugins/RangeTestPlugin.cpp
#	src/plugins/StoreForwardPlugin.cpp
 2021-02-22 10:39:46 +08:00
Charles Crossan
6dffaae72e fix typo 2021-02-21 16:49:35 -05:00
Charles Crossan
ae76ce4024 Implement interface for plugins to have custom UI Frames 2021-02-21 16:46:46 -05:00
Charles Crossan
fc72d16bcb Disable the plugin by default 2021-02-21 11:48:32 -05:00
Charles Crossan
765a6fcc62 Display received measurements in logs and on screen 2021-02-21 11:39:45 -05:00
Charles Crossan
0b20c46b79 standardize log line beginnings 2021-02-21 11:39:20 -05:00
Charles Crossan
27f74382aa Fix CI build for non-esp32 devices 2021-02-21 11:09:58 -05:00
Charles Crossan
77961e8e93 Un-derp testing details 2021-02-21 11:00:58 -05:00
Charles Crossan
3c564796e0 2021-02-21 10:55:33 -05:00
Jm
a4e5c7224f Add sawNodeReport to storeforwardplugin 2021-02-20 23:53:53 -08:00
Kevin Hester
c6091338ab admin ops 2021-02-21 14:03:44 +08:00
Kevin Hester
99467cd874 1.2 WIP at least doesn't crash 2021-02-21 12:59:47 +08:00
Jm
ca40cb4be3 Update RangeTestPlugin.cpp 2021-02-20 00:43:56 -08:00
Kevin Hester
69a11e7375 WIP phone api changes for dev1.2 2021-02-17 19:04:41 +08:00
Kevin Hester
f064e56dc9 fix esp32 build for dev1.2 2021-02-17 16:17:46 +08:00
Kevin Hester
42ae27973e WIP 1.2 move routing into plugin 2021-02-17 13:06:23 +08:00
Jm
e840465ef3 fix for failed builds on nrf and linux 2021-02-16 18:46:16 -08:00
Jm Casler
f24e8e5f5c
Rename src/plugins/RangeTestPlugin.h to src/plugins/esp32/RangeTestPlugin.h 2021-02-16 18:36:58 -08:00
Jm Casler
6376ab51f1
Moving to plugins/esp32 2021-02-16 18:36:30 -08:00
Jm
a4fd74b58e Update Plugins.cpp 2021-02-16 18:07:02 -08:00
Jm
937955b36d Updating range test and storeforward. 2021-02-16 17:42:46 -08:00
Kevin Hester
45caf394f0 WIP multichannel support 2021-02-16 15:41:52 +08:00
Jm
9a044f31a3 Tweak to the startup condition of the range test plugin. 2021-02-15 09:11:28 -08:00
Jm
8320754b98 Added recommended settings as a sender 2021-02-14 21:45:26 -08:00
Jm
703ce2e292 Keep device from sleeping while transmitting in range test plugin. 2021-02-14 21:34:47 -08:00
Jm
e6605e5ac8 Store Forward can see All(?) rx packets! 2021-02-14 20:13:52 -08:00
Jm Casler
2472d6fd1b
Merge pull request #70 from meshtastic/master 
pull from main
 2021-02-14 18:40:38 -08:00
Jm
3311146aba Turning storeforward back on for @geeksville 2021-02-14 16:19:06 -08:00
Jm
b8adaf6fbe #671 Range test plugin 2021-02-14 16:17:40 -08:00
Jm
24329a26de Framework for storeforward 2021-02-14 14:01:08 -08:00
Jm
f1a65f9d0e Update to store and forward. Don't merge this to main! 2021-02-14 13:31:11 -08:00
Jm Casler
3201d1c3bc #668 Partial work for store & forward 2021-02-14 08:44:49 -08:00
Jm Casler
92a62d93ef #671 Rangetest - This just needs to be tested. 2021-02-13 22:21:01 -08:00
Kevin Hester
e35f137986 clean up nodeinfo broadcasts and move into plugin 2021-02-14 12:27:10 +08:00
Kevin Hester
71c35304d6 delay position plugin start until 60 secs after first boot 2021-02-14 12:26:51 +08:00
Kevin Hester
c1733a4ac6 Merge remote-tracking branch 'root/master' into dev 2021-02-14 12:07:11 +08:00
Kevin Hester
a872231f8a clean up position broadcasts, send them even if we don't have gps lock 2021-02-14 11:57:48 +08:00
Kevin Hester
52ec4d511c oops - we weren't properly stripping timestamps from new style positions 2021-02-14 11:37:32 +08:00
Jm
19db5ba421 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-02-12 18:53:08 -08:00
Jm
e225af28dc Disable plugins 2021-02-12 18:52:31 -08:00
Jm Casler
eecf89a9c0
Merge pull request #68 from meshtastic/master 
from main to my fork
 2021-02-12 18:49:39 -08:00
Kevin Hester
2ff5046dcd for #681, add MeshPacketQueue (a priority queue) to ensure acks get sent quickly 2021-02-12 09:08:49 +08:00
Kevin Hester
917090856f partial for #681: Never let stale nodeinfos/positions stay in xmit queue 2021-02-11 18:19:43 +08:00