kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
2,051 Commits 1 Branch 0 Tags
532b06c2808d4e85ceedc3dd102e42b0aefe9be3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jm 532b06c280 Update version.properties to 1.1.33 2021-01-25 17:01:47 -08:00
Jm ca83a78e13 Fix for #650 - build-all.sh will fail 2021-01-22 19:50:12 -08:00
Jm Casler 2a8ac2c0c6 Merge branch 'master' into master 2021-01-20 19:04:46 -08:00
Jm Casler c97342db99 Merge pull request #63 from mc-hamster/serial 
Update comments on SerialPlugin
 2021-01-20 19:03:44 -08:00
Jm Casler d7b2a0ed79 Merge pull request #62 from mc-hamster/master 
update serial from master
 2021-01-20 19:02:58 -08:00
Jm af0a1b5db5 Update comments of SerialPlugin 2021-01-20 19:02:08 -08:00
Jm Casler 9cf030d587 Merge pull request #652 from mc-hamster/master 
#649 More webserver refactoring
 2021-01-19 21:52:56 -08:00
Jm c04d70d5e5 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-19 21:38:30 -08:00
Jm 2a47819fd6 #649 More webserver refactoring 2021-01-19 21:38:17 -08:00
Jm Casler 4516c8f9b5 Merge pull request #61 from meshtastic/master 
Merge pull request #648 from mc-hamster/master
 2021-01-19 21:27:24 -08:00
Jm e4fdf26dc7 #649 - First pass on the refactoring of the webserver 2021-01-19 21:26:23 -08:00
Jm Casler 39d14fedc2 Merge pull request #648 from mc-hamster/master 
#647 - Fix for admin mode being forced on boards without hardware pullup
 2021-01-18 10:56:13 -08:00
Jm Casler 1da38fc748 Merge branch 'master' into master 2021-01-18 10:44:38 -08:00
Jm b5f50efdcd #647 - Fix for admin mode being forced on boards without hardware pullup 2021-01-18 10:43:15 -08:00
Jm Casler 046e691d4e Merge pull request #645 from mc-hamster/master 
#635 Added web_request_count and fixed printf of psram
 2021-01-17 17:26:56 -08:00
Jm Casler e72531b090 Merge pull request #60 from mc-hamster/master 
Update Serial
 2021-01-17 15:41:21 -08:00
Jm 81e320c9cf Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-17 15:40:27 -08:00
Jm fa8cc74141 Update to Serial Plugin to make it easy to override the device configuration 2021-01-17 15:40:25 -08:00
Jm Casler c7d9ff7cc0 Merge branch 'master' into master 2021-01-17 10:36:54 -08:00
Jm 8704a9d08f Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-17 10:30:40 -08:00
Jm c0d27e2ce9 #635 Added web_request_count and fixed printf of psram 2021-01-17 10:30:34 -08:00
Jm Casler 84b9028ecb Merge pull request #642 from mc-hamster/master 
#635 - Added memory usage statistics
 2021-01-17 04:52:03 -08:00
Jm Casler 4fda7098c0 Merge branch 'master' into master 2021-01-17 04:44:42 -08:00
Jm 8e8264efb0 #635 - Added memory usage statistics 2021-01-17 00:29:29 -08:00
Jm Casler 54e780a6ca Merge pull request #641 from mc-hamster/master 
Update generated protobuf; Update serial plugin; #615 - Configure charge current
 2021-01-17 00:18:33 -08:00
Jm 125eb2b784 Fix for build fail on NRF 2021-01-17 00:11:26 -08:00
Jm Casler 6ea9cdc83b Merge pull request #59 from mc-hamster/master 
Update serial plugin with new protobufs
 2021-01-17 00:03:13 -08:00
