kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity
1,629 Commits 1 Branch 0 Tags
2fd5ce00ce99abc96936069dbe6a6da8a269aecf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jm Casler df2733a3b5 readded nodeScriptScriptsJS. it got lost in the transition to the new webserver 2020-10-17 20:28:19 -07:00
Jm Casler 7dd4ce32d2 Moved style.css into meshhttpStatic.h 
Also created /data to store static files before they go into meshhttpStatic.h
 2020-10-17 17:33:29 -07:00
Jm Casler 7f12af73d4 Updated to be host and protocol agnostic 2020-10-17 12:00:21 -07:00
Jm Casler 63113d57b3 Initial integration of meshtastic.js and sample code 2020-10-17 11:30:59 -07:00
Jm Casler 32850ff39d Merge pull request #487 from mc-hamster/master 
Some cleanup and implement the X-Protobuf-Schema header
 2020-10-16 23:40:48 -07:00
Jm Casler 2901f773a4 Some cleanup and implement the X-Protobuf-Schema header 2020-10-16 23:33:50 -07:00
Jm Casler c2a1141dfa Merge pull request #485 from mc-hamster/master 
update class case of HttpAPI
 2020-10-16 19:40:32 -07:00
Jm Casler 5b4472ab56 fix case of HttpAPI class 2020-10-16 19:38:59 -07:00
Jm Casler 3262f732d8 Merge pull request #19 from meshtastic/master 
update my branch from master
 2020-10-16 19:31:59 -07:00
Jm Casler cff21ca130 Merge pull request #484 from meshtastic/dev-https 
Functional protobuf/rest interface.
 2020-10-16 19:28:40 -07:00
Jm Casler 81ce04d3da Merge branch 'master' into dev-https 2020-10-16 19:21:06 -07:00
Jm Casler f4d2b10840 Merge pull request #483 from mc-hamster/master 
Update for interface with the JS client.
 2020-10-16 19:18:31 -07:00
Jm Casler 2370cb8aac Merge pull request #482 from meshtastic/dev-https 
Merge from dev-https to master.
 2020-10-16 19:10:04 -07:00
Jm Casler 0d9481b6ea add allow-headers 2020-10-16 18:00:28 -07:00
Jm Casler 8f0105ccd9 don't send content-type when options is set 2020-10-16 17:46:22 -07:00
Jm Casler ba549d8fcd Return OPTIONS when requested for toradio 2020-10-16 17:41:08 -07:00
Jm Casler b9df2c00fa fromradio all option 
requesting fromradio will return one protobuf
4:56
requesting fromradio?all=true will give you all of them.
 2020-10-16 17:07:35 -07:00
Jm Casler f698231be7 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-16 16:36:55 -07:00
Jm Casler 8414f4a6a3 Added access-control-allow headers 2020-10-16 16:36:52 -07:00
Jm Casler cd811951b1 Merge pull request #481 from mc-hamster/master 
Update from mchamster to dev-https
 2020-10-15 19:53:03 -07:00
Jm Casler df2976dad0 Merge pull request #18 from meshtastic/dev-https 
From Dev https to mc-hamster master
 2020-10-15 19:40:49 -07:00
Jm Casler 4ccbe6ff71 Merge pull request #480 from meshtastic/master 
Updating dev-https from master
 2020-10-15 19:40:01 -07:00
Jm Casler 038ddb887f Be a little smarter with setting the CPU frequency 
in the event we have HTTPS and HTTP requests within close periods, let the speed set by the HTTPS request take presidence.
 2020-10-15 19:28:20 -07:00
Jm Casler 3b2f5fa5e3 fromRadio now returns all the vailable protobufs. a request to http sets the cpu clock to 160mhz, https to 240mhz then will clock it back down after 2 minutes. 2020-10-14 20:24:19 -07:00
Jm Casler 97adb598b6 toRadio is functional 2020-10-14 16:17:12 -07:00
Jm Casler 02e3438d5e Added a favicon.ico 2020-10-11 22:13:14 -07:00
Jm Casler 02b1ece6ac Update meshhttp.cpp 2020-10-11 21:30:14 -07:00
Jm Casler 9fdef366f7 Merge pull request #473 from mc-hamster/master 
update dev-https from my fork
 2020-10-11 21:20:50 -07:00
Jm Casler 284816229e Merge pull request #17 from meshtastic/master 
update my fork from head
 2020-10-11 21:19:39 -07:00
