kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
2,020 Commits 1 Branch 0 Tags
6f6dd2291efecaf9e90a2fdcae3686793254f8a7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jm Casler 727d8a6456 Merge pull request #610 from mc-hamster/master 
Fix for meshtastic#606 and meshtastic#597
 2020-12-30 21:10:15 -08:00
Jm Casler 7b80b95381 Merge pull request #36 from mc-hamster/upload 
Fix for meshtastic#606 and meshtastic#597
 2020-12-30 18:19:52 -08:00
Jm 2867f8fd53 Fix for #606 and #597 
Upload interface randomly crashes #606

watchdog timer exception while building https certificate #597
 2020-12-30 18:10:35 -08:00
Jm 7716d62018 Remove old comment 2020-12-30 15:16:04 -08:00
Jm Casler d5f76b16b9 write readLength to debug console 2020-12-30 14:52:39 -08:00
Jm Casler 552406b15f Merge pull request #34 from meshtastic/master 
update from master
 2020-12-30 13:59:58 -08:00
Jm Casler b75c7ad179 Merge pull request #596 from mc-hamster/master 
#588 - Calculate air time. TX and RX logging is done. #601 - tbeam draws too much power from usb
 2020-12-29 14:08:24 -08:00
Jm Casler 44f89c969d Merge branch 'master' into master 2020-12-29 13:31:31 -08:00
Jm Casler c0e0e095c9 Merge pull request #602 from Noki/master 
case with large gps antenna option
 2020-12-28 10:02:27 -08:00
Jm Casler 6c1c0640f2 Merge branch 'master' into master 2020-12-28 09:54:31 -08:00
Jm 997ed283bf #601 - tbeam draws too much power from USB port 2020-12-28 01:12:42 -08:00
Jm 621306e610 Add IP address and rssi to /json/report 2020-12-27 15:03:32 -08:00
Jm Casler 0e507e1923 Merge branch 'master' into master 2020-12-27 12:39:36 -08:00
Jm 15a0b3694d Update to #588 - Change "hour" to "period" 2020-12-27 10:50:52 -08:00
Jm Casler 6e4cf22cf0 Accidently checked in my platform.ini 2020-12-27 09:49:23 -08:00
Jm Casler 58859848a3 Add RX and RX_ALL analytics for #588 2020-12-27 09:29:48 -08:00
Jm 3c69beef94 Update to the airtime calculator. I didn't 0 out the RX log. 2020-12-26 23:37:04 -08:00
Jm Casler e55c5e10bc Merge branch 'master' into master 2020-12-26 22:43:56 -08:00
Jm e321528a6d #588 - Calculate TX air time 2020-12-26 22:39:43 -08:00
Jm Casler ded2b86e55 Calculate TX air time duty cycles #588 -- UNTESTED 2020-12-25 16:10:38 -08:00
Jm Casler 34e6dbec81 Merge pull request #33 from meshtastic/master 
updated my repo
 2020-12-25 09:44:27 -08:00
Jm d5b57840d9 checking in a little of the airtime so i can switch to the laptop. 2020-12-24 22:12:59 -08:00
Jm Casler 22d9096c3d Merge pull request #590 from mc-hamster/master 
#554 Keep radio turned on if we're contacted over http(s)
 2020-12-24 19:30:30 -08:00
Jm Casler 8080bc608b Merge pull request #32 from meshtastic/master 
Update from upstream.
 2020-12-24 19:20:36 -08:00
Jm 35b1cfcc42 #554 Keep radio turned on if we're contacted over http(s) while on battery power. 2020-12-22 23:15:09 -08:00
Jm Casler e545778154 Merge pull request #583 from mc-hamster/master 
Quiet a compile time warning I introduced
 2020-12-22 22:49:05 -08:00
Jm Casler 6fd2bc5f83 Merge branch 'master' into master 2020-12-22 22:39:05 -08:00
Jm 9a587b2743 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-12-22 22:37:49 -08:00
Jm bacc1b1dad #581 - Quiet a compile time warning I introduced. 2020-12-22 22:37:34 -08:00
Jm Casler 575b69c541 Merge pull request #582 from mc-hamster/master 
#407 - Fix for wifi does not come back up after power down
 2020-12-22 22:36:09 -08:00
Jm Casler 73092b4b40 Merge branch 'master' into master 2020-12-22 22:28:22 -08:00
Jm 877dc824a9 #407 - Fix for wifi does not come back up after power down 2020-12-22 22:26:08 -08:00
Jm Casler b732a13d6c Merge pull request #580 from crossan007/master 
add HTTP/Delete method handler for SPIFFS
 2020-12-22 15:46:18 -08:00
Jm Casler 181db06b0c Merge branch 'master' into master 2020-12-21 19:59:40 -08:00
Jm Casler 5f97740ab7 Fix for #535 -- Heltec board stays asleep ... 2020-12-21 17:42:00 -08:00
Jm Casler 90d6878bbb Merge pull request #578 from crossan007/master 
add mime types for ico and svg
 2020-12-21 16:25:54 -08:00
Jm Casler a47fcdacb5 Merge pull request #575 from mc-hamster/master 
Fix for #574 - add /json/blink endpoint
 2020-12-20 20:24:15 -08:00
Jm Casler ef0891ae5d Fix for #576 - The browser was seeing the other files on the filesystem. 2020-12-20 20:09:17 -08:00
Jm Casler 9ed19892e2 Merge branch 'master' into master 2020-12-20 18:59:23 -08:00
Jm Casler 88cf60ad9d Merge pull request #31 from crossan007/adjust-blink-timings 
adjust LED timings; switch to HTTP/POST; add SCREEN blink support
 2020-12-20 18:49:45 -08:00
Jm Casler 1ca83509dd Blink the LED for one second on get of /json/blink 2020-12-20 11:32:49 -08:00
Jm Casler 7135a12300 Merge pull request #573 from mc-hamster/master 
New feature #571 - Report contents of spiffs in a json data structure.
 2020-12-19 12:25:15 -08:00
Jm Casler fae9ea8b3b Update for #571 (i forgot to set the mime type) 2020-12-19 12:18:08 -08:00