Jm c0711fde69 #615 Allow rate for tbeam battery charger to be configurable 2021-01-16 23:10:08 -08:00
Jm 20b8d2c4a5 Set the port to PortNum_SERIAL_APP 2021-01-16 22:41:33 -08:00
Jm 73ae151971 Added serialplugin_timeout to SerialPlugin 2021-01-16 22:39:28 -08:00
Jm Casler f4806c9dd7 Merge branch 'serial' into master 2021-01-16 22:35:56 -08:00
Jm 79532210e8 SerialPlugin - Update comments with better instructions 2021-01-16 22:31:56 -08:00
Jm d7f26493a5 Update to SerialPlugin to take advantage of the configs 2021-01-16 22:27:33 -08:00
Jm b9d025dd58 Missed adding the proto file 2021-01-16 20:53:45 -08:00
Jm f435086a5a Update generated protobufs 2021-01-16 20:50:58 -08:00
Jm 3dcdf372d7 add remote update 2021-01-16 20:12:31 -08:00
Jm cd84f2867c Updated submodule proto 2021-01-16 20:00:37 -08:00
Jm cafe00e463 Update of serialplugin 2021-01-16 19:40:47 -08:00
Jm 6da4e30215 Merge branch 'serial' of https://github.com/mc-hamster/Meshtastic-device into serial 2021-01-14 22:38:53 -08:00
Jm dbf0569e29 Update comments for serial pins recommended by @ryguy 2021-01-14 22:36:51 -08:00
Jm Casler 18220b88b3 Merge pull request #58 from mc-hamster/master 
update serial from master
 2021-01-14 22:36:17 -08:00
Jm Casler 665da2fb00 Merge pull request #57 from meshtastic/master 
Merge pull request #633 from mc-hamster/master
 2021-01-14 22:34:01 -08:00
Jm Casler 57ffe6622d Merge pull request #56 from mc-hamster/master 
update serial from master
 2021-01-14 22:25:20 -08:00
Jm Casler 485fec9649 Merge pull request #633 from mc-hamster/master 
Fix for #632 (move web server to osthread) and #611 (move airtime to osthread)
 2021-01-14 22:06:18 -08:00
Jm bd85736226 SerialPlugin - Exclude working on non esp32 platforms. 2021-01-14 21:59:26 -08:00
Jm 4ec8986934 Fixed switching to uint32 from 16 for airtime in json report 2021-01-14 21:45:41 -08:00
Jm Casler b963216764 Merge pull request #55 from mc-hamster/serial 
Update for SerialPlugin and Airtime
 2021-01-14 21:43:28 -08:00
Jm Casler 813fd95bc8 Merge pull request #54 from geeksville/mc-master 
fix @mc-hamster build to work on linux/nrf52
 2021-01-14 21:33:27 -08:00
Jm 507cd1dd20 #639 - Move from counting seconds to milliseconds 2021-01-14 18:40:18 -08:00
Jm e39506824d Added more comments 2021-01-14 18:08:23 -08:00
Jm f68a31ab28 serialplugin - ability to configure ACK 2021-01-13 23:21:55 -08:00
Jm b1181deb58 serialplugin - Added my todo list 2021-01-13 23:02:13 -08:00
Jm 89b32dd7ee Fix comments in serial plugin 2021-01-13 22:51:36 -08:00
Jm c54e87f9a2 Update SerialPlugin.cpp 
Added documentation.
 2021-01-13 22:50:02 -08:00
Jm eee7e1de57 Update to serial plugin 2021-01-13 22:39:11 -08:00
Jm 3c60df1565 Partial work on the SerialPlugin 2021-01-13 20:22:59 -08:00
Jm Casler a827017bd2 Merge pull request #53 from crossan007/master 
add power statistics for #635
 2021-01-11 17:54:27 -08:00
Jm Casler 37e0f9a325 Merge pull request #52 from mc-hamster/osthread 
maybe this will fix the linux build?
 2021-01-09 19:32:40 -08:00
Jm 0c06d8db3c maybe this will fix the linux build? 2021-01-09 19:31:16 -08:00
Jm Casler 0be4bbb369 Merge pull request #51 from mc-hamster/osthread 
Does this fix the linux build?
 2021-01-09 19:17:45 -08:00
Jm f02ab88393 Does this fix the linux build? 2021-01-09 19:15:10 -08:00
Jm Casler c9d4de8808 Merge pull request #50 from mc-hamster/osthread 
fixed in linux now?
 2021-01-09 19:07:16 -08:00
Jm adb912b665 fixed in linux now? 2021-01-09 19:06:34 -08:00
Jm Casler 3f5da1e03e Merge pull request #49 from mc-hamster/osthread 
another linux fix?
 2021-01-09 18:37:04 -08:00
Jm 0a40d920e3 Update BluetoothUtil.cpp 
yet another linux fix?
 2021-01-09 18:36:23 -08:00
Jm Casler 39311f1e40 Merge pull request #48 from mc-hamster/osthread 
is linux fixed now?
 2021-01-09 18:27:32 -08:00
