kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,854 Commits 1 Branch 0 Tags
21570fc24fbdecf6ace4d40fdfd3e7929bbe47f0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jm Casler 817c99e09c trying to fix it again 2020-11-22 19:12:11 -08:00
Jm Casler 9801a62d2d Fix for CI on other boards. 2020-11-22 19:01:48 -08:00
Jm Casler 2bd40b7053 Add support for the power button #528 2020-11-22 18:50:14 -08:00
Jm Casler dccc15946b Merge pull request #530 from mc-hamster/master 
Removing stuff I accidently checked in for the duplexer
 2020-11-22 16:50:45 -08:00
Jm Casler 3ab9d2a50e Removing stuff I accidently checked in for the duplexer 2020-11-22 16:24:22 -08:00
Jm Casler 776a978ea0 Merge pull request #529 from mc-hamster/master 
Accidentally checked in my rf deduplixer
 2020-11-22 15:44:19 -08:00
Jm Casler f60922af34 Accidently checked in my rf deduplexer 2020-11-22 15:42:36 -08:00
Jm Casler 66f9dbec45 Merge pull request #524 from meshtastic/mc-hamster-patch-1 
Lora Design Guide
 2020-11-17 13:16:49 -08:00
Jm Casler 4679dd7c4d Lora Design Guide 
Airtime calculation is in section 4.
 2020-11-17 11:14:57 -08:00
Jm Casler a02979d564 Merge branch 'externalAmp' into master 2020-11-16 19:54:06 -08:00
Jm Casler 1b365fa0aa Merge pull request #24 from meshtastic/dev-https 
Dev https
 2020-11-13 21:40:00 -08:00
Jm Casler 71d1d4d8fa Merge pull request #521 from meshtastic/master 
Update dev-https from master
 2020-11-13 21:35:20 -08:00
Jm Casler 64df994a32 Merge pull request #520 from crossan007/dev-https 
Only issue ContentType header once; correctly.
 2020-11-13 20:13:31 -08:00
Jm Casler e33657eb75 Toggle GPIO2 to HIGH when transmitting a packet out the LORA radio. 2020-11-09 19:47:31 -08:00
Jm Casler 825001f313 Merge pull request #23 from mc-hamster/master 
update
 2020-11-06 23:12:50 -08:00
Jm Casler 576526576a Merge pull request #511 from mc-hamster/master 
Web text editor #510
 2020-11-06 23:11:09 -08:00
Jm Casler 4204c494ae fix poorly merged file 2020-11-06 22:41:26 -08:00
Jm Casler 84beae1001 Merge branch 'dev-https' into master 2020-11-06 22:29:03 -08:00
Jm Casler 951b4293c4 Set web cookie and web text editor. 2020-11-06 22:21:20 -08:00
Jm Casler 2f9ef463d8 Merge pull request #507 from meshtastic/master 
update dev-https from master
 2020-10-30 21:04:16 -07:00
Jm Casler bea00569fd Merge pull request #22 from meshtastic/master 
update my fork from master
 2020-10-30 21:03:40 -07:00
Jm Casler b1dae3608e Merge pull request #502 from mc-hamster/master 
Update to basic.js and add mime types.
 2020-10-26 18:18:16 -07:00
Jm Casler 44aafd5b9c Update to basic.js and add mime types. 2020-10-26 18:17:33 -07:00
Jm Casler 91756d1fec Merge pull request #501 from mc-hamster/master 
Fixed typo. Updated js library. Update root file handler.
 2020-10-22 18:46:26 -07:00
Jm Casler 5981831bc0 Fixed typo. Updated js library. Update root file handler. 
Typo fixed. I placed the latest javascript library files into the static folder. Updated the root file handler to be able to serve both compressed and uncompressed files.
 2020-10-22 18:43:54 -07:00
Jm Casler 00eed206cb Update typo, import from js library 2020-10-22 18:26:43 -07:00
Jm Casler 130d55aaaa Merge pull request #500 from mc-hamster/master 
Updated dev-https from my fork.
 2020-10-21 21:29:34 -07:00
Jm Casler 13ef48094d Merge pull request #21 from meshtastic/dev-https 
Dev https to my fork
 2020-10-21 21:20:55 -07:00
Jm Casler 529fd5a830 Merge pull request #499 from meshtastic/master 
Update dev-https from master
 2020-10-21 21:20:07 -07:00
Jm Casler baa3d1dae4 Support for the SPIFFS 2020-10-21 20:57:44 -07:00
Jm Casler e9279919ae Remove uncompressed style.css. Combine SSID/PWD on same line and toggle between the two every 10 seconds. 2020-10-19 16:58:11 -07:00
Jm Casler 227c6fc27e Merge pull request #494 from meshtastic/dev-https 
Added the x-protobuf-schema, initial integration of javascript library, tuning of the CPU throttle timer.
 2020-10-18 22:03:46 -07:00
Jm Casler a37844d7e5 Merge pull request #493 from mc-hamster/master 
update case of meshhttpStatic.h
 2020-10-18 21:55:25 -07:00
Jm Casler ff20b29c3c update case of meshhttpStatic.h 2020-10-18 21:44:55 -07:00
Jm Casler 64c29c4a35 Merge pull request #490 from mc-hamster/master 
Update filename, cpu clock timer, add more debug info on the web server startup
 2020-10-18 21:41:34 -07:00
Jm Casler d4df3f8a7e mDNS server http://meshtastic.local 2020-10-18 21:39:02 -07:00
Jm Casler a16c3af30a Clarified debug message regardding the Web Server startup status. 2020-10-18 18:44:08 -07:00
Jm Casler 3061860dab Update sleep timer for the CPU clock 2020-10-18 18:30:19 -07:00
Jm Casler 2450d98b59 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-18 18:08:03 -07:00
Jm Casler a371592ad9 Added instructions for David 2020-10-18 18:07:44 -07:00
Jm Casler f7aaf48ae9 Merge pull request #20 from meshtastic/dev-https 
Update my branch from dev-https
 2020-10-18 18:04:49 -07:00
Jm Casler 1fb604ebc8 Merge pull request #488 from mc-hamster/master 
Update dev-https from my fork.
 2020-10-18 16:44:01 -07:00