sp9unb
/
meshtastic-firmware
sforkowany z mirror/meshtastic-firmware
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
1 877 Commity
8 Gałęzie
195 Tagi
44 MiB
Wykres commitów

1877 Commity (b75c7ad1797f5bb3a4845056cc38bf1a9c35a8cb)

Autor SHA1 Wiadomość Data
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
Kevin Hester 59ec87f5b0 oops tbeam was inheriting from arduino, it should inherit from esp32 2020-10-17 09:58:34 +08: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
Kevin Hester 05ca3c3d56 Update to work with my font size change 2020-10-17 08:44:04 +08: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
Kevin Hester d9dcb33576
Merge branch 'master' into dev-https 2020-10-16 17:05:06 -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
Kevin Hester 8505020be5 Merge branch 'dev' into ppr1 2020-10-16 17:03:30 +08:00
Kevin Hester f3b93d55fb oops fix for esp32 2020-10-16 17:03:04 +08:00
Kevin Hester 9e0731a956 Merge branch 'dev' into ppr1 2020-10-16 17:01:42 +08:00
Kevin Hester 2b373048c6 fix battery voltage sensing on NRF52 boards 2020-10-16 17:00:27 +08:00
Kevin Hester 22f23bb07d Merge branch 'dev' into ppr1 
# Conflicts:
#	src/gps/NMEAGPS.cpp
 2020-10-16 15:59:55 +08:00
Kevin Hester b32e3f1269
Merge pull request #479 from geeksville/dev 
minor eink things
 2020-10-15 23:44:15 -07:00
Kevin Hester 68ddb712f5 properly keep nrf52s from sleeping 2020-10-16 14:00:56 +08:00
Kevin Hester 2fb5cd8c1c work with more NMEA gps sentences 2020-10-16 14:00:17 +08:00
Kevin Hester 79aea8231f make screen positions less hardwired wrt font size 2020-10-16 11:22:07 +08:00
Kevin Hester b0837c10c6 eink display improvements 2020-10-16 10:53:55 +08: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
Kevin Hester 9134faaed1 turn off segger debug in ttgo eink build 2020-10-15 16:11:40 +08:00
Kevin Hester 649a120fe0 make eink screen look nicer 2020-10-15 15:56:38 +08:00
Kevin Hester 4db0c4a563 Make screen code resolution agnostic. Look better on big TFT/eink screens 2020-10-15 15:12:27 +08:00
Kevin Hester 5f2f3c94b9 PPR1 and allow boards to set lower or higher sx1262 power limits 2020-10-15 13:47:10 +08: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
Kevin Hester 152ebf0dff Merge branch 'dev' into ppr1 2020-10-14 10:24:39 +08:00
Kevin Hester 5b1511c930 ppr1 make jlink scripts 2020-10-14 10:21:55 +08:00
Kevin Hester 7ef2cc8623
Merge pull request #478 from geeksville/dev 
1.1.5
 2020-10-13 18:11:15 -07:00
Kevin Hester b41a32c6b6 1.1.5 2020-10-14 09:04:20 +08:00
Kevin Hester 1ebd7b0c3e make lightsleep default time 5 minutes, with 1 minute in for BLE syncing 2020-10-14 08:53:12 +08:00
Kevin Hester 5457541244 fix #477: sleep behavior was broken in app due to device bug since 1.1.1 
+        // NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior.
+        // So even if we internally use 0 to represent 'use default' we still need to send the value we are
+        // using to the app (so that even old phone apps work with new device loads).
 2020-10-14 08:45:29 +08:00
Kevin Hester ca77d48b20 corvus2 gps still doesn't work WIP 2020-10-13 14:43:28 +08:00
Kevin Hester 965c2bda8d corvus2 board builds 2020-10-13 13:59:06 +08: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