Jm 9cd24a5646 is linux fixed now? 2021-01-09 18:27:03 -08:00
Jm Casler 1c0efde315 Merge pull request #47 from mc-hamster/osthread 
is linux fixed now?
 2021-01-09 18:09:57 -08:00
Jm c82905bbdd is linux fixed now? 2021-01-09 18:09:16 -08:00
Jm Casler 275eace968 Merge pull request #46 from mc-hamster/osthread 
more linux fixes
 2021-01-09 17:52:09 -08:00
Jm 5688c8b81e more linux build fixes 2021-01-09 17:50:58 -08:00
Jm 8b2798abd5 Added a few commented out default_envs 2021-01-09 17:44:20 -08:00
Jm Casler 6d977923b6 Merge pull request #45 from mc-hamster/osthread 
more fixes for linux build
 2021-01-09 17:34:34 -08:00
Jm 52dacaed37 more fixes for linux build 2021-01-09 17:30:36 -08:00
Jm Casler 7a381eaea1 Merge pull request #44 from mc-hamster/osthread 
Fix for breaking the linux build
 2021-01-09 13:47:43 -08:00
Jm 69391e186b Fix for breaking the linux build 2021-01-09 13:47:10 -08:00
Jm Casler 06f8beaa17 Merge pull request #43 from mc-hamster/osthread 
fix for building on NRF platform.
 2021-01-08 23:00:36 -08:00
Jm 3798f4ca5b fix for building on NRF platform. 2021-01-08 22:59:37 -08:00
Jm Casler 4fd243a6e4 Merge pull request #42 from mc-hamster/osthread 
Moving web server and airtime to osthread model. Moved web server to mesh/wifi
 2021-01-08 22:29:45 -08:00
Jm d458f673be Web server is now treaded and moved to mesh/wifi/* 2021-01-08 22:25:44 -08:00
Jm cfcb00b943 that's enough for tonight. web server is in its own thread, needs to be further optimized but it works enough. next is to refactor. 2021-01-08 20:43:51 -08:00
Jm 977e47d109 partial work 2021-01-08 20:06:11 -08:00
Jm Casler cfeb40f36d Merge pull request #41 from mc-hamster/master 
Updated osthread branch from master
 2021-01-08 19:57:19 -08:00
Jm Casler 4fcc3ac1de Merge pull request #40 from meshtastic/master 
Updated my master from head
 2021-01-08 19:54:57 -08:00
Jm 0af5b225c4 intermediate 2021-01-05 23:32:33 -08:00
Jm f7dcef39ce intermediate work 2021-01-05 23:21:14 -08:00
Jm Casler 35bcb5297a Merge pull request #38 from mc-hamster/master 
update from master to osthread
 2021-01-05 19:04:15 -08:00
Jm 84e3d7c276 Test fixes for Tobiases 2021-01-05 18:57:03 -08:00
Jm Casler eb402809e2 Merge branch 'master' into master 2021-01-04 22:16:07 -08:00
Jm e9c9e40624 Include instrusctions for real time backtrace decoding. 2021-01-04 22:15:19 -08:00
Jm Casler 11c16e8bbc Merge pull request #621 from mc-hamster/master 
Remove text "This interface is experimental"
 2021-01-02 10:39:20 -08:00
Jm Casler 7d411351c0 Merge pull request #37 from meshtastic/master 
update from head
 2021-01-02 10:20:56 -08:00
Jm df21602c90 Remove text "This interface is experimental" 2021-01-02 10:18:35 -08:00
Jm 8295b88d96 Checking in work so I don't lose it. Nothing's broke with the build. 2021-01-01 21:20:34 -08:00
Jm 925829dc58 Partial work to migrate to OSThread model 2021-01-01 12:31:46 -08:00
Jm Casler e04ea853dc Merge pull request #616 from mc-hamster/master 
Display AP connection usage only when in AP mode & Cleanup some compile time warnings that were driving me crazy
 2020-12-31 21:26:32 -08:00
Jm Casler 9587729bb0 Merge branch 'master' into master 2020-12-31 20:55:32 -08:00
Jm 6ec368bf02 Commenting out upload ports 2020-12-31 20:50:11 -08:00
Jm d71c7b512f Cleanup some compile time warnings that were driving me crazy. 2020-12-31 20:44:53 -08:00
Jm 349701ac14 Display AP connection usage only when in AP mode 2020-12-31 20:17:18 -08:00