Jm Casler
|
ded2b86e55
|
Calculate TX air time duty cycles #588 -- UNTESTED
|
2020-12-25 16:10:38 -08:00 |
Tobias Schwarz
|
9efcdc7c67
|
More cases and info about GPS and LoRa antennas
|
2020-12-25 20:58:31 +01:00 |
Jm Casler
|
34e6dbec81
|
Merge pull request #33 from meshtastic/master
updated my repo
|
2020-12-25 09:44:27 -08:00 |
Kevin Hester
|
62b655ccea
|
Merge pull request #592 from geeksville/dev
Dev
|
2020-12-25 15:51:14 +08:00 |
Kevin Hester
|
3c2aac87f7
|
better fix for screen messages in log
|
2020-12-25 15:39:42 +08:00 |
Kevin Hester
|
3aba097096
|
Merge branch 'dev' of https://github.com/geeksville/Meshtastic-esp32 into dev
|
2020-12-25 15:32:21 +08:00 |
Kevin Hester
|
f45451ca74
|
missing line term
|
2020-12-25 15:31:17 +08:00 |
Kevin Hester
|
c35fec9f20
|
Merge branch 'master' into dev
|
2020-12-25 15:23:54 +08:00 |
Kevin Hester
|
88fa24ce79
|
Merge branch 'dev' of https://github.com/geeksville/Meshtastic-esp32 into dev
|
2020-12-25 15:19:25 +08:00 |
Kevin Hester
|
59577b9d79
|
add real formatted debug logging with timestamps
|
2020-12-25 15:17:56 +08:00 |
Kevin Hester
|
c349ad62e7
|
we set randomSeed at boot so I think probably not good to do again
cool @mc-hamster?
|
2020-12-25 14:53:33 +08:00 |
Jm
|
d5b57840d9
|
checking in a little of the airtime so i can switch to the laptop.
|
2020-12-24 22:12:59 -08:00 |
Kevin Hester
|
f8a3d143cb
|
Merge pull request #591 from geeksville/dev
Dev
|
2020-12-25 14:04:50 +08:00 |
Kevin Hester
|
c717dfc33d
|
Merge branch 'master' into dev
|
2020-12-25 11:38:27 +08:00 |
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 |
Kevin Hester
|
c4b9d60afa
|
Merge remote-tracking branch 'root/master' into dev
|
2020-12-25 11:16:55 +08:00 |
Kevin Hester
|
dda5568e2c
|
update arduino lib & esp bins to fix #584
|
2020-12-25 11:14:00 +08:00 |
Kevin Hester
|
2d8e00e2a0
|
Merge pull request #589 from geeksville/dev
Dev
|
2020-12-25 10:23:47 +08:00 |
Kevin Hester
|
901ff6bb1e
|
bug #587 try to work with old (2.x?) versions of python
|
2020-12-25 10:16:49 +08:00 |
Kevin Hester
|
7312c56d6c
|
Merge remote-tracking branch 'root/master' into dev
# Conflicts:
# src/PowerFSM.cpp
|
2020-12-25 10:16:12 +08:00 |
Kevin Hester
|
031c58e21c
|
remove logspam that was busting serial api
|
2020-12-23 17:12:48 +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 |
Kevin Hester
|
89c76dca11
|
Merge pull request #579 from mc-hamster/master
Fix for #535 -- Heltec board stays asleep ...
|
2020-12-23 10:05:07 +08:00 |
Kevin Hester
|
2253ea1b41
|
Merge branch 'master' into master
|
2020-12-23 09:58:36 +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 |
Charles Crossan
|
8e0c224813
|
remove extra whitespace
|
2020-12-22 17:47:24 -05:00 |
Charles Crossan
|
5a96dc0083
|
move json delete endpoint
|
2020-12-22 17:44:40 -05:00 |
Jm Casler
|
181db06b0c
|
Merge branch 'master' into master
|
2020-12-21 19:59:40 -08:00 |
Charles Crossan
|
47ccfb6106
|
add HTTP/Delete method handler for SPIFFS
|
2020-12-21 21:10:53 -05: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 |
Charles Crossan
|
5c70f36aa5
|
add mime types for ico and svg
|
2020-12-21 17:42:55 -05:00 |
Tobias Schwarz
|
09cc0a85db
|
Merge pull request #1 from meshtastic/master
merge from original repository
|
2020-12-21 19:56:45 +01: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 |
Kevin Hester
|
a8d7700295
|
move more of is_router out of python and into the device code
|
2020-12-21 11:38:03 +08:00 |
Kevin Hester
|
412916ba7c
|
fix printf format for 64 bits
|
2020-12-21 11:13:30 +08:00 |
Kevin Hester
|
616290edcc
|
speed up build for my slow laptop
|
2020-12-21 11:13:16 +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 |
Charles Crossan
|
7f59e76c72
|
fix formatting
|
2020-12-20 21:47:46 -05:00 |
Charles Crossan
|
dcb9125b32
|
remove unused parser
|
2020-12-20 21:47:23 -05:00 |