Jm Casler 10008d4eef fix merge conflict 2020-10-11 21:19:22 -07:00
Jm Casler 58cfd1317c Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-11 20:38:13 -07:00
Jm Casler 3d3f7869d4 Increase CPU frequency on HTTPS requests. Clock back down after a period of time. 2020-10-11 20:38:09 -07:00
Jm Casler 876d32c9ee Merge pull request #16 from geeksville/mc-master 
fix build for linux (by moving esp32 specific lib to esp32 tree)
 2020-10-11 18:17:20 -07:00
Jm Casler 48e6a60a07 Merge pull request #470 from mc-hamster/master 
Merge pull request #15 from meshtastic/master
 2020-10-10 22:30:34 -07:00
Jm Casler ca48079545 Merge pull request #15 from meshtastic/master 
updated my branch from head
 2020-10-10 22:29:09 -07:00
Jm Casler 76b4be3b87 Merge pull request #469 from mc-hamster/master 
Switched to esp32_https_server from the Espressif (Issue #452) and Enable RX LNA (#466)
 2020-10-10 22:28:08 -07:00
Jm Casler d39cc3d57b Checking if ESP32 for the frequency display 2020-10-10 22:06:56 -07:00
Jm Casler b17a8d7a6a Removed powerExit -- it wasn't working 2020-10-10 21:54:27 -07:00
Jm Casler c16acb904e Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-10 17:59:46 -07:00
Jm Casler 5b777219be Enable the RX LNA #466 
Enabling the RX LNA
 2020-10-10 17:59:32 -07:00
Jm Casler 32ea11d2af Merge pull request #14 from meshtastic/master 
Update from head
 2020-10-10 17:23:13 -07:00
Jm Casler db8faa9faf added powerExit 2020-10-09 23:07:37 -07:00
Jm Casler 6d178ebc91 Added esp32_https_server to the meshtastic project 2020-10-07 22:18:46 -07:00
Jm Casler f75a256631 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-07 22:02:59 -07:00
Jm Casler 4f659b7563 Initial check in of HTTPS server for #452 
This switches from the espressif web server to esp32_https_server. Both HTTPS and HTTP have been migrated. On board SSL key generation.
 2020-10-07 22:02:53 -07:00
Jm Casler dffcea1f4d Merge pull request #13 from meshtastic/master 
Update my fork from head with 1.1 changes
 2020-10-07 08:32:54 -07:00
Jm Casler 71cdbb1a73 Merge pull request #454 from mc-hamster/master 
Update readme to link to the US aliexpress listing
 2020-10-01 20:39:38 -07:00
Jm Casler 200aa27cc0 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-10-01 20:08:01 -07:00
Jm Casler f7752e4f9d Merge pull request #12 from meshtastic/master 
Update my repo from head
 2020-10-01 20:07:07 -07:00
Jm Casler 7f0e8a8d6b Update readme to link to the US aliexpress listing for T-Beam V1.1 w/ NEO-M8N /w SX1262 2020-10-01 20:04:12 -07:00
Jm Casler 1f6877606f Merge pull request #453 from ikstream/update_readme 
Fix update/install instructions
 2020-10-01 17:32:55 -07:00
Jm Casler d94be0f534 Merge pull request #448 from mc-hamster/master 
Add frequency information to debug output (#447) and cleanup of screen.cpp and meshwifi.cpp
 2020-09-29 01:09:55 -07:00
Jm Casler 17a3e6e975 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-09-29 00:59:31 -07:00
Jm Casler 423cbc2c6d Added frequency information to debug output (#447) and cleanup of screen.cpp and meshwifi.cpp 2020-09-29 00:59:26 -07:00
Jm Casler 154dd3990c Merge pull request #11 from meshtastic/master 
Merge pull request #446 from mc-hamster/master
 2020-09-27 09:34:27 -07:00
Jm Casler 78fe41710b Merge pull request #446 from mc-hamster/master 
Give more details of why wifi is disconnected & Set device hostname with hardwire ID #445
 2020-09-27 01:04:01 -07:00
Jm Casler 1f38404e60 Merge branch 'master' into master 2020-09-27 00:58:12 -07:00
Jm Casler 848760e5bf Set device hostname with hardwire ID #445 2020-09-27 00:55:41 -07:00
Jm Casler 5ebac0cd54 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-09-26 23:38:22 -07:00
Jm Casler 9b4079317b Give more details of why wifi is disconnected 2020-09-26 23:37:58 -07:00
Jm Casler 0f64332f93 Merge pull request #444 from mc-hamster/master 
Display gps altitude on display #443
 2020-09-26 18:50:00 -07:00
Jm Casler fd62edbcab Merge branch 'master' into master 2020-09-26 18:44:53 -07:00
Jm Casler b5361ef89f Display gps altitude on display #443 2020-09-26 18:37:51 -07:00
Jm Casler 9c7aa02db8 Merge pull request #440 from mc-hamster/master 
Merging from my fork into master for some cleanup, more code comments, reduce compile warnings and move the "Mode" text up a line.
 2020-09-26 00:20:27 -07:00
Jm Casler 6f444ed4b5 Accidently left #include "nimble/BluetoothUtil.h" in screen 2020-09-26 00:03:23 -07:00
Jm Casler 28119bf1bf Fix for #439 and some cleanup 2020-09-26 00:01:02 -07:00
Jm Casler 7fdb5b594d Merge pull request #10 from meshtastic/master 
update my fork from head
 2020-09-25 16:40:01 -07:00
Jm Casler 05351ce3e4 Merge branch 'master' into dev-wifi 2020-09-24 17:21:16 -07:00
Jm Casler fed4dfd410 Merge pull request #435 from mc-hamster/master 
Update dev-wifi from my fork
 2020-09-24 11:15:47 -07:00
Jm Casler 0d3b8bdb22 Note not to file bugs 2020-09-24 11:07:30 -07:00
Jm Casler ce7fa65595 David's latest changes to the HTML UI 2020-09-23 19:04:12 -07:00
Jm Casler 2d8eb8e205 Merge pull request #9 from meshtastic/dev-wifi 
from dev-wifi to my fork
 2020-09-22 22:09:06 -07:00
Jm Casler 52a3927585 Merge branch 'master' into dev-wifi 2020-09-22 22:00:55 -07:00
Jm Casler b39f6c96bd Merge remote-tracking branch 'origin/dev-wifi' 2020-09-22 22:00:07 -07:00
Jm Casler a96c2e0eac Merge pull request #428 from mc-hamster/master 
Initial check-in of David's UI
 2020-09-22 21:10:48 -07:00
Jm Casler 10b24c0269 Initial check-in of David's UI 2020-09-22 21:01:31 -07:00
Jm Casler 4140883684 Merge pull request #426 from comgram/kr 
Add Korean Frequency
 2020-09-22 05:46:18 -07:00
Jm Casler 626d82614c Merge pull request #425 from mc-hamster/master 
Fix for - dev-wifi: Detailed error reporting of reason why WiFi didn't connect #424
 2020-09-19 22:05:57 -07:00
Jm Casler d890068acb dev-wifi: Detailed error reporting of reason why WiFi didn't connect #424 2020-09-19 21:58:21 -07:00
Jm Casler 468ad39a94 Merge pull request #7 from meshtastic/dev-wifi 
Bringing in the API changes
 2020-09-19 17:27:29 -07:00
Jm Casler 5cbe06c2b0 Merge pull request #419 from geeksville/dev-wifi 
Add API server on port 4403 (kinda a WIP, seems to work but I haven't
 2020-09-19 17:25:24 -07:00
Jm Casler 3412ecfe7b Merge pull request #6 from meshtastic/dev-wifi 
Pulling from meshtastic dev-wifi to my work area
 2020-09-19 17:21:56 -07:00
Jm Casler adb16a334c Merge pull request #423 from mc-hamster/master 
Add more detail on the connection status on the screen #422
 2020-09-19 17:20:35 -07:00
Jm Casler 377f0bda5d Add more detail on the connection status on the screen #422 2020-09-19 17:15:03 -07:00
Jm Casler 51ab853658 Merge pull request #421 from mc-hamster/master 
Fix for Bug #420 : Wifi in station mode sometimes enters loops of repeatedly joining
 2020-09-19 16:46:05 -07:00
Jm Casler 464a42258f Fix for "Wifi in station mode sometimes enters loops of repeatedly joining... #420" 
Fix for Wifi in station mode sometimes enters loops of repeatedly joining... #420
 2020-09-19 16:38:59 -07:00
Jm Casler 945f726b65 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-09-19 12:50:46 -07:00
Jm Casler 7c44daf8f4 pushing my chances to personal branch so i can get the changes from the laptop 2020-09-19 12:50:43 -07:00
Jm Casler c57a9a8613 Update from my laptop 2020-09-19 11:24:55 -07:00