kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,745 Commits 1 Branch 0 Tags
5cdc2f5142ba4c9cc87f07dc2fb5eb231931e6c8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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