Wykres commitów

1680 Commity (9170dc7738f72bf2d98f69e3284f4395738ef70d)

Autor SHA1 Wiadomość Data
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
Charles Crossan 49a19e26d5 Only issue ContentType header once; correctly. 2020-11-13 22:07:52 -05:00
Kevin Hester ac50b9544b
Merge pull request #519 from geeksville/bug513
Bug513
2020-11-14 10:21:44 +08:00
Kevin Hester 7c220f8a39
Merge branch 'master' into bug513 2020-11-14 10:14:22 +08:00
Kevin Hester 1839f8f7ca fix #513 scale retransmission times based on true packet time on wire 2020-11-14 10:07:25 +08:00
Kevin Hester 48c461c50c
Merge pull request #515 from geeksville/eink
nrf52 deep sleep support
2020-11-13 11:08:17 +08:00
Kevin Hester f346b4f0f2 Merge branch 'eink' into bug513 2020-11-13 09:41:23 +08:00
Kevin Hester 5aab4f5c95
Merge branch 'master' into eink 2020-11-13 09:36:18 +08:00
Kevin Hester d407db5ee1 add more deep sleep support for nrf52 boards 2020-11-13 09:33:59 +08:00
Kevin Hester 93afc71e2e Show "sleeping" on eink while in deep sleep 2020-11-13 07:49:01 +08:00
Kevin Hester 67e657f10f always print debug output to both serial and segger debug port
cc @mc-hamster, this  makes USE_SEGGER optional on nrf52 targets
2020-11-13 07:48:25 +08:00
Kevin Hester 619a48085a pinetab docs 2020-11-12 18:31:35 +08:00
Kevin Hester 68937d52fe bug #503 wip 2020-11-12 17:49:04 +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
Kevin Hester 21751da5a2
Merge pull request #512 from geeksville/dev
Dev
2020-11-07 04:19:36 -08:00
Kevin Hester c2e8ac7173 1.1.8 2020-11-07 19:20:38 +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
Kevin Hester 2fd5ce00ce fix build for esp32 targets 2020-11-07 15:09:05 +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
Kevin Hester 952c216bf7 Merge remote-tracking branch 'root/master' into dev 2020-11-07 14:08:22 +08:00
Kevin Hester ff4b03b8c1 Fix #509 was causing failure on non GPS equipped boards 2020-11-07 09:15:28 +08:00
Kevin Hester c5903a790b update for portduino 2020-10-31 15:50:39 +08:00
Kevin Hester bbc36f7b6f switch to my new SD 7.2.0 S113 based bootloader 2020-10-31 12:22: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
Kevin Hester d7368d5a51 begin deep sleep support for nrf52 2020-10-30 17:05:32 +08:00
Kevin Hester 47bbde3c60 fix #505 allow forced standby mode to not assert fail 2020-10-29 16:13:44 +08:00
Kevin Hester 04942a3570 fix #505 - device can reboot due to race condition in sending 2020-10-29 15:27:05 +08:00
Kevin Hester 62a8c968e8
Merge pull request #504 from geeksville/dev
Dev
2020-10-28 23:14:52 -07:00