Commit Graph
100 Commits
Author SHA1 Message Date
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
Jm Casler b96ee7be72 New feature #571 - Report contents of spiffs in a json data structure. 2020-12-19 12:09:48 -08:00
Jm Casler 9e449bebf9 Merge pull request #30 from meshtastic/master
update my repo
2020-12-19 09:22:26 -08:00
Jm Casler 53d773b81f Merge pull request #565 from mc-hamster/master
Fixed bad copy/paste of http end points being used as default.
2020-12-13 17:00:43 -08:00
Jm Casler 85b2ba7ce9 Merge branch 'master' into master 2020-12-13 15:02:18 -08:00
Jm Casler 474e0e7158 Fixed bad copy/paste of http end points being used as default. 2020-12-13 14:59:56 -08:00
Jm Casler 99a8c80c44 Merge pull request #564 from mc-hamster/master
#563 Don't display the wifi password when we are a client.
2020-12-13 11:29:21 -08:00
Jm Casler 03a9d7da5e Merge branch 'master' into master 2020-12-13 11:05:40 -08:00
Jm Casler 6975848f45 #563 Don't display the wifi password when we are a client. 2020-12-13 11:01:01 -08:00
Jm Casler 651d045afe Merge pull request #559 from mc-hamster/master
Endpoint to restart device, new sequence to force device into softAP, network scanner
2020-12-12 22:43:37 -08:00
Jm Casler 86952c5456 Fixed #541 - Work around to bug in espressif softap event handler 2020-12-12 22:37:07 -08:00
Jm Casler 46781357df remove hard coded network 2020-12-12 21:43:01 -08:00
Jm Casler bb9abf2dca #560 Forgot to switch back to application/json 2020-12-12 21:42:32 -08:00
Jm Casler 5249608dce #561 Add escapes to strings 2020-12-12 21:35:21 -08:00
Jm Casler 17297db2b1 #561 - Add a scan for SSID 2020-12-12 20:50:41 -08:00
Jm Casler 9f9573d2eb #560 - Add note that we're in admin mode on network screen 2020-12-12 19:18:51 -08:00
Jm Casler e10b82c118 #560 Partial changes 2020-12-12 19:09:58 -08:00
Jm Casler d82aaaa806 #560 - Partial work for Charles. 2020-12-12 18:33:52 -08:00
Jm Casler c0d94ae4ab Update main.cpp 2020-12-12 14:04:52 -08:00
Jm Casler 02ce12607c #560 - Force SoftAP if the user button is held down during startup.
#560 - Force SoftAP if the user button is held down during startup.
2020-12-12 13:54:14 -08:00
Jm Casler bdeba54c50 Merge pull request #29 from meshtastic/master
Merge pull request #553 from mc-hamster/master
2020-12-12 12:38:49 -08:00
Jm Casler 26c9585c9d #557 - Switch from GET to POST 2020-12-12 12:38:17 -08:00
Jm Casler 696255c1f7 #557 - Endpoint to restart device over http(s) 2020-12-12 12:36:16 -08:00
Jm Casler d857f8ba6d Merge pull request #553 from mc-hamster/master
Fix for #551 and #552
2020-12-12 11:56:29 -08:00
Jm Casler 5852caa61c Fix bug #551 - Turn the led off before shutting down.
Fix bug #551 - Turn the led off before shutting down.
2020-12-11 23:03:32 -08:00
Jm Casler e82752c777 #552 - Updated the 404 handler for / to refer to instructions for how to fix the problem.
#552 - Updated the 404 handler for / to refer to instructions for how to fix the problem.
2020-12-11 22:54:48 -08:00
Jm Casler 3eae2c6286 Merge pull request #28 from meshtastic/master
update my repo from master
2020-12-11 22:42:31 -08:00
Jm Casler 781ed3eafd Merge pull request #544 from IZ1IVA/patch-1
Update radio-settings.md
2020-12-09 20:39:18 -08:00
Jm Casler c66a0a37d8 Merge branch 'master' into patch-1 2020-12-09 20:25:17 -08:00
Jm Casler 92f2007207 Merge pull request #545 from IZ1IVA/patch-2
Update radio-settings.md
2020-12-09 20:24:32 -08:00
Jm Casler a70cda6fe4 Merge pull request #27 from meshtastic/master
updated by fork from master
2020-11-29 12:40:32 -08:00
Jm Casler 50615540ce Merge pull request #538 from meshtastic/dev-https
Merging in dev-https to master
2020-11-27 17:21:56 -08:00
Jm Casler 9170dc7738 Merge pull request #534 from mc-hamster/master
Fix for #533 - We will deinit wifi even if it were never initialized.
2020-11-27 16:19:03 -08:00
Jm Casler 7d4c77abfd Fix for #533 - deinitWifi() will de initialize the radio even if it was never initialized 2020-11-27 14:49:44 -08:00
Jm Casler 1ba91ec27f Merge pull request #26 from meshtastic/master
update my repo from master
2020-11-25 21:36:56 -08:00
Jm Casler 575c5b2193 Merge pull request #532 from meshtastic/mc-hamster-patch-2
wait_bluetooth_secs to 60 seconds.
2020-11-22 19:38:39 -08:00
Jm Casler 3473a1e323 wait_bluetooth_secs to 60 seconds. 2020-11-22 19:32:48 -08:00
Jm Casler 11a00e2977 Merge pull request #531 from mc-hamster/master
Add support for the power button #528
2020-11-22 19:19:35 -08:00