oztug
3ca42b8f51
Merge remote-tracking branch 'upstream/master'
2020-12-30 01:24:13 +03:00
oztug
5595fb38c1
Genieblocks Lora support
2020-12-29 18:08:11 +03: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
Kevin Hester
0c74303e9d
move criticalerror defs into .proto for cross platform support
2020-12-27 11:22:08 +08:00
Kevin Hester
651bd71454
show critical faults on the screen
2020-12-26 13:36:21 +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
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
Kevin Hester
c427c8abf9
oops - fix my crummy merge
2020-11-28 08:55:56 +08:00
Kevin Hester
cc36e3a9a6
Merge branch 'dev-https' into spiffs-bug496
2020-11-27 16:15:14 -08:00
Jm Casler
817c99e09c
trying to fix it again
2020-11-22 19:12:11 -08:00
Jm Casler
2bd40b7053
Add support for the power button #528
2020-11-22 18:50:14 -08:00
Jm Casler
f60922af34
Accidently checked in my rf deduplexer
2020-11-22 15:42:36 -08:00
Kevin Hester
d7d13d637c
clean up filesystem goo, add spiffs to install scripts, fix #496
...
@mc-hamster seems to work pretty good for me, so I'll send a PR to you
for the dev-http branch.
I'll push out an android alpha build later today (once the build is
complete). Once this new device load is out in the field _future_
device builds will support updating spiffs from android. (i.e. device
loads older than 1.1.9 must be updated to 1.1.9 or later before spiffs
support is implemented on the device side - so some users might need to
update twice before the new spiffs contents will appear on their device)
2020-11-19 09:25:02 +08:00
Jm Casler
a02979d564
Merge branch 'externalAmp' into master
2020-11-16 19:54:06 -08:00
Kevin Hester
d407db5ee1
add more deep sleep support for nrf52 boards
2020-11-13 09:33:59 +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
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
f6ec129288
Merge branch 'master' into master
2020-10-28 18:38:27 -07:00
Kevin Hester
d4e95e95a6
fix long-press handling on alternate button
2020-10-24 08:44:54 +08:00
Kevin Hester
0767c8be03
PPR1 fix screen mirroring on LCD
2020-10-24 08:16:15 +08:00
Kevin Hester
b081a6da56
ppr1 st7567 lcd kinda works now
2020-10-23 18:00:43 +08:00
Kevin Hester
a102e49fdb
PPR1 WIP - hacky code to make LCD talk on I2C. Works!
2020-10-23 17:10:48 +08:00
Kevin Hester
c078c08c3e
Merge branch 'dev' into ppr1
2020-10-23 16:53:38 +08:00
Kevin Hester
a5d7bacdbf
Show current region on the boot screen
2020-10-21 17:27:13 +08:00
Kevin Hester
e1f0e11cb8
ppr1 WIP DO NOT MERGE - will break other clients
2020-10-17 13:15:12 +08:00
Kevin Hester
c73ee98739
Merge branch 'master' into ppr1
2020-10-17 11:00:28 +08:00
Kevin Hester
ca77d48b20
corvus2 gps still doesn't work WIP
2020-10-13 14:43:28 +08:00
Jm Casler
10008d4eef
fix merge conflict
2020-10-11 21:19:22 -07:00
Kevin Hester
45a36f5571
fix POWER state entry/exit based on loss of USB power (tx @mc-hamster)
2020-10-12 09:27:07 +08:00
Kevin Hester
a8e4bbbe65
fix my breaking of button press behavior
2020-10-12 08:25:17 +08: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
32ea11d2af
Merge pull request #14 from meshtastic/master
...
Update from head
2020-10-10 17:23:13 -07:00
Kevin Hester
0c8e0efed2
new threading finished- saves about 10mA for the high activity states
2020-10-11 08:12:53 +08:00
Kevin Hester
49b4ed2a89
coroutine: kinda works now
2020-10-10 18:03:45 +08:00
Kevin Hester
c46a884558
concurrency wip
2020-10-10 08:28:00 +08:00
Kevin Hester
2044427e97
coroutines: wip compiles but does not link
2020-10-09 14:16:51 +08: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
Kevin Hester
f00d07baa3
RTC: pull rtc code into own file for cleanup
2020-10-08 07:28:57 +08:00
Kevin Hester
1a3cc40c7e
sx1262 better to check for header because preamble might never result in irq
2020-10-08 06:23:05 +08:00
Kevin Hester
f6861a8fe2
bug #376 wip - we now minimize comms to gps to save power
2020-10-06 06:07:30 +08:00
Kevin Hester
b072eec4ac
wip for #376
2020-10-05 14:43:44 +08:00
BeardyWalrus
4d7cd0a09d
conditional on needing ESP32 bluetooth header loaded
2020-10-03 17:23:36 -04:00
BeardyWalrus
b38bcffafb
Merge branch 'master' of https://github.com/BeardyWalrus/Meshtastic-device
2020-10-03 17:02:19 -04:00
BeardyWalrus
530432411e
revised fix for #357
...
Now supports default password for devices with no display, and override with double press of user button
2020-10-03 17:02:17 -04:00
geeksville
fec7a6bf17
add air530 gps sleep support
2020-09-28 17:04:19 -07:00
Kevin Hester
04c54840f4
Merge branch 'master' into eink
2020-09-26 12:58:13 -07:00
