Commit Graph

2488 Commits

Author SHA1 Message Date
Jm Casler
4f10ab8d04 Little update to #934
updated lastGpsSend
2021-12-01 17:24:01 -08:00
Solanaceae
ab0a06e536 Raising currentLimit for SX1262 2021-11-30 17:56:19 -07:00
Ben Meadors
2a617ba7b2 Upstream proto addition 2021-11-29 10:05:32 -06:00
Ben Meadors
bbf3091889
Merge branch 'master' into master 2021-11-29 09:58:16 -06:00
Ben Meadors
99d35b175c Merge remote-tracking branch 'upstream/master' 2021-11-29 07:02:56 -06:00
Jm Casler
98d0907f4d
Merge branch 'master' into issue-919 2021-11-28 22:36:41 -08:00
Jm Casler
623b846713 Fix for: Wifi admin mode no longer works #939
Fix for: Wifi admin mode no longer works #939
2021-11-28 21:56:34 -08:00
Jm Casler
e791a5aa2f
Merge branch 'master' into issue-919 2021-11-28 20:13:56 -08:00
Jm Casler
d5506bb33c Cleanup (Comments & Formatting) of S&F and PrositionPlugin.cpp 2021-11-28 19:41:34 -08:00
Jm Casler
937f67c4ec Check in partial work on S&F 2021-11-28 19:34:35 -08:00
Jm Casler
3ed4a1e3e1
Merge branch 'master' into StoreAndForward 2021-11-28 19:31:49 -08:00
Jm Casler
d7315778d6 Generated protos for S&F 2021-11-28 19:25:50 -08:00
Ben Meadors
69a2029ade
Removed unnecessary debug print 2021-11-27 09:29:39 -06:00
Ben Meadors
7a649e3fc3 Regen protobufs from upstream 2021-11-27 09:16:26 -06:00
Ben Meadors
f019151e3f auto_screen_carousel_secs behavior implementation 2021-11-27 09:11:58 -06:00
Jm Casler
88fd671880 Tweaking values of Smart Position #934
Tweaking values of Smart Position #934
2021-11-26 21:26:36 -08:00
Jm Casler
d72c091ead
Merge branch 'master' into issue-927 2021-11-26 19:50:40 -08:00
Jm Casler
3ec508169a Implementation of smart positioning #934
Initial check in for https://github.com/meshtastic/Meshtastic-device/issues/934
2021-11-26 19:12:00 -08:00
Jm Casler
f6fde55363 Update protobufs with the latest from meshtastic-protobufs 2021-11-26 18:25:08 -08:00
Sacha Weatherstone
bc311ac9f6
Merge branch 'master' into issue-927 2021-11-27 08:59:22 +11:00
Ryan Tolboom
c5f210384f add SSL notification at boot 2021-11-26 15:09:16 -05:00
Joar Svensson
d685682dd9 Define battery pin 2021-11-26 13:28:20 +01:00
Ryan Tolboom
a0d829a91e
Merge branch 'master' into issue-919 2021-11-23 13:36:09 -05:00
Ryan Tolboom
e3ee3c411c
Merge branch 'master' into issue-919 2021-11-22 23:08:06 -05:00
Jm Casler
d3e1bbf355
Merge branch 'master' into ignore-phone-messages-screen 2021-11-22 19:46:55 -08:00
Jm Casler
a5727052bc
Merge branch 'master' into llcc68 2021-11-22 19:25:52 -08:00
Jm Casler
083518c127
Merge branch 'master' into ignore-phone-messages-screen 2021-11-22 19:23:42 -08:00
Ryan Tolboom
c36b233c49 ACK retried want_ack packets 2021-11-22 21:31:12 -05:00
Jm Casler
9ddcc5d2ed S&F Pre-Alpha. Functional. No crashes (I hope). 2021-11-22 17:47:42 -08:00
Jm Casler
a3ce728e26 Move SerialPlugin to plugins/esp32 2021-11-22 13:18:49 -08:00
Jm Casler
cf0d9a2c86
Merge pull request #91 from mc-hamster/master
Move Serial Plugin to new location
2021-11-22 13:17:01 -08:00
Jm Casler
ec7953ccf0
Rename src/plugins/SerialPlugin.h to src/plugins/esp32/SerialPlugin.h 2021-11-22 13:15:50 -08:00
Jm Casler
44a4bde626
Rename src/plugins/SerialPlugin.cpp to src/plugins/esp32/SerialPlugin.cpp 2021-11-22 13:15:36 -08:00
Ben Meadors
5db0a57599 Ignore messages originating from phone on screen 2021-11-21 18:44:08 -06:00
Jm Casler
834f2f4160 Updates to S&F (this one doesn't work) 2021-11-21 14:43:47 -08:00
Jm Casler
4367f05b24 Applied code formatters. 2021-11-20 21:57:21 -08:00
Jm Casler
97aec5f125 Remove comments from SF 2021-11-20 21:35:13 -08:00
Jm Casler
5191fd6475 Initial demonstrable build 2021-11-20 21:21:11 -08:00
Jm Casler
32017e53f5 Formatting applied 2021-11-18 09:36:39 -08:00
Jm Casler
37aab8a42b Able to store and forward, but packets are corrupt 2021-11-18 09:35:05 -08:00
Vladislav Osmanov
bfa0307231 LLCC68 doesn't support SF12 neither the "Long Slow" channel 2021-11-18 14:46:04 +03:00
Vladislav Osmanov
8eb0d685ac [LLCC68] module support 2021-11-17 13:28:08 +03:00
Ben Meadors
2d939d26ee Renamed to is_always_powered for convention 2021-11-06 12:11:22 -05:00
Ben Meadors
d6c7ea921a Added always_powered preference 2021-11-06 10:03:10 -05:00
a-f-G-U-C
8115ee0c97
set Team field via Admin plugin 2021-11-02 13:27:56 +00:00
Solanaceae
d5e4ceebcc Small fix for using 62.5Khz bandwidth setting. 2021-11-01 02:31:53 -07:00
Sacha Weatherstone
2c5ba29648
Merge branch 'master' into owner-update 2021-10-30 10:13:10 +11:00
a-f-G-U-C
5ef9414a25
fix owner name update issue (off #900) 2021-10-29 13:28:48 +00:00
a-f-G-U-C
2ebed9cb6c
update protobufs to 61bc1d0 2021-10-29 13:13:26 +00:00
a-f-G-U-C
7a1409c42a
Merge branch 'master' into ublox-filter-dop-fix 2021-10-28 13:03:01 +00:00
a-f-G-U-C
a911515dec
clean up old data during fix transition 2021-10-28 11:58:08 +00:00
a-f-G-U-C
7ecb36dbe7
Merge branch 'meshtastic:master' into ublox-filter-dop-fix 2021-10-28 11:56:11 +00:00
a-f-G-U-C
d4ea18851d
update for RX_SRC_USER 2021-10-28 11:33:32 +00:00
a-f-G-U-C
646d1caf66
updatePosition process time-only message 2021-10-28 11:31:19 +00:00
a-f-G-U-C
74c138620a
revert sanity check from PR 898 2021-10-28 11:25:45 +00:00
Jm Casler
3981d2e1f6
Fix for #874 - RangeTest Plugin header fields swapped for elevation and SNR (#904)
Fix for #874 - RangeTest Plugin header fields swapped for elevation and SNR
2021-10-28 15:46:20 +11:00
Kevin Hester
e2992cd3b9
Merge branch 'master' into ublox-filter-dop-fix 2021-10-28 10:41:03 +08:00
a-f-G-U-C
e89b3bd1ec
implement fix2d and max DOP user settings 2021-10-27 13:30:39 +00:00
a-f-G-U-C
da9dd62a33
add the user as distinct message source 2021-10-27 13:16:51 +00:00
Sacha Weatherstone
0133a1b293
Merge branch 'master' into feature/environmental-ds18b20-sensor-support 2021-10-27 10:23:40 +11:00
Sacha Weatherstone
6d778cdda4
Merge branch 'master' into inpos-selfrej-nicelog 2021-10-27 06:42:13 +11:00
a-f-G-U-C
24b2fd2657
better sanity check, logging of inbound positions 2021-10-26 12:41:44 +00:00
a-f-G-U-C
b74c2da530
implement RX_SRC_LOCAL, Position in updatePosition 2021-10-26 12:22:34 +00:00
Kevin Hester
26415cf8e0
Merge branch 'master' into feature/environmental-ds18b20-sensor-support 2021-10-26 02:36:50 +08:00
a-f-G-U-C
ef1d52ca04
update log message, sanity check 2021-10-24 13:02:31 +00:00
a-f-G-U-C
f69c8dddad
update MeshService to use Position struct 2021-10-24 12:48:48 +00:00
a-f-G-U-C
70b80e600d
use Position struct for GPS data 2021-10-24 12:38:35 +00:00
Joar Svensson
90d95d8e98
Merge branch 'master' into feature/environmental-ds18b20-sensor-support 2021-10-24 11:36:10 +02:00
a-f-G-U-C
7d267e8027
update GPSStatus to use Position struct atomically (#885) 2021-10-24 11:36:18 +11:00
a-f-G-U-C
0d884d159a
implement position packet optional fields (#892) 2021-10-24 11:10:36 +11:00
a-f-G-U-C
3893810b76
fix a positional timestamp reading bug (#886)
* fix a positional timestamp reading bug

* lying about fixType is no longer required
2021-10-24 10:31:44 +11:00
Joar Svensson
fff4735a15 Add support for DS18B20 temperature sensor 2021-10-23 21:10:25 +02:00
a-f-G-U-C
a914ee133c
fix a rare GPS data corruption condition (#890)
* fix a rare GPS data corruption condition

* don't use hasLock to determine validity
2021-10-23 14:21:59 +11:00
a-f-G-U-C
d0fb363422
discriminate local/remote node position updates (#889) 2021-10-23 12:58:56 +11:00
a-f-G-U-C
992bbe76d7
add backward compatible position flag defaults (#884) 2021-10-23 12:12:53 +11:00
syund
6fc3c9c868
Inline pow_neg - removes build warning (#891) 2021-10-23 11:40:43 +11:00
Kevin Hester
d54dad4225 update protobufs 2021-10-15 10:21:42 -07:00
Kevin Hester
c597cd4a17 regen protos 2021-10-15 10:21:42 -07:00
Kevin Hester
0a529dcaac
Merge branch 'master' into meshtastic-diy 2021-10-12 23:18:17 +08:00
Vladislav Osmanov
87ef15d371
Merge branch 'master' into meshtastic-diy 2021-10-12 15:23:30 +03:00
Kevin Hester
9679861b56
Merge branch 'master' into master 2021-10-12 11:58:52 +08:00
Kevin Hester
3d197d732c
Merge branch 'master' into fix-plugin-return-type 2021-10-12 09:15:34 +08:00
Kevin Hester
5d6fc6d63e
Merge branch 'master' into master 2021-10-12 09:14:18 +08:00
Kevin Hester
31e833ec59
Merge branch 'master' into master 2021-10-12 08:53:14 +08:00
Kevin Hester
89cd3fd73a
Merge branch 'master' into 875-Create-geo-coordinates-class 2021-10-12 08:34:03 +08:00
Sacha Weatherstone
5c0a76ae46 Reverte seperate Generate204 function 2021-10-11 12:27:10 +11:00
Sacha Weatherstone
14e36f0a2b Web server changes to support frontend 2021-10-11 00:11:04 +11:00
Sam
96f4998d11 Add functionality for converting lat lon to bearing range and back 2021-10-09 15:03:21 -04:00
Sam
4a98bdd9d6 Move bearing under GeoCoord 2021-10-09 13:31:27 -04:00
Sam
796e8c836a Move latLongtoMeter under GeoCoord 2021-10-09 13:28:51 -04:00
Sam
7081868143 Spelling fixes. Thanks a-f-G-U-C! 2021-10-09 13:17:23 -04:00
a-f-G-U-C
1e455ac4c3
issue 879 - add opt-in flag for plugins 2021-10-09 14:02:21 +00:00
a-f-G-U-C
5eb2e6401f
issue 879 - changes to Router.cpp 2021-10-09 13:54:42 +00:00
a-f-G-U-C
ee9c72b8c7
issue 879 - define source types 2021-10-09 13:48:30 +00:00
Vladislav Osmanov
92edfd3217 fix: GPS RX/TX pins mismatch 2021-10-08 21:17:05 +03:00
Sam
aa936ade7e Use geoCoord object to draw altitude 2021-10-03 16:01:41 -04:00
Sam
bf695a5f36 Use GeoCoord class in Screen.cpp 2021-10-03 15:52:46 -04:00
Sam
91bc051e6d Create GeoCoord class 2021-10-03 15:52:09 -04:00
Vladislav Osmanov
bc7d1a4ef0 redefine GPS TX pin for DIY schematic 2021-09-25 00:28:01 +03:00
Vladislav Osmanov
debae67ae7 Plugins refactoring: handleReceived return enumeration ProcessMessage
Use `ProcessMessage::CONTINUE` to allows other modules to process a message.
Use `ProcessMessage::STOP` to stop further message processing.
2021-09-23 04:42:09 +03:00
claes
28e851c3fd Low battery level counter for NRF52
Added a counter that counts low battery level detections.
If there are 4 in a row we go to deep sleep.
The battery sense on the RAK4631 seems to be a bit unstable and may
generate  'false' low voltage readings.
My RAK4631 has been running for 7 days now with this fix.
It did 3 days without it.
I still do not have a T-Echo so on that board IT IS NOT TESTED.
(But I hope it will improve things there too)
2021-09-19 16:00:10 +02:00
Vladislav Osmanov
e3d9b94367 New device board - [Meshtastic DIY v1] by @NanoVHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
Subproject reference: https://github.com/NanoVHF/Meshtastic-DIY
2021-09-19 16:05:21 +03:00
Kevin Hester
a1b37d3407
Merge branch 'master' into HAE-MSL-banner 2021-09-18 15:59:54 -07:00
Kevin Hester
d54fecca4e
Merge branch 'master' into sanitize-course-value 2021-09-18 15:38:00 -07:00
Kevin Hester
b3012b7ee5
Merge branch 'master' into Show-fixed-GPS-coordinates-on-screen 2021-09-18 14:44:10 -07:00
Vladislav Osmanov
16d2c565e8 Use EU433 frequency value as default for SX1268 2021-09-18 21:39:29 +03:00
Sam
a74f038cba [866] Show fixed coordinates on screen and indicate when using fixed coordinates. 2021-09-15 18:58:09 -04:00
Vladislav Osmanov
bd9bf585d3 save channel & freq before outputting them for debugging
The frequency could be overridden in `RadioInterface::getFreq()` for some modules.
2021-09-15 12:09:11 +03:00
Vladislav Osmanov
56dd3eab23 use common param name SX126X_ANT_SW instead of the SX1262_ANT_SW 2021-09-14 12:25:25 +03:00
Vladislav Osmanov
cb42440963 fix module frequency overriding
The `RadioInterface::freq` member was encapsulated with the `RadioInterface::getFreq()` function,
which could be overridden in child classes for some LoRa-modules.
2021-09-13 22:13:51 +03:00
Vladislav Osmanov
da61090dc5 fix: need to check USE_SX1262 and USE_SX1268 as they are using the same pinouts 2021-09-12 13:58:56 +03:00
Vladislav Osmanov
098f38fb83 New base class for SX126x modules. Added new SX1268 module support. 2021-09-12 00:35:16 +03:00
a-f-G-U-C
c442fd3886
input sanitization - TinyGPS course()
Reduce the impact of issue #863 (and similar issues in the future) by filtering out obvious bogons
2021-09-10 15:12:12 +00:00
Vladislav Osmanov
00bf7879af SX1268 frequency initialization regardless of the region
Otherwise, we get critical error 3 with result code -12 (ERR_INVALID_FREQUENCY):
The supplied frequency value is invalid for this module.
2021-09-09 23:55:36 +03:00
Vladislav Osmanov
2ba68c9b6e added SX1268 module adapter 2021-09-09 23:55:36 +03:00
a-f-G-U-C
a2f06cb077
Display HAE/MSL mode on startup 2021-09-09 14:12:37 +00:00
Kevin Hester
e351f35cf2
Merge branch 'master' into radiolib-sync-upstream 2021-09-08 14:08:25 -07:00
a-f-G-U-C
de712ce41a
disable debug code 2021-09-08 14:26:21 +00:00
a-f-G-U-C
f6f9b9cd03
fixes from PR #851, #858 ported to NMEA GPS
apply fixes and upgrades from PR #851, #858 to NMEA GPS code
2021-09-08 14:02:13 +00:00
Vladislav Osmanov
1a671f2877 override new RadioLib's default current limit value (60 mA) to the previous value of 100mA 2021-09-08 14:30:52 +03:00
a-f-G-U-C
1c06c2af9f
read lat/lon/alt into temp vars instead of global
Instead of reading the GPS solution directly into global variables and risking a bad-over-good overwrite (issue #857), read it into temporary vars and only update global vars after validation.
Also updates positional timestamp variable and prepares (non-breaking) for HAE altitude support (issue #359)
2021-09-05 17:11:04 +00:00
a-f-G-U-C
eb27e744f7
add positional timestamp and geoidal separation
Relevant to issues #842 and #843 (timestamp) and historical issues #392 and #359 (timestamp, geoidal)
2021-09-05 15:10:06 +00:00
Kevin Hester
c8269d67c3
Merge branch 'master' into radiolib-sync-upstream 2021-09-04 18:07:55 -07:00
Kevin Hester
ccb4596299
Merge branch 'master' into radiolib-sync-upstream 2021-09-04 17:35:34 -07:00
Kevin Hester
2741de90e5
Merge branch 'master' into virtual-haslock 2021-09-04 17:34:41 -07:00
srichs
72e22b6744 Added OLC and OS grid ref protobufs 2021-09-04 01:31:29 -06:00
srichs
030d09740c Merge branch 'gps-coordinate-formats' of https://github.com/srichs/Meshtastic-device into gps-coordinate-formats 2021-09-04 01:19:32 -06:00
srichs
d381f091e9 Added OLC and OS grid ref, adjusted DMS display 2021-09-03 23:19:47 -06:00
a-f-G-U-C
5cf1a87657
redefine hasLock() for UBlox GPS 2021-09-02 13:21:48 +00:00
a-f-G-U-C
25841c072a
allow GPS modules to redefine GPS::hasLock() 2021-09-02 13:11:11 +00:00
Vladislav Osmanov
f40bd0745c The argument currentLimit was removed from the begin method
More info: jgromes/RadioLib@e1141ca#diff-507c32190e4a29ffe411c8eab06c75b594c5d2a5fd92e5cb703b787e5f019589L568
2021-09-02 16:10:45 +03:00
Vladislav Osmanov
fe3afaab3d Reflecting changes from upstream RadioLib in https://github.com/osmanovv/RadioLib/tree/upstream-merge
(252fe74d53)

The argument `currentLimit` was removed from the `begin` method:
e1141ca64c (diff-507c32190e4a29ffe411c8eab06c75b594c5d2a5fd92e5cb703b787e5f019589L568)
2021-09-02 16:10:44 +03:00
Kevin Hester
f96d8bf645
Merge branch 'master' into a-f-G-U-C-ublox-power 2021-09-01 10:21:50 -07:00
srichs
29124c3416 Adjusted formatting for DMS 2021-08-30 19:23:50 -06:00
a-f-G-U-C
71951a4e6a
fix a typo 2021-08-30 13:55:50 +00:00
a-f-G-U-C
8dbfd0f19b
disable gps powercycle for small gps_update_interval 2021-08-30 13:45:42 +00:00
srichs
5c6355489f Changed gps coordinate formats to use sprintf() 2021-08-30 04:42:14 -06:00
srichs
8edac1f86c Added different gps coordinate formats for OLED 2021-08-30 01:17:18 -06:00
Kevin Hester
eaa15076cd WIP debug logging over TCP 2021-08-18 10:31:30 -07:00
Kevin Hester
2fd74d8f47 cleanup ssl cert generation 2021-08-17 20:40:46 -07:00
Kevin Hester
0e91d39b27 don't shutdown bluetooth if we didn't start it 2021-08-17 20:40:13 -07:00
Kevin Hester
52d7a6b8e4 immediately reconnect to mqtt server on wifi reconnect 2021-08-17 19:59:56 -07:00
Kevin Hester
472e880280 fix race condition when starting web service 2021-08-17 17:04:09 -07:00
Kevin Hester
189889489b disable bluetooth while using wifi (esp32 drops networks otherwise) 2021-08-17 16:58:21 -07:00
Kevin Hester
0d758347af Fix rare assertion failure which could occur due to pending interrupts
* fix assertion failure
```
22:57:36 64409 [PositionPlugin] FIXME-update-db Sniffing packet
22:57:36 64409 [PositionPlugin] Delivering rx packet (id=0x5851f437 Fr0xa1 To0xff, WantAck0, HopLim3 Ch0x0 Portnum=3 rxtime=1628895456 priority=10)
22:57:36 64409 [PositionPlugin] Forwarding to phone (id=0x5851f437 Fr0xa1 To0xff, WantAck0, HopLim3 Ch0x0 Portnum=3 rxtime=1628895456 priority=10)
22:57:36 64409 [PositionPlugin] Update DB node 0x85f4da1, rx_time=1628895456
22:57:36 64409 [PositionPlugin] Plugin routing considered
22:57:36 64409 [PositionPlugin] Add packet record (id=0x5851f437 Fr0xa1 To0xff, WantAck0, HopLim3 Ch0x0 Portnum=3 rxtime=1628895456 priority=10)
22:57:36 64409 [PositionPlugin] Expanding short PSK #1
22:57:36 64409 [PositionPlugin] Installing AES128 key!
22:57:36 64409 [PositionPlugin] enqueuing for send (id=0x5851f437 Fr0xa1 To0xff, WantAck0, HopLim3 Ch0xb1 encrypted rxtime=1628895456 priority=10)
22:57:36 64409 [PositionPlugin] (bw=125, sf=12, cr=4/8) packet symLen=32 ms, payloadSize=22, time 2596 ms
22:57:36 64409 [PositionPlugin] txGood=6,rxGood=10,rxBad=0
22:57:36 64409 [PositionPlugin] AirTime - Packet transmitted : 2596ms
22:57:36 64409 [RadioIf] assert failed src/mesh/RadioLibInterface.cpp: 240, void RadioLibInterface::handleReceiveInterrupt(), test=isReceiving
```
2021-08-17 16:31:01 -07:00
Kevin Hester
b04e313665 minor debug output 2021-08-15 10:34:57 -07:00
Kevin Hester
700e799125 check our host PC using the new nrf52 api 2021-08-12 22:07:30 -07:00
Kevin Hester
a9f8080ee7 cope with race on available() vs read() found while looking at #838 2021-08-12 22:06:51 -07:00
Kevin Hester
388f19da79
Merge branch 'master' into master 2021-08-12 16:32:52 -07:00
Kevin Hester
bcb54b643f
Merge branch 'master' into dev 2021-08-12 16:09:30 -07:00
Kevin Hester
04d3f44179 Updates to work with latest adafruit nrf52 arduino 2021-08-12 15:50:54 -07:00
claes
5110a6de82 Battery sense for T-Echo
Copied battery stuff from RAK4631 to T-Echo
I got the voltage divider figures for T_Echo from SoftRF at
https://github.com/lyusupov/SoftRF/blob/master/software/firmware/source/SoftRF/src/platform/nRF52.h

I dont have a T-Echo so this code
HAS NOT BEEN TESTED
2021-08-10 10:07:40 +02:00
claes
04c5ac0d7c Voltage and sleep fix for NRF52
Dont let the NRF52 go to SDS Super Deep Sleep
Show bat percentage on NRF52 when above 4210 mV
2021-08-10 09:23:26 +02:00
Kevin Hester
6d2cd73599 show a max of four node screens in the scrolling list 2021-08-04 09:10:34 -07:00
Kevin Hester
057b04a88a treat RECEIVED_PACKET like PACKET_FOR_PHONE 2021-08-02 22:07:39 -07:00
Kevin Hester
28af18389b If MQTT connected don't let the board enter LS state 2021-08-02 21:34:14 -07:00
Kevin Hester
2af4c619e1 fix #801 (I think) we were sometimes dropping packets in light sleep
Because of failure to enter the NB state packets were not getting queued
for sending.
2021-08-02 21:07:32 -07:00
Kevin Hester
99d529be51 While connected to MQTT server, veto light-sleep (to keep wifi working) 2021-08-02 17:42:44 -07:00
Kevin Hester
39df7108a8 fix wifi hang when bad password used, cleanup wifi in general 2021-08-02 11:28:57 -07:00
Kevin Hester
72807f0fa0 CSE to cleanup mqtt addr setting 2021-08-02 10:50:55 -07:00
Kevin Hester
2fe11d4fe8 don't break strict-aliasing rules 2021-08-02 10:50:28 -07:00
Kevin Hester
596befff74 Fix invalid heap reference fixed by @flux242 2021-08-02 10:41:31 -07:00
Kevin Hester
5f323e8bd1 fix leakage of wifi password reported by @vodkin 2021-08-01 12:58:23 -07:00
Kevin Hester
d40b66beac Allow plugins to write to the parsed protobuf (minimizes copies in some cases) 2021-08-01 12:58:23 -07:00
Dmitrii Eliuseev
afa12d6e87 USE_SH1106 error fix
Fix for USE_SH1106 compilation error
2021-08-01 20:15:02 +02:00
Audun Foyen
bf0b598908 Include <algorithm> - required for 'lower_bound' 2021-07-31 21:56:31 +02:00
Audun Foyen
8a79663fa0 Drop lower priority packets when tx queue is full.
Track packet pointers in vector. Priority maintained using: push_heap, pop_heap, make_heap, and sort_heap.
2021-07-31 21:42:48 +02:00
Kevin Hester
810740b156
Merge branch 'master' into issue-108 2021-07-26 04:31:05 +08:00
Kevin Hester
5826c52242
Merge branch 'master' into issue-108 2021-07-26 04:23:33 +08:00
Kevin Hester
a6904105f7
Merge branch 'master' into patch-1 2021-07-26 04:08:08 +08:00
claes
32fea4cbd7 Fix for reading battery level on RAK-4631
Build tested on RAK4631 with battery and their solar panel box.
This is from the log:
17:40:30 102 [Power] Battery: usbPower=0, isCharging=0, batMv=4164, batPct=96
Note that mV reading and Pct is ok.
It does not detect being connected to USB and charging.

Also tested on TBEAM where it seems to be ok.

There still seems to be a problem with the FW for this board that it goes to
sleep for ever after running for a few hours.
2021-07-25 18:25:11 +02:00
Audun Foyen
986d44873a Issue-108. Track recent packets in unordered_set
Check individual packets seen recently for expiry - and purge.
Otherwise - only scan all of recentPackets for expired once
fill > 75% (of MAX_NUM_NODES).
2021-07-20 21:19:35 +02:00
Ben Meadors
035f25190b
Handle MQTT host string with port omitted 2021-07-02 07:47:12 -05:00
Ben Meadors
3ea03dadb5
Convert MQTT server to hostname:port 2021-07-01 16:57:50 -05:00
Kevin Hester
301f196bca fix rotation for ttgo t-echo case 2021-07-01 08:49:49 -07:00
Kevin Hester
fc9fc1ee6f 1.2.41 t-echo final build 2021-06-27 12:29:48 -07:00
Kevin Hester
659286f738 WIP new adafruit eink display lib at least starts 2021-06-27 11:41:39 -07:00
Kevin Hester
17a1262382 pull in new epaper lib (which required importing configuration.h everywhere
for dumb reasons)
2021-06-27 10:56:28 -07:00
Kevin Hester
5c4d1a88a8 update protos 2021-05-29 13:19:27 +08:00
Kevin Hester
e7e09cb7ed fix wifistubs to not be on esp32 2021-05-26 10:20:44 +08:00
Kevin Hester
29ff778e22 fix #811 nodes rebooting due to invalid printf call, thanks @IZ1IVA
Ouch, this was nasty - printf format string wasn't matching the parameters
passed in causing a NPE due to a missing last param.

I'll investigate why printf format strings were
not being checked by the compiler (normally gcc offers that feature)
2021-05-26 10:00:23 +08:00
Kevin Hester
abe95ae1a4 most of the changes needed to build native on Windows 2021-05-25 05:08:57 +08:00
Kevin Hester
4e8e85c9f1 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device into windev
# Conflicts:
#	geeksville-private/windows-build-instructions.md
#	src/graphics/Screen.h
2021-05-25 03:43:47 +08:00
Kevin Hester
26bb4ffe79 windows build wip 2021-05-25 03:38:06 +08:00
Kevin Hester
a8feb40ae9 cleanup 2021-05-24 09:42:25 +08:00
Kevin Hester
be410a3913 Fix #807 TCP API on ESP32. thanks @jfirwin your hint made the problem easy to find! 2021-05-24 09:42:21 +08:00
Kevin Hester
069b0d38be Fix wifi to allow usage with unsecured networks 2021-05-24 09:21:52 +08:00
Kevin Hester
70b0a73572 Split native build into a cross-platform target vs a linux only target 2021-05-23 17:57:20 +08:00
Kevin Hester
7f2bbcd95e fix debug spam for api calls (possibly corrupting protocol) 2021-05-23 12:07:28 +08:00
Kevin Hester
68cb62ab23 auto probe for pinelora devices 2021-05-23 12:00:54 +08:00
Kevin Hester
5a3ff137f9 Cope with missing portuino hardware 2021-05-23 11:46:57 +08:00
Kevin Hester
7f51517961 better support for heltec 2021-05-11 09:44:41 +08:00
Kevin Hester
7475e3c105 give more margin for heltec no battery voltage 2021-05-09 10:31:42 +08:00
Kevin Hester
80e4bc6289 fix nrf52 build 2021-05-03 15:58:35 +08:00
Kevin Hester
bc76c79e1e oops my latest change busted android connection detection 2021-05-03 15:37:37 +08:00
Kevin Hester
d179bda728 serious bug: connection to phones not being properly tracked 2021-05-03 14:46:30 +08:00
Kevin Hester
e60ef655cb fix serious bug! plugin was incorrectly stopping packet processing 2021-05-03 10:53:24 +08:00
Kevin Hester
c15204fed1 better debug output 2021-05-03 10:53:06 +08:00
Kevin Hester
218d841511 use short version string on bootscreen 2021-05-03 09:50:06 +08:00
Kevin Hester
f40c6f21d4 fix portduino rtc 2021-05-03 09:30:03 +08:00
Kevin Hester
6dc4471bec fix serious bug! don't send NO-RESPONSE NAKs for messages sent by local node 2021-05-03 08:45:32 +08:00
Kevin Hester
4c1b7d4840 pinelora WIP 2021-05-01 11:27:37 +08:00
Kevin Hester
babc1b3613 include file/lineno in critical error logs 2021-04-29 09:52:15 +08:00
Kevin Hester
c27d479a9f t-echo: add hwmodel 2021-04-29 09:51:10 +08:00
Kevin Hester
b95baadb9a fix USB power detection for analog battery sensors (t-echo and possibly heltec/t-lora32) 2021-04-28 15:30:02 +08:00
Kevin Hester
28b7bd347a Fix nrf52 USB (don't call delay() in loop() if connected via usb) 2021-04-28 15:11:55 +08:00
Kevin Hester
a42bb80cf4 pinelora wip 2021-04-28 14:47:29 +08:00
Kevin Hester
9c94a324e5 use real gpios for pinelora 2021-04-27 10:04:02 +08:00
Kevin Hester
a66ad8a9d9 pinelora WIP 2021-04-22 17:48:20 +08:00
Kevin Hester
8e3281a658 pinelora WIP 2021-04-22 14:28:56 +08:00
Kevin Hester
6e27856daa pinelora WIP 2021-04-22 08:49:05 +08:00
Kevin Hester
c4878671e3 add codespace support 2021-04-21 18:00:34 +08:00
Kevin Hester
405f7e0caa Fix integration test found by CI! verstr field was too short 2021-04-16 11:51:04 +08:00
Kevin Hester
55b38a7b02 RAK4631 is almost feature complete 2021-04-12 13:25:55 +08:00
Kevin Hester
7224782d23 rak4631: gps now works 2021-04-11 15:17:56 +08:00
Kevin Hester
bfdc05154b fix redundant segger init 2021-04-11 13:53:18 +08:00
Kevin Hester
f9a58b9dd1 lower brownout threshold to 1.7V 2021-04-11 13:52:39 +08:00
Kevin Hester
a43a04986d document peer_info 2021-04-11 09:24:36 +08:00
Kevin Hester
73384c5ac6 mqtt: don't downlink messages from us. 2021-04-11 09:23:34 +08:00
Kevin Hester
a39ba30a70 mqtt: fix downlink check 2021-04-10 11:57:20 +08:00
Kevin Hester
5e87ee338d add is_licensed for ham users 2021-04-10 11:39:13 +08:00
Kevin Hester
e71758457b use production mqtt server 2021-04-10 10:55:56 +08:00
Kevin Hester
5dfd387b21 use real MQTT server DNS name 2021-04-09 16:56:28 +08:00
Kevin Hester
cec905914c Fix GPIO service and cleanup response handling 2021-04-06 10:34:23 +08:00
Kevin Hester
c0cfd0bb41 remove dead code 2021-04-05 16:27:52 +08:00
Kevin Hester
7abc3534c4 fix build for !wifi devices 2021-04-05 13:00:56 +08:00
Kevin Hester
7f5ab472b9 mqtt: downlink now works 2021-04-05 09:38:00 +08:00
Kevin Hester
a845406a19 cleanup packet encrypt/descrypt 2021-04-05 09:24:00 +08:00
Kevin Hester
8ef36bcc9c note about security 2021-04-05 08:56:11 +08:00
Kevin Hester
3cd64bb8b5 allow passing even encrypted packets through the plugins 2021-04-05 08:44:47 +08:00
Kevin Hester
50a69d77e6 mqtt: begin subscription support 2021-04-05 08:42:52 +08:00
Kevin Hester
55b8314a2a mqtt: only publish uplink_enabled channels 2021-04-05 07:57:06 +08:00
Kevin Hester
e84edc676f mqtt: automatically start or stop as neede & attempt reconnect 2021-04-05 07:53:07 +08:00
Kevin Hester
d19af8b83d mqtt: send packets after they are encrypted 2021-04-04 09:20:37 +08:00
Kevin Hester
638cec7f25 we now send packets to mqtt server 2021-04-03 22:27:06 +08:00
Kevin Hester
f3f09f0dcf MQTT WIP 2021-04-03 16:06:40 +08:00
Kevin Hester
8890ca759d fix nodeid 2021-04-03 15:04:03 +08:00
Kevin Hester
139da372e7 fix warning 2021-04-03 14:56:46 +08:00
Kevin Hester
dcf64dfacd MQTT at least talks to server, works in native and esp32 2021-04-03 14:54:10 +08:00
Kevin Hester
c798c0032c add frequency_offset 2021-04-02 09:14:12 +08:00
Kevin Hester
efd39c0f49 someone made a boo-boo adding "serial_disabled", caused a nasty NPE 2021-03-31 11:26:00 +08:00
Kevin Hester
5f45a10db5 fix sign comparsion 2021-03-31 11:14:55 +08:00
Kevin Hester
88716fc352 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-31 09:14:43 +08:00
Kevin Hester
b68397a911 fix simradio init to work more like real radios 2021-03-30 23:39:51 +08:00
Kevin Hester
5fdcb72d46 cleanup applyModemConfig based on porduino testing, share with sim 2021-03-30 23:34:13 +08:00
Kevin Hester
b70a359fe8 leave phone timeout off a bit longer 2021-03-30 23:11:56 +08:00
Kevin Hester
a9c8564524 fix millisecond unsigned rollover errors found via portduino 2021-03-30 23:11:33 +08:00
Jm
d8669f860a Update fo #638 - Redid protobuf generation 2021-03-29 17:33:37 -07:00
Jm
2f8e663f03 Add serial_disabled for #638 2021-03-29 17:08:56 -07:00
Kevin Hester
cdb4756d9d fix native build 2021-03-29 20:56:02 +08:00
Kevin Hester
525fe9b96c dramatically speed up message RX in some cases (we were sleeping much too long) 2021-03-28 12:16:37 +08:00
Kevin Hester
c7f411fc7c remove unused Preferences code (cc @mc-hamster for review)
(noticed because of a compiler warning)
2021-03-28 12:07:43 +08:00
Kevin Hester
fc96500329 fix unused prefs field 2021-03-28 12:06:16 +08:00
Kevin Hester
4e87c4411c fix serious nak bug reported by @havealoha and @luxoon 2021-03-28 11:44:19 +08:00
Kevin Hester
76269b397f Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/esp32/main-esp32.cpp
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
2021-03-27 16:44:42 +08:00
Jm
57c82988e2 #669 - Add restart counter 2021-03-27 01:20:07 -07:00
Kevin Hester
1e3b037fea populate position.time for broadcast positions 2021-03-27 16:17:01 +08:00
Jm
4f4cdf4f9e #669 Add restart counter 2021-03-27 01:00:27 -07:00
Kevin Hester
78f2c656d0 fix nrf52 builds 2021-03-27 11:21:43 +08:00
Kevin Hester
37ec969f96 Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/mesh/NodeDB.cpp
2021-03-27 11:10:47 +08:00
Kevin Hester
8ffd5a1d4f add reboot message 2021-03-27 10:19:59 +08:00
Jm
fc2862bd16 Fix bad merge 2021-03-25 19:36:37 -07:00
Jm Casler
7872cb050d
Merge branch 'master' into master 2021-03-25 19:32:13 -07:00
Jm
89029311c1 Update NodeDB.cpp 2021-03-25 19:28:15 -07:00
Jm
f6f586decb Remove my code that doesn't work with channels 2021-03-25 19:27:46 -07:00
Jm
471c06b169 #758 Report elevation while in range test 2021-03-25 19:25:20 -07:00
Jm
040bb1d1e0 Add a "Development Mode" for our plugins 2021-03-25 19:24:36 -07:00
Jm
bbaf5946f0 Update StoreForwardPlugin.cpp 2021-03-25 19:22:46 -07:00
Kevin Hester
7e9e33d462 fix has_gps reporting to phones 2021-03-26 09:30:33 +08:00
Kevin Hester
04225f7bc2 change! time of last packet rx in node->last_heard instead of node->position.time 2021-03-26 09:30:15 +08:00
Michał Adamski
97a5405293 captive portal for Android devices 2021-03-25 21:49:06 +01:00
Kevin Hester
13cfce48fa cleanly disable bluetooth while serial API is in use (and only then) 2021-03-25 08:54:43 +08:00
Kevin Hester
0261c243e0 PhoneAPIs shouldn't register for messages until they have clients 2021-03-25 07:51:54 +08:00
Kevin Hester
b20930c111 move streamapi into a thread, saves power and increases responsiveness 2021-03-25 06:15:15 +08:00
Kevin Hester
e17fe7e075 update altitude in nodedb for received altitudes (reported by @iz1kga) 2021-03-24 19:24:33 +08:00
Kevin Hester
77c1112fe8 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-24 13:28:21 +08:00
Kevin Hester
5b0e7c6e82 fix has_preferences init 2021-03-24 13:25:21 +08:00
Kevin Hester
78c665abb9 properly discard messages with fromradio queue is full (Rather than blocking forever) 2021-03-24 13:25:10 +08:00
Kevin Hester
c5973f9a55 @mc-hamster it is VERY important to not accidentally turn this in in master
;-)
2021-03-24 11:41:14 +08:00
Kevin Hester
7b4f8fb6d6 Fix firmware OTA update while is_router 2021-03-23 14:44:50 +08:00
Vadim Furman
8065dbb2b7 Merge remote-tracking branch 'origin/master' 2021-03-22 21:40:30 -07:00
Kevin Hester
90576f44d8 Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	proto
2021-03-23 12:17:46 +08:00
Kevin Hester
49b16fdf0c fix channel !authorized check 2021-03-23 12:07:04 +08:00
Kevin Hester
1fcec8ce3b always fix up channel list, even if we just did factory reset 2021-03-23 11:54:53 +08:00
Kevin Hester
d32386a027 Return errors for unauthorized requests or out of bound channel nums 2021-03-23 11:44:51 +08:00
Vadim Furman
9b57d28c7d Merge remote-tracking branch 'origin/master' 2021-03-22 19:41:23 -07:00
Vadim Furman
b9fd726c14 Push RSSI to the phone 2021-03-22 19:39:49 -07:00
Jm Casler
e193f63687 Update StoreForwardPlugin.cpp 2021-03-21 19:46:02 -07:00
Jm Casler
1eb37dded8 partial work for S&F 2021-03-21 19:45:35 -07:00
Jm Casler
330d83e7c3
Merge pull request #78 from meshtastic/master
Update from head
2021-03-21 07:51:45 -07:00
Jm Casler
a74384f3f5 Update airtime.h to add override 2021-03-21 07:44:08 -07:00
Kevin Hester
e9faf657df move GPS_RX_PIN for the TLORA_V2_1_16 from 36 to 15 2021-03-21 18:58:43 +08:00
Jm Casler
103ffde025 Fixes for build of tlora_v1_3 2021-03-20 20:47:48 -07:00
Jm Casler
baeb002245 Fix small bug in range test plugin.
packetSequence was an unsigned int but i was using %d. oops
2021-03-20 00:38:53 -07:00
Jm
0ce7a3f0ec Update to how S&F reserves space on PSRAM 2021-03-19 23:43:06 -07:00
Jm Casler
0befad82a7
Merge branch 'master' into master 2021-03-19 23:38:42 -07:00
Kevin Hester
2b74260e2b only show time on OLED if we have a valid UTC clock 2021-03-20 10:22:06 +08:00
Vadim Furman
d3cbc8ea78 WIRE_INTERFACES_COUNT -> NO_WIRE 2021-03-19 18:46:11 -07:00
Vadim Furman
b6e197371d Removed SX1262_USE_DIO3_FOR_TCXO 2021-03-19 18:30:00 -07:00
Vadim Furman
d93d5d2e37 Revert clock update for Net quality clocks 2021-03-19 17:21:08 -07:00
Vadim Furman
7491af8ad7 Merge remote-tracking branch 'origin/master' 2021-03-19 17:07:16 -07:00
Kevin Hester
c410f2d151 fix tlora 1.6 build 2021-03-19 23:40:41 +08:00
Kevin Hester
7c5ab885be geeksville todo 2021-03-19 15:24:24 +08:00
Kevin Hester
af5d82dbde Merge remote-tracking branch 'root/master' into portduino 2021-03-18 19:49:13 +08:00
Kevin Hester
cef6e248e7 add newline 2021-03-18 19:40:00 +08:00
Kevin Hester
b4c379f5fc add sim exit cmd 2021-03-18 19:09:31 +08:00
Jm
002532401d #743 - Stub out for "mode 10" - NMEA string. 2021-03-17 21:52:30 -07:00
Jm
1b8f41d353 Partial work on s&f 2021-03-17 21:03:11 -07:00
Vadim Furman
0c51cc3738 Fix hardware model 2021-03-17 10:56:45 -07:00
Vadim Furman
2b9a8f0822 Merge remote-tracking branch 'origin/master' 2021-03-17 10:49:04 -07:00
Vadim Furman
ddcfff3b59 Fixed compilation on nrf52 and brownout code 2021-03-17 10:44:42 -07:00
Kevin Hester
999afdf05e wifi now works on portduino 2021-03-17 20:29:27 +08:00
Kevin Hester
f492f6deb6 progress on Wifi in portduino 2021-03-15 19:59:31 +08:00
Kevin Hester
3f401e8cac Merge branch 'dev' into portduino
# Conflicts:
#	.vscode/settings.json
2021-03-15 12:09:07 +08:00
Vadim Furman
b20b21c553 pitches.h no more 2021-03-14 20:46:58 -07:00
Vadim Furman
c62863b1dc Merge from origin 2021-03-14 19:42:57 -07:00
Vadim Furman
8505a0f260 Chargeing... 2021-03-14 19:17:28 -07:00
Vadim Furman
98d878cdfe Port to lora_isp4520 board 2021-03-14 19:00:20 -07:00
Kevin Hester
53671283ae change hw_model_deprecated to intentionally break old apps 2021-03-14 10:57:26 +08:00
Kevin Hester
d9fc7b32c3 move hw_model into User 2021-03-14 10:48:20 +08:00
Kevin Hester
9a03536e3d Use enums for hw_model per @sachaw idea. 2021-03-14 10:37:32 +08:00
Kevin Hester
a07291d904 cleanup external notification plugin 2021-03-13 13:32:23 +08:00
Kevin Hester
c0ac457cad lockdown plugins that touch hardware 2021-03-13 13:14:27 +08:00
Kevin Hester
6813a31895 fix hop limit defaults for android 2021-03-13 09:27:44 +08:00
Kevin Hester
c227143b53 @mc-hamster, I think storeandforward was accidentally wrong (no worries though) 2021-03-13 08:41:50 +08:00
Kevin Hester
3e6817cd18 fix board reboot due to forwarding packets we don't have keys for 2021-03-13 08:29:58 +08:00
Kevin Hester
a5ed607261 fix memory corruption in storeandforward 2021-03-13 08:29:32 +08:00
Kevin Hester
5dc5bce1b2 cleanup memtest 2021-03-12 20:41:18 +08:00
Kevin Hester
1908d131ca turn on access control for admin plugin, only allow remote access over special channel 2021-03-12 20:22:40 +08:00
Kevin Hester
8cd2a00a25 fix nasty bug 2021-03-12 15:47:00 +08:00
Kevin Hester
c097852ab0 SERIOUS BUG: we've been discarding devicestate when we should not 2021-03-12 15:45:28 +08:00
Kevin Hester
b02212009a progress on remote settings 2021-03-12 14:10:36 +08:00
Kevin Hester
2d6261703a fix null pointer exception in storeandforwardplugin. if null the vtable is busted
cc @mc-hamster.  In some cases storeForwardPluginRadio can be null ;-)

~/development/meshtastic/meshtastic-esp32$ bin/exception_decoder.py -e .pio/build/tbeam/firmware.elf ex
stack:
0x401db467: StoreForwardPluginRadio::sendPayload(unsigned int, bool) at /home/kevinh/development/meshtastic/meshtastic-esp32/src/plugins/esp32/StoreForwardPlugin.cpp:235
0x400e7cbd: StoreForwardPlugin::runOnce() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/plugins/esp32/StoreForwardPlugin.cpp:225
0x400d4cca: concurrency::OSThread::run() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/concurrency/OSThread.cpp:45
0x400f015d: ThreadController::runOrDelay() at /home/kevinh/development/meshtastic/meshtastic-esp32/.pio/libdeps/tbeam/Thread/ThreadController.cpp:153
0x400da070: loop() at /home/kevinh/development/meshtastic/meshtastic-esp32/src/main.cpp:621
0x400ff709: loopTask(void*) at /home/kevinh/.platformio/packages/framework-arduinoespressif32/cores/esp32/main.cpp:19

Signed-off-by: Kevin Hester <kevinh@geeksville.com>
2021-03-11 18:53:17 +08:00
Kevin Hester
a97c2ae6eb minimize radioconfig file writes 2021-03-11 18:29:47 +08:00
Kevin Hester
76e2c39c63 completed moving prefs to new files 2021-03-11 17:54:16 +08:00
Kevin Hester
ab9fe42f58 wip - move channels 2021-03-11 13:02:00 +08:00
Kevin Hester
959b540c02 begin restricting admin ops to the admin channel 2021-03-11 10:01:57 +08:00
Kevin Hester
68781492ad don't block on segger console 2021-03-11 10:00:08 +08:00
Kevin Hester
0df01f2586 Merge remote-tracking branch 'root/master' into eink 2021-03-10 15:30:51 +08:00
Kevin Hester
217bd934d7 fix GPS fixme wrt deletion 2021-03-10 15:21:54 +08:00
Kevin Hester
58715f454c add consolePrintf for C style code 2021-03-10 15:21:30 +08:00
Kevin Hester
772f2a15ff check more error codes 2021-03-09 16:45:40 +08:00
Kevin Hester
5b0d8381b9 fxi log formatting 2021-03-09 15:07:26 +08:00
Kevin Hester
d841d86bbc brownout detect 2021-03-09 15:07:16 +08:00
Kevin Hester
ecaae87b79 make screen optional 2021-03-09 15:07:02 +08:00
Kevin Hester
87ec7b09aa add crude check for brownout 2021-03-08 18:12:21 +08:00
Kevin Hester
f8ec072093 make debug console stall until host has downloaded 2021-03-08 17:10:48 +08:00
Kevin Hester
781d2f0ad6 fix warnings 2021-03-08 17:09:35 +08:00
Kevin Hester
7bbd2c0e80 make textmessageplugin optional 2021-03-08 15:30:08 +08:00
Jm Casler
315cfe4f2d
Merge branch 'master' into master 2021-03-07 23:25:43 -08:00
Kevin Hester
707ed75138 fix warnings found in nrf52 build 2021-03-08 15:20:43 +08:00
Kevin Hester
c0e180759d improve debugging on cortex m 2021-03-08 15:20:29 +08:00
Kevin Hester
d014ae0bff fix ls_sleeps communication to device clients 2021-03-07 09:51:17 +08:00
Kevin Hester
64bc791e48 fix docs 2021-03-07 09:34:29 +08:00
Kevin Hester
1f33506962 Add RU region 2021-03-06 21:10:36 +08:00
Kevin Hester
ba9a94d026 fix is_low_power detection 2021-03-06 18:00:20 +08:00
Kevin Hester
6f13966d19 fix missing acks for broadcasts 2021-03-06 17:48:35 +08:00
Kevin Hester
96cfad4e57 less logspam 2021-03-06 14:52:26 +08:00
Kevin Hester
49b1f4c5af oops - fix failed text message rx 2021-03-06 14:21:20 +08:00
Kevin Hester
aa6b29a4b5 fix from address on naks 2021-03-06 11:19:52 +08:00
Kevin Hester
c88b9732eb REALLY IMPORTANT: fix bug with retransmissions not happening 2021-03-06 11:13:33 +08:00
Kevin Hester
2c29e8b179 make nodeinfo & position plugins optional 2021-03-06 10:36:30 +08:00
Kevin Hester
d2d6b8e12f fix log formatting 2021-03-06 10:27:48 +08:00
Kevin Hester
badfaa8545 make error message clearer for packets that are too big 2021-03-06 10:27:31 +08:00
Kevin Hester
c9c44a934d don't generate acks for locally sourced msgs 2021-03-05 12:39:31 +08:00
Kevin Hester
8739469db3 oops typo 2021-03-05 11:49:37 +08:00
Kevin Hester
0c0c0babba combine acks works 2021-03-05 11:44:45 +08:00
Kevin Hester
950b32232f don't send messages the phone sent us back towards the phone 2021-03-05 10:19:27 +08:00
Kevin Hester
2cc2fa906a
Merge branch 'master' into improvements_to_env_plugin 2021-03-04 20:06:27 +08:00
Kevin Hester
955d03acb1 fix symbol conflict with new nrf52 libs 2021-03-04 11:28:50 +08:00
Charles Crossan
1b71a0f436 refactor ENV to single multi-inheritance class with cleaner user preferences
Fix merge issues

don't log when drawing blank frames

remove useless logging

re-comment stuff

fix comment

unused var
2021-03-03 20:30:20 -05:00
Charles Crossan
2af9e1431e Improvements to EnvironmentalMeasurementPlugin
Instead of holding onto only the last measurement, hold onto a copy of the last MeshPacket containing a measurement

This will make it easier to display the last time received

make DHT sensor reads more reliable

user preference for Farenheit vs Celsius
2021-03-03 08:23:03 -05:00
Jm Casler
ee04d57a7f
Merge pull request #73 from meshtastic/master
pulling 1.2 into my fork
2021-03-02 20:46:21 -08:00
Kevin Hester
92e05bc438 release to devs 2021-03-03 11:46:09 +08:00
Kevin Hester
082101f99f wire compat 2021-03-02 12:44:48 +08:00
Kevin Hester
f6761d637f proto update 2021-03-02 11:46:00 +08:00
Jm
2cf704abe0 Crashes after 7 seconds. 2021-02-28 19:35:00 -08:00
Kevin Hester
ef612d0b58 Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/plugins/Plugins.cpp
#	version.properties
2021-03-01 10:26:16 +08:00
Jm Casler
52d85c9a41 Partial work from laptop -- non-routers can send a heartbeat 2021-02-27 22:34:53 -08:00
Kevin Hester
fb47c3a03d move channel and settings protos 2021-02-27 13:17:18 +08:00
Kevin Hester
63e0b53054 1 index channel index 2021-02-27 09:17:58 +08:00
Kevin Hester
989f52494d clean up ack packets 2021-02-26 20:36:22 +08:00
Kevin Hester
0307e4161e get settings message works 2021-02-26 20:10:41 +08:00
Kevin Hester
c7c8b34adf impl get channels/get radio remote api 2021-02-26 15:34:00 +08:00
Jm
5f041ea7e9 Update Plugins.cpp 2021-02-25 08:14:07 -08:00
Jm Casler
14271be816
Rename src/plugins/StoreForwardPlugin.h to src/plugins/esp32/StoreForwardPlugin.h 2021-02-25 08:12:57 -08:00
Jm Casler
30d600040b
Rename src/plugins/StoreForwardPlugin.cpp to src/plugins/esp32/StoreForwardPlugin.cpp 2021-02-25 08:12:30 -08:00
Jm Casler
10dd2337fc
Merge branch 'master' into master 2021-02-25 08:04:41 -08:00
Kevin Hester
5ae4edf8fd move admin out of core proto 2021-02-25 20:36:37 +08:00
Kevin Hester
8ba43e1745 merge latest from master 2021-02-25 20:02:32 +08:00
Kevin Hester
e4eb7ab589 Merge branch 'dev' into dev1.2
# Conflicts:
#	proto
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
#	src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp
2021-02-25 19:44:08 +08:00
Kevin Hester
b052928af2 Merge remote-tracking branch 'root/master' into dev 2021-02-25 19:33:06 +08:00
Jm Casler
0fe046b92d
Merge pull request #72 from meshtastic/master
Update from head
2021-02-24 20:27:58 -08:00
Jm
fd6842cb5b Partial Work, stable build. 2021-02-24 20:27:21 -08:00
Kevin Hester
66638655a5 Merge branch 'dev' into dev1.2
# Conflicts:
#	src/mesh/NodeDB.cpp
2021-02-25 08:56:36 +08:00
Kevin Hester
2d214df76f Merge remote-tracking branch 'root/master' into dev 2021-02-25 08:52:26 +08:00
Kevin Hester
b2c47a7dea fix #710. nodes disappearing from map. thanks @DylanHoen for noticing! 2021-02-25 08:50:46 +08:00
Kevin Hester
ada05a1374 fix linux 2021-02-23 16:56:28 +08:00
Kevin Hester
f8d8dc25c0 properly route messages to phone again 2021-02-23 14:35:34 +08:00
Jm
256ba8fa1b partial work, untested 2021-02-22 20:07:19 -08:00
Kevin Hester
aa8b86c6b2 multichannel send/rx kinda works 2021-02-23 11:43:30 +08:00
Kevin Hester
ae6b7e7259 multichannel code is done! (only basic testing completed though) 2021-02-23 10:45:03 +08:00
Kevin Hester
2761c85564 clean up the crypto api 2021-02-23 10:10:35 +08:00
Charles Crossan
ec41c11e58 initialize the last measurement values to something obviously "unread" 2021-02-22 21:00:41 -05:00
Charles Crossan
3a91da5e52 remove UI render comment log spam 2021-02-22 21:00:05 -05:00
Charles Crossan
690b843678 add missing newline 2021-02-22 20:52:10 -05:00
Charles Crossan
3f1ada29ac support independently enabling/disabling the on-device screen and actual measurement 2021-02-22 20:47:35 -05:00
Charles Crossan
0c9df6ccbd disable the app by default 2021-02-22 20:33:42 -05:00
Charles Crossan
b62b01fe7c consume the additional details from OLEDDisplayUiState to handle transitions to/from plugin screens better
It's still a bit janky, but should work

https://github.com/meshtastic/esp8266-oled-ssd1306/pull/2
2021-02-22 20:18:36 -05:00
Charles Crossan
efaf669479 update Environmental Measurement plugin to use radio config prefs 2021-02-22 19:50:51 -05:00
Kevin Hester
94cd96cfde begin multichannel hash impl 2021-02-22 12:57:26 +08:00
Jm Casler
d5cb7ebf3b check in partial work. 2021-02-21 20:15:31 -08:00
Kevin Hester
d6c2e9063a 1.2 channel cleanup 2021-02-22 11:16:38 +08:00
Kevin Hester
3088fe3f91 Stay up-to-date wrt master (cc @mc-hamster)
# Conflicts:
#	src/plugins/Plugins.cpp
#	src/plugins/RangeTestPlugin.cpp
#	src/plugins/StoreForwardPlugin.cpp
2021-02-22 10:39:46 +08:00
Kevin Hester
008187caa4 1.2 wip - psk work 2021-02-22 10:26:11 +08:00
Charles Crossan
6dffaae72e fix typo 2021-02-21 16:49:35 -05:00
Charles Crossan
ae76ce4024 Implement interface for plugins to have custom UI Frames 2021-02-21 16:46:46 -05:00
Charles Crossan
087945d7cb udpate protobufs 2021-02-21 12:05:23 -05:00
Charles Crossan
fc72d16bcb Disable the plugin by default 2021-02-21 11:48:32 -05:00
Charles Crossan
5817afd4ac fix port number for ENVIRONMENTAL_MEASUREMENT_APP 2021-02-21 11:42:03 -05:00
Charles Crossan
765a6fcc62 Display received measurements in logs and on screen 2021-02-21 11:39:45 -05:00
Charles Crossan
0b20c46b79 standardize log line beginnings 2021-02-21 11:39:20 -05:00
Charles Crossan
27f74382aa Fix CI build for non-esp32 devices 2021-02-21 11:09:58 -05:00
Charles Crossan
77961e8e93 Un-derp testing details 2021-02-21 11:00:58 -05:00
Charles Crossan
3c564796e0 2021-02-21 10:55:33 -05:00
Jm
a4e5c7224f Add sawNodeReport to storeforwardplugin 2021-02-20 23:53:53 -08:00
Jm
7ffe601743 Changes to how airtime noise is gathered. 2021-02-20 23:53:17 -08:00
Kevin Hester
c6091338ab admin ops 2021-02-21 14:03:44 +08:00
Kevin Hester
99467cd874 1.2 WIP at least doesn't crash 2021-02-21 12:59:47 +08:00
Jm
ca40cb4be3 Update RangeTestPlugin.cpp 2021-02-20 00:43:56 -08:00
Jm
e4141df0e9 #697 GPIO 12 is an odd pin. 2021-02-20 00:34:25 -08:00
Jm
c690f81574 #697 Disable internal pullup on this board. 2021-02-19 18:19:14 -08:00
Jm
47b942ca00 #697 - Fixed button selection for tlora v2 1.6 2021-02-19 17:46:15 -08:00
Jm
621313d63c #701 - Add system up time to debug output 2021-02-19 16:58:52 -08:00
Kevin Hester
69a11e7375 WIP phone api changes for dev1.2 2021-02-17 19:04:41 +08:00
Kevin Hester
f064e56dc9 fix esp32 build for dev1.2 2021-02-17 16:17:46 +08:00
Kevin Hester
42ae27973e WIP 1.2 move routing into plugin 2021-02-17 13:06:23 +08:00
Jm
e840465ef3 fix for failed builds on nrf and linux 2021-02-16 18:46:16 -08:00
Jm Casler
f24e8e5f5c
Rename src/plugins/RangeTestPlugin.h to src/plugins/esp32/RangeTestPlugin.h 2021-02-16 18:36:58 -08:00
Jm Casler
6376ab51f1
Moving to plugins/esp32 2021-02-16 18:36:30 -08:00
Kevin Hester
205282c4bc show hwvendor at boot 2021-02-17 10:08:33 +08:00
Jm
a4fd74b58e Update Plugins.cpp 2021-02-16 18:07:02 -08:00
Jm Casler
25072f0637
Merge branch 'master' into master 2021-02-16 17:44:17 -08:00
Jm
937955b36d Updating range test and storeforward. 2021-02-16 17:42:46 -08:00
Kevin Hester
45caf394f0 WIP multichannel support 2021-02-16 15:41:52 +08:00
geoffreyheller
c8584d576a Fix for non-working tx pin 2021-02-15 19:33:35 -08:00
Charles Crossan
05d237ee84 add handleSetChannel 2021-02-15 21:02:30 -05:00
Jm
9a044f31a3 Tweak to the startup condition of the range test plugin. 2021-02-15 09:11:28 -08:00
Jm
8320754b98 Added recommended settings as a sender 2021-02-14 21:45:26 -08:00
Jm
703ce2e292 Keep device from sleeping while transmitting in range test plugin. 2021-02-14 21:34:47 -08:00
Jm
e6605e5ac8 Store Forward can see All(?) rx packets! 2021-02-14 20:13:52 -08:00
Jm Casler
2472d6fd1b
Merge pull request #70 from meshtastic/master
pull from main
2021-02-14 18:40:38 -08:00
Jm
3311146aba Turning storeforward back on for @geeksville 2021-02-14 16:19:06 -08:00
Jm
b8adaf6fbe #671 Range test plugin 2021-02-14 16:17:40 -08:00
Jm
24329a26de Framework for storeforward 2021-02-14 14:01:08 -08:00
Jm
f1a65f9d0e Update to store and forward. Don't merge this to main! 2021-02-14 13:31:11 -08:00
Jm Casler
3201d1c3bc #668 Partial work for store & forward 2021-02-14 08:44:49 -08:00
Kevin Hester
c55074f7fe oops: we should crash if we >MAX_THREADS, also raise max threads 2021-02-14 15:06:49 +08:00
Jm Casler
92a62d93ef #671 Rangetest - This just needs to be tested. 2021-02-13 22:21:01 -08:00
Kevin Hester
e35f137986 clean up nodeinfo broadcasts and move into plugin 2021-02-14 12:27:10 +08:00
Kevin Hester
71c35304d6 delay position plugin start until 60 secs after first boot 2021-02-14 12:26:51 +08:00
Kevin Hester
c1733a4ac6 Merge remote-tracking branch 'root/master' into dev 2021-02-14 12:07:11 +08:00
Kevin Hester
66a7e8eab9 oops - we were never sending 'fixed' gps positions to other nodes 2021-02-14 12:02:24 +08:00
Kevin Hester
a872231f8a clean up position broadcasts, send them even if we don't have gps lock 2021-02-14 11:57:48 +08:00
Kevin Hester
52ec4d511c oops - we weren't properly stripping timestamps from new style positions 2021-02-14 11:37:32 +08:00
Sacha Weatherstone
875eeb699c Fix report formatting 2021-02-13 19:51:31 +11:00
Jm
19db5ba421 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-02-12 18:53:08 -08:00
Jm
e225af28dc Disable plugins 2021-02-12 18:52:31 -08:00
Jm Casler
eecf89a9c0
Merge pull request #68 from meshtastic/master
from main to my fork
2021-02-12 18:49:39 -08:00
Jm
c9b1ee532d Update deviceonly.pb.h 2021-02-12 18:49:24 -08:00
Kevin Hester
8c225a3c65 disable lora while updating, show "Updating" on oled screen 2021-02-12 13:48:12 +08:00
Kevin Hester
bbc8fc0269 fix build for nrf52 2021-02-12 09:56:42 +08:00
Kevin Hester
9d81511153 fix warning 2021-02-12 09:56:35 +08:00
Kevin Hester
f2b7ff2b79 an optimization for #681 - make want_ack packets higher priority 2021-02-12 09:40:20 +08:00
Kevin Hester
2ff5046dcd for #681, add MeshPacketQueue (a priority queue) to ensure acks get sent quickly 2021-02-12 09:08:49 +08:00
Kevin Hester
917090856f partial for #681: Never let stale nodeinfos/positions stay in xmit queue 2021-02-11 18:19:43 +08:00
Kevin Hester
da03490310 Merge branch 'dev' into portduino 2021-02-10 16:20:29 +08:00
Kevin Hester
fdfe62edf0 updates to work with new protobuf names 2021-02-10 16:18:41 +08:00
Kevin Hester
aedca25fa8 Merge branch 'dev' into portduino 2021-02-10 15:51:34 +08:00
Jm
b29bcbbd41 #682 Exposing the actual radio center frequency to /static/report 2021-02-09 21:59:00 -08:00
Kevin Hester
2fa38c7dc4 update protos 2021-02-08 17:57:45 +08:00
Jm
ca8a0ca8d2 update rangetest 2021-02-07 19:20:29 -08:00
Kevin Hester
58bb7169a0 use nodenum as the default nodeid 2021-02-08 10:15:02 +08:00
Jm Casler
4ee01acb40 Change where the location information is taken from. 2021-02-07 09:31:29 -08:00
Jm
d678c48884 work on rangetestplugin and storeforwardplugin
done for the night.
2021-02-06 23:29:18 -08:00
Jm Casler
abf135abce
Merge pull request #66 from meshtastic/master
mc-hamster/meshtastic-device <- meshtastic/meshtastic-device
2021-02-06 19:56:44 -08:00
Kevin Hester
486b03e985 bug 677. Don't assert fail for missing interfaces, instead return
nak packet to clients.
2021-02-07 10:26:11 +08:00
Kevin Hester
ccb232b6ac make route errors a more general 'message delivery failure' reason
in support of https://github.com/meshtastic/Meshtastic-device/issues/677
2021-02-07 09:46:35 +08:00
Kevin Hester
c25efac0c1 portduino wip 2021-02-07 09:17:46 +08:00
Jm
f46059ec4c update to range test plugin 2021-02-03 08:10:13 -08:00
Jm
e9affb50d2 #674 add support for lora32 v1.3 2021-02-02 17:34:50 -08:00
Jm Casler
c00173dbd2 partial work 2021-01-31 18:20:08 -08:00
Jm Casler
e8c6fccd63 #671 Range Test Plugin
Initial work for Range Test Plugin
2021-01-31 09:12:36 -08:00
Jm Casler
487b8c6e9e #668 Initial work for Store & Forward Plugin 2021-01-31 09:12:01 -08:00
Jm
b2481d1450 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-30 19:42:08 -08:00
Jm Casler
c0444ef16f
Merge pull request #64 from meshtastic/master
Update from meshtastic main
2021-01-30 17:20:56 -08:00
Jm
242bcc8353 Update documentation location to the main mesthastic repo 2021-01-30 09:52:21 -08:00
Jm
7129a19f35 #654 Add reference to documentation 2021-01-30 09:36:17 -08:00
Jm
6cef3e41e7 Update comments and use radioConfig 2021-01-30 09:17:40 -08:00
Jm
aee81c8dcd #654 - Add comments on what the config does 2021-01-29 19:35:03 -08:00
Jm
9e736ab0d7 #654 Fix gpio initilization 2021-01-28 23:16:10 -08:00
Jm
85752b0fc7 #654 - Fixed problem with class namespaces. 2021-01-28 23:02:00 -08:00
Kevin Hester
c6f34c59b4 Update to logo by @thepoweroftwo 2021-01-29 13:26:08 +08:00
Kevin Hester
7f07725840 make improperly sized AES128/256 keys non fatal, instead pad with zeros
Fixes rebooting the board if someone specifies an invalid key
2021-01-29 10:15:48 +08:00
Kevin Hester
c81d090464 someone added storerequest app? 2021-01-29 10:14:46 +08:00
Jm Casler
c524732849 #654 - Non blocking call to toggle the output. 2021-01-27 21:35:07 -08:00
Jm Casler
5e303f8a1f #654 - Work in progress. Needs testing, non-blocking alert and integration with configuration 2021-01-27 21:20:18 -08:00
Jm
2246564279 #654 - Small changes. 2021-01-27 20:06:39 -08:00
Jm
eff0c1fe89 #654 - Partial work for the LED/Speaker.
Framework is done. Just need to blink a few things and update protobufs.
2021-01-27 19:18:16 -08:00
Jm Casler
ad322476d2
Merge branch 'master' into master 2021-01-27 18:56:48 -08:00
Jm
2561742683 #664 - Blink the LED when we enter disablePin() 2021-01-27 18:56:09 -08:00
Kevin Hester
3ac5b045c4 Merge remote-tracking branch 'root/master' into eink 2021-01-28 10:31:56 +08:00
Kevin Hester
63c650c33e
Merge branch 'master' into log-tx-failure 2021-01-27 17:54:06 +08:00
Sacha Weatherstone
31b89e2932 Another header required 2021-01-24 10:48:48 +11:00
Sacha Weatherstone
9db5f9ff67 fix cors for API requsts & fix spiffs url 2021-01-23 17:42:15 +11:00
Jm Casler
d7b2a0ed79
Merge pull request #62 from mc-hamster/master
update serial from master
2021-01-20 19:02:58 -08:00
Jm
af0a1b5db5 Update comments of SerialPlugin 2021-01-20 19:02:08 -08:00
Jm
2a47819fd6 #649 More webserver refactoring 2021-01-19 21:38:17 -08:00
Jm
e4fdf26dc7 #649 - First pass on the refactoring of the webserver 2021-01-19 21:26:23 -08:00
Andrew Mark
dd511588a2 Oops, let's only try to reboot ESP32 when there's an ESP32 2021-01-19 20:13:19 -08:00
Andrew Mark
79dad8ec8c Set critical error and reboot when radio fails to generate tx IRQ 2021-01-19 18:21:54 -08:00
Jm
b5f50efdcd #647 - Fix for admin mode being forced on boards without hardware pullup 2021-01-18 10:43:15 -08:00
Jm
fa8cc74141 Update to Serial Plugin to make it easy to override the device configuration 2021-01-17 15:40:25 -08:00
Jm
c0d27e2ce9 #635 Added web_request_count and fixed printf of psram 2021-01-17 10:30:34 -08:00
Jm
8e8264efb0 #635 - Added memory usage statistics 2021-01-17 00:29:29 -08:00
Jm
c0711fde69 #615 Allow rate for tbeam battery charger to be configurable 2021-01-16 23:10:08 -08:00
Jm
20b8d2c4a5 Set the port to PortNum_SERIAL_APP 2021-01-16 22:41:33 -08:00
Jm
73ae151971 Added serialplugin_timeout to SerialPlugin 2021-01-16 22:39:28 -08:00
Jm Casler
f4806c9dd7
Merge branch 'serial' into master 2021-01-16 22:35:56 -08:00
Jm
79532210e8 SerialPlugin - Update comments with better instructions 2021-01-16 22:31:56 -08:00
Jm
d7f26493a5 Update to SerialPlugin to take advantage of the configs 2021-01-16 22:27:33 -08:00
Jm
f435086a5a Update generated protobufs 2021-01-16 20:50:58 -08:00
Jm
cafe00e463 Update of serialplugin 2021-01-16 19:40:47 -08:00
Kevin Hester
fd9ffbbb88 fix charging indication for dumb battery sensors 2021-01-16 13:05:33 +08:00
Kevin Hester
d1be7cf142 improve hardfault handler 2021-01-16 12:55:51 +08:00
Kevin Hester
3a2c17998e turn off nrf52 ble while debugging 2021-01-16 11:41:50 +08:00
Kevin Hester
a0dd051511 turn off eink backlight 2021-01-16 11:41:28 +08:00
Kevin Hester
4faff3ec6f cope with bogus NMEA gps 2021-01-16 11:41:18 +08:00
Jm
6da4e30215 Merge branch 'serial' of https://github.com/mc-hamster/Meshtastic-device into serial 2021-01-14 22:38:53 -08:00
Jm
dbf0569e29 Update comments for serial pins recommended by @ryguy 2021-01-14 22:36:51 -08:00
Jm
bd85736226 SerialPlugin - Exclude working on non esp32 platforms. 2021-01-14 21:59:26 -08:00
Jm
4ec8986934 Fixed switching to uint32 from 16 for airtime in json report 2021-01-14 21:45:41 -08:00
Jm Casler
b963216764
Merge pull request #55 from mc-hamster/serial
Update for SerialPlugin and Airtime
2021-01-14 21:43:28 -08:00
Kevin Hester
3598c91c29 fix @mc-hamster build to work on linux/nrf52 2021-01-15 13:30:40 +08:00
Jm
507cd1dd20 #639 - Move from counting seconds to milliseconds 2021-01-14 18:40:18 -08:00
Jm
e39506824d Added more comments 2021-01-14 18:08:23 -08:00
Jm
f68a31ab28 serialplugin - ability to configure ACK 2021-01-13 23:21:55 -08:00
Jm
b1181deb58 serialplugin - Added my todo list 2021-01-13 23:02:13 -08:00
Jm
89b32dd7ee Fix comments in serial plugin 2021-01-13 22:51:36 -08:00
Jm
c54e87f9a2 Update SerialPlugin.cpp
Added documentation.
2021-01-13 22:50:02 -08:00
Jm
eee7e1de57 Update to serial plugin 2021-01-13 22:39:11 -08:00
Jm
3c60df1565 Partial work on the SerialPlugin 2021-01-13 20:22:59 -08:00
Jm Casler
a827017bd2
Merge pull request #53 from crossan007/master
add power statistics for #635
2021-01-11 17:54:27 -08:00
Charles Crossan
95c502c658 fix typo 2021-01-11 20:30:02 -05:00
Charles Crossan
0f573901d5 didn't need power.h 2021-01-11 20:28:09 -05:00
Charles Crossan
fdc9bf5783 add power statistics for #635 2021-01-11 20:25:02 -05:00
Jm
0c06d8db3c maybe this will fix the linux build? 2021-01-09 19:31:16 -08:00
Jm
f02ab88393 Does this fix the linux build? 2021-01-09 19:15:10 -08:00
Jm
adb912b665 fixed in linux now? 2021-01-09 19:06:34 -08:00
Jm
0a40d920e3 Update BluetoothUtil.cpp
yet another linux fix?
2021-01-09 18:36:23 -08:00
Jm
9cd24a5646 is linux fixed now? 2021-01-09 18:27:03 -08:00
Jm
c82905bbdd is linux fixed now? 2021-01-09 18:09:16 -08:00
Jm
5688c8b81e more linux build fixes 2021-01-09 17:50:58 -08:00
Jm
52dacaed37 more fixes for linux build 2021-01-09 17:30:36 -08:00
Jm
69391e186b Fix for breaking the linux build 2021-01-09 13:47:10 -08:00
Jm
3798f4ca5b fix for building on NRF platform. 2021-01-08 22:59:37 -08:00
Jm
d458f673be Web server is now treaded and moved to mesh/wifi/* 2021-01-08 22:25:44 -08:00
Jm
cfcb00b943 that's enough for tonight. web server is in its own thread, needs to be further optimized but it works enough. next is to refactor. 2021-01-08 20:43:51 -08:00
Jm
977e47d109 partial work 2021-01-08 20:06:11 -08:00
Jm Casler
cfeb40f36d
Merge pull request #41 from mc-hamster/master
Updated osthread branch from master
2021-01-08 19:57:19 -08:00
Kevin Hester
74bc05936d Merge remote-tracking branch 'root/master' into dev 2021-01-08 13:16:27 +08:00
Kevin Hester
7aacfd66ef add assertIsSetup() and use it from OSThread constructor
fixes nasty bug @mc-hamster discovered with plugin order of operations
2021-01-08 13:15:49 +08:00
Kevin Hester
3636b87db0 formatting 2021-01-08 11:52:43 +08:00
Jm
0af5b225c4 intermediate 2021-01-05 23:32:33 -08:00
Jm
f7dcef39ce intermediate work 2021-01-05 23:21:14 -08:00
Kevin Hester
243878f2a0
Merge branch 'master' into master 2021-01-06 14:39:57 +08:00
Jm Casler
35bcb5297a
Merge pull request #38 from mc-hamster/master
update from master to osthread
2021-01-05 19:04:15 -08:00
Jm
84e3d7c276 Test fixes for Tobiases 2021-01-05 18:57:03 -08:00
Kevin Hester
94a47dba7d fix #624 - update battery level and current time on mynodeinfo 2021-01-04 09:59:53 +08:00
Kevin Hester
3ddae5faec fix build for esp32 2021-01-03 20:12:31 +08:00
Kevin Hester
34faea6100 fix #622 - we might not have a local position yet early in the boot 2021-01-03 20:11:26 +08:00
Kevin Hester
10db80541f Merge remote-tracking branch 'root/master' into dev 2021-01-03 10:12:08 +08:00
Kevin Hester
edd1268f5f portduino: begin adding wifi implementation 2021-01-03 10:11:20 +08:00
Jm Casler
7d411351c0
Merge pull request #37 from meshtastic/master
update from head
2021-01-02 10:20:56 -08:00
Jm
df21602c90 Remove text "This interface is experimental" 2021-01-02 10:18:35 -08:00
Kevin Hester
ce4ccf3cc4 no need for lora CS control on linux, the spi controller handles it 2021-01-02 19:40:24 +08:00
Kevin Hester
a7f93de3ad add a software based cross platform AES-CTR implementation 2021-01-02 18:20:51 +08:00
Kevin Hester
b3ba557b8b cleanup portuino 2021-01-02 14:14:59 +08:00
Kevin Hester
42f51f33a8
Merge branch 'master' into master 2021-01-02 14:12:07 +08:00
Jm
8295b88d96 Checking in work so I don't lose it. Nothing's broke with the build. 2021-01-01 21:20:34 -08:00
Kevin Hester
745d3775b4
Merge branch 'master' into dev 2021-01-02 12:54:04 +08:00
Kevin Hester
aa176b6593 portuino now kinda works with the pinetab lora USB module.
still need to add an AEX256 impl for the linux port and optimize a bit
2021-01-02 12:38:18 +08:00
Kevin Hester
b0e3a7524f assign more portduino pins 2021-01-02 11:23:30 +08:00
Kevin Hester
5ceee50bb5 bug: we've always been setting gpio 0 as an input on rf95 based devices
found because portduino provides full visibility to all IO operations
to the hw simulator.
2021-01-02 11:23:18 +08:00
Kevin Hester
ebdad76fb2 portduino: gpios now kinda work on linux 2021-01-02 11:06:38 +08:00
Jm
925829dc58 Partial work to migrate to OSThread model 2021-01-01 12:31:46 -08:00
Jm Casler
9587729bb0
Merge branch 'master' into master 2020-12-31 20:55:32 -08:00
Jm
d71c7b512f Cleanup some compile time warnings that were driving me crazy. 2020-12-31 20:44:53 -08:00
Jm
349701ac14 Display AP connection usage only when in AP mode 2020-12-31 20:17:18 -08:00
Kevin Hester
ca6293eefe
Merge branch 'master' into master 2020-12-31 14:05:56 +08:00
Kevin Hester
d289e8a86f Merge remote-tracking branch 'root/master' into dev 2020-12-31 14:02:47 +08:00
Wei Fang
279c89dca3 Shall upgrade RTC currentQuality if higher q available 2020-12-30 21:46:43 -08:00
wfang2002
a7a52e08d1
Merge branch 'master' into master 2020-12-30 21:26:51 -08:00
Wei Fang
f6336855d0 Fix GPS turned on then off immediately every 2 minutes 2020-12-30 21:11:03 -08:00
Jm Casler
7b80b95381
Merge pull request #36 from mc-hamster/upload
Fix for meshtastic#606 and meshtastic#597
2020-12-30 18:19:52 -08:00
Jm
2867f8fd53 Fix for #606 and #597
Upload interface randomly crashes #606

watchdog timer exception while building https certificate #597
2020-12-30 18:10:35 -08:00
Kevin Hester
cdf416cb73 partial fix for #608 - when a new TCP API connection arrives, close old one completely 2020-12-31 10:02:18 +08:00
Jm
7716d62018 Remove old comment 2020-12-30 15:16:04 -08:00
Jm Casler
d5f76b16b9 write readLength to debug console 2020-12-30 14:52:39 -08:00
Kevin Hester
6e31ba30c7 move generated protobuf c code to own directory 2020-12-30 12:34:22 +08:00
Kevin Hester
8fe1c518d9 Merge branch 'mqtt' into dev
# Conflicts:
#	proto
2020-12-30 12:25:00 +08:00
Kevin Hester
d8a15d6324
Merge branch 'master' into dev 2020-12-30 10:08:01 +08:00
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
997ed283bf #601 - tbeam draws too much power from USB port 2020-12-28 01:12:42 -08:00
Kevin Hester
9128f7d4b3 turn on battery pin for lora_v2 per @msws 2020-12-28 15:00:34 +08:00
Kevin Hester
adc71e7ed2 mqtt doc progress 2020-12-28 14:42:24 +08:00
Kevin Hester
4777e53c23 more mqtt design work 2020-12-28 13:36:11 +08:00
Kevin Hester
d6912cfd8e mqtt design progress 2020-12-28 13:22:10 +08:00
Jm
621306e610 Add IP address and rssi to /json/report 2020-12-27 15:03:32 -08:00
Jm Casler
0e507e1923
Merge branch 'master' into master 2020-12-27 12:39:36 -08:00
Jm
15a0b3694d Update to #588 - Change "hour" to "period" 2020-12-27 10:50:52 -08:00
Jm Casler
58859848a3 Add RX and RX_ALL analytics for #588 2020-12-27 09:29:48 -08:00
Kevin Hester
c972197643 fix #598 don't corrupt the heap when a TCP connection drops 2020-12-27 16:58:32 +08:00
Jm
3c69beef94 Update to the airtime calculator. I didn't 0 out the RX log. 2020-12-26 23:37:04 -08: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
186a52172c fix #577 don't make invalid radio settings reboot the board
instead raise a critical fault (note though: this is still not ideal
because the radio will be in an undefined state until valid settings
are used)
2020-12-27 13:09:20 +08:00
Kevin Hester
21570fc24f fix #540 use gps to fix rtc clock drift every 12 hrs 2020-12-27 12:54:44 +08:00
Kevin Hester
0c74303e9d move criticalerror defs into .proto for cross platform support 2020-12-27 11:22:08 +08:00
Kevin Hester
8d04410f45 improve error descriptions 2020-12-26 13:55:59 +08:00
Kevin Hester
4a653ab054 fix nrf52 build 2020-12-26 13:47:02 +08:00
Kevin Hester
651bd71454 show critical faults on the screen 2020-12-26 13:36:21 +08:00
Kevin Hester
27c16ba185 add ppr1 notes 2020-12-26 12:53:20 +08:00
Jm Casler
ded2b86e55 Calculate TX air time duty cycles #588 -- UNTESTED 2020-12-25 16:10:38 -08:00
Jm Casler
34e6dbec81
Merge pull request #33 from meshtastic/master
updated my repo
2020-12-25 09:44:27 -08:00
Kevin Hester
3c2aac87f7 better fix for screen messages in log 2020-12-25 15:39:42 +08:00
Kevin Hester
f45451ca74 missing line term 2020-12-25 15:31:17 +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
Jm Casler
8080bc608b
Merge pull request #32 from meshtastic/master
Update from upstream.
2020-12-24 19:20:36 -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
bacc1b1dad #581 - Quiet a compile time warning I introduced. 2020-12-22 22:37:34 -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
2253ea1b41
Merge branch 'master' into master 2020-12-23 09:58:36 +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
Charles Crossan
5c70f36aa5 add mime types for ico and svg 2020-12-21 17:42:55 -05: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
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
Charles Crossan
2743b9d310 use POST URL parameters; fix response status 2020-12-20 21:44:51 -05:00
Charles Crossan
2f779bfd37 improve blink; LED or SCREEN as POST Parameter 2020-12-20 18:24:48 -05:00
Charles Crossan
db2193b526 implement screen blink 2020-12-20 17:45:45 -05:00
Charles Crossan
7205e9a5b4 adjust LED timings; switch to HTTP/POST 2020-12-20 14:50:13 -05:00
Jm Casler
1ca83509dd Blink the LED for one second on get of /json/blink 2020-12-20 11:32:49 -08:00
Jm Casler
fae9ea8b3b Update for #571 (i forgot to set the mime type) 2020-12-19 12:18:08 -08:00
Jm Casler
b96ee7be72 New feature #571 - Report contents of spiffs in a json data structure. 2020-12-19 12:09:48 -08:00
Kevin Hester
15e1a3870c When new node joins mesh, all other nodes reply with their current state 2020-12-17 10:53:29 +08:00
Kevin Hester
5bdc7216b3 begin support for multiple simultanous channels 2020-12-17 10:32:19 +08:00
Kevin Hester
be38a58a62 finish channel name cleanup 2020-12-15 16:13:16 +08:00
Kevin Hester
5930f8270d Merge remote-tracking branch 'root/master' into dev 2020-12-15 16:10:35 +08:00
Kevin Hester
c9f2318e78 Use simpler names for standard channels 2020-12-15 13:14:36 +08:00
Kevin Hester
5cdc2f5142 Make ChannelSettings SUPER short for common channels 2020-12-14 21:09:29 +08:00
Jm Casler
474e0e7158 Fixed bad copy/paste of http end points being used as default. 2020-12-13 14:59:56 -08:00
Jm Casler
6975848f45 #563 Don't display the wifi password when we are a client. 2020-12-13 11:01:01 -08:00
Kevin Hester
0cdc1fc959 make gpiowatch work correctly 2020-12-13 16:11:38 +08:00
Kevin Hester
e80c79edbe clean up debug msgs 2020-12-13 15:59:26 +08:00
Jm Casler
86952c5456 Fixed #541 - Work around to bug in espressif softap event handler 2020-12-12 22:37:07 -08:00
Jm Casler
46781357df remove hard coded network 2020-12-12 21:43:01 -08:00
Jm Casler
bb9abf2dca #560 Forgot to switch back to application/json 2020-12-12 21:42:32 -08:00
Jm Casler
5249608dce #561 Add escapes to strings 2020-12-12 21:35:21 -08:00
Kevin Hester
ee8f4de5ab make plugin reply handling simpler 2020-12-13 12:57:37 +08:00
Jm Casler
17297db2b1 #561 - Add a scan for SSID 2020-12-12 20:50:41 -08:00
Kevin Hester
138cebbf03 turn nrf52 ble back on 2020-12-13 11:53:32 +08:00
Jm Casler
9f9573d2eb #560 - Add note that we're in admin mode on network screen 2020-12-12 19:18:51 -08:00
Jm Casler
e10b82c118 #560 Partial changes 2020-12-12 19:09:58 -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
26c9585c9d #557 - Switch from GET to POST 2020-12-12 12:38:17 -08:00
Jm Casler
696255c1f7 #557 - Endpoint to restart device over http(s) 2020-12-12 12:36:16 -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
Jm Casler
e82752c777 #552 - Updated the 404 handler for / to refer to instructions for how to fix the problem.
#552 - Updated the 404 handler for / to refer to instructions for how to fix the problem.
2020-12-11 22:54:48 -08:00
Kevin Hester
1e5d0b25ad Add doc note about threading and use OSThread to make GPIO watching work
Thanks to @mc-hamster for the idea
2020-12-11 18:29:32 +08:00
Kevin Hester
b9f1ce70cb begin plugin-api tutorial 2020-12-11 09:11:53 +08:00
Kevin Hester
df8b3ebbc7 always pull min_app_version from appload 2020-12-10 11:32:51 +08:00
Kevin Hester
b1c30f0650 Use a custom platformio py file to always set build version 2020-12-10 11:28:15 +08:00
Kevin Hester
a0076eb394 better position debug output 2020-12-09 13:42:36 +08:00
Kevin Hester
32b8e4f20a fix #536 allow fixed positions
meshtastic --setlat 32.7767 --setlon -96.7970 --setalt 1337
2020-12-09 12:05:15 +08:00
Kevin Hester
3753fef298 add debug_log_enabled 2020-12-09 11:56:41 +08:00
Kevin Hester
a4bb1937c1 Merge remote-tracking branch 'root/master' into udp 2020-12-09 11:21:59 +08:00
Kevin Hester
4bd22dd5db ignore our own msgs for gpio ctrl 2020-12-08 08:16:58 +08:00
Kevin Hester
79a24c200e use autogened protobuf init code 2020-12-07 10:27:31 +08:00
Kevin Hester
90060e84c0 WIP on GPIO example 2020-12-07 10:18:11 +08:00
Kevin Hester
8f5a1f19d3 add remote gpio control as an example plugin
https://github.com/meshtastic/Meshtastic-device/issues/182
2020-12-06 18:33:42 +08:00
Kevin Hester
3e0dc44210 move want_replies into new plugin system 2020-12-05 11:15:06 +08:00
Kevin Hester
91b99bd584 require apps to be 1.1.20 or later 2020-12-05 10:27:04 +08:00
Kevin Hester
b6e21bcbcd add SinglePortPlugin to simpilify api 2020-12-05 10:14:15 +08:00
Kevin Hester
ae7d3ee5ed move nodeinfo messages into new plugin system 2020-12-05 10:00:46 +08:00
Kevin Hester
f1179bd3ea positions now sent using the new API 2020-12-05 08:46:19 +08:00
Kevin Hester
9b24cc6dd6 update protobufs 2020-12-04 18:54:00 +08:00
Kevin Hester
d3cb9bdd4a WIP moving positions to new system 2020-12-03 16:48:44 +08:00
Kevin Hester
7737123d0f begin moving position stuff into plugin 2020-11-28 18:10:31 +08:00
Kevin Hester
5138aff4b2 fix static initializer bug with mesh plugins 2020-11-28 13:25:03 +08:00
Kevin Hester
0b0d293a66 Move text message handling into the new plugin system 2020-11-28 12:10:19 +08:00
Kevin Hester
ddab4a0235 remove support for 8bit nodenums 2020-11-28 09:56:21 +08:00
Kevin Hester
f5e42b2533 update protos 2020-11-28 09:17:20 +08:00
Kevin Hester
9e9913101f
Merge pull request #527 from geeksville/spiffs-bug496
Spiffs bug496
2020-11-27 17:11:34 -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
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
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
3ab9d2a50e Removing stuff I accidently checked in for the duplexer 2020-11-22 16:24:22 -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
f2698bbf91 bug #496 - allow update clients to program SPIFFS region
also have build system properly build spiffs release builds
2020-11-16 08:56:32 +08:00
Kevin Hester
d045139945 return ble errors for invalid values 2020-11-16 07:57:32 +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
Charles Crossan
49a19e26d5 Only issue ContentType header once; correctly. 2020-11-13 22:07:52 -05:00
Kevin Hester
ccc1600bc9 remove stale fixme 2020-11-14 10:19:55 +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
f346b4f0f2 Merge branch 'eink' into bug513 2020-11-13 09:41:23 +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
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
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
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
6b442784f3 Merge remote-tracking branch 'root/master' into dev 2020-10-29 13:26:49 +08:00
Kevin Hester
cfcb62bd18 Make region changes take effect immedately 2020-10-29 13:26:36 +08:00
Kevin Hester
f6ec129288
Merge branch 'master' into master 2020-10-28 18:38:27 -07:00
Kevin Hester
4ad562b9f4 The new 7.2.0 soft device works on nrf52833 2020-10-28 13:01:50 +08:00
Jm Casler
44aafd5b9c Update to basic.js and add mime types. 2020-10-26 18:17:33 -07:00
Kevin Hester
7597d5b3fd PPR1 - GPS serial now works 2020-10-25 17:07:54 +08:00
Kevin Hester
1a8891c33d ppr1: add crude version of charge controller driver 2020-10-24 18:40:47 +08:00
Kevin Hester
f0eeaf01d4 ppr1 lcd is 'good enough' for now 2020-10-24 09:49:14 +08: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
18bbf3523e remove unused display code 2020-10-23 22:18:22 +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
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
13ef48094d
Merge pull request #21 from meshtastic/dev-https
Dev https to my fork
2020-10-21 21:20:55 -07:00
Jm Casler
baa3d1dae4 Support for the SPIFFS 2020-10-21 20:57:44 -07:00
Kevin Hester
14c4022c18 1.1.6 (and screen layout tweaks) 2020-10-21 19:18:03 +08:00
Kevin Hester
a5d7bacdbf Show current region on the boot screen 2020-10-21 17:27:13 +08:00
Kevin Hester
0b3c25f6d9 use correct code for "talking to phone" fixes OTA update while a router 2020-10-21 16:50:09 +08:00
Kevin Hester
430186ec53 Merge remote-tracking branch 'root/master' into dev 2020-10-21 10:44:56 +08: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
ff20b29c3c update case of meshhttpStatic.h 2020-10-18 21:44:55 -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
a371592ad9 Added instructions for David 2020-10-18 18:07:44 -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
Kevin Hester
8fd3cb1aac add crude charging detection for 'dumb' voltage based battery sensors 2020-10-18 09:44:29 +08:00
Kevin Hester
485c476f17 cleaner battery debug messages 2020-10-18 09:32:12 +08: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
2901f773a4 Some cleanup and implement the X-Protobuf-Schema header 2020-10-16 23:33:50 -07:00
Kevin Hester
a7c54e4ad7 Merge remote-tracking branch 'root/master' into dev 2020-10-17 13:41:51 +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
Jm Casler
5b4472ab56 fix case of HttpAPI class 2020-10-16 19:38:59 -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
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
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
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
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
10008d4eef fix merge conflict 2020-10-11 21:19:22 -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
Kevin Hester
a9de8b9bb3 oops - only read axp on boards that have it 2020-10-12 09:33:15 +08: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
Kevin Hester
9a414d9c77 fix my breakage of screen waking 2020-10-12 08:13:32 +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
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
Kevin Hester
999b292717 fixes for the posix port 2020-10-11 09:18:47 +08: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
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
Jm Casler
db8faa9faf added powerExit 2020-10-09 23:07:37 -07:00
Kevin Hester
4b9ea4f808 Merge branch 'dev' into coroutine 2020-10-10 09:22:23 +08:00
Kevin Hester
95cb6b06e4 fix #462 publish immediately on any GPS state change
(don't wait until end of aquisition window)
2020-10-10 09:20:38 +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
Kevin Hester
10f64590a9 Merge branch 'dev' into coroutine 2020-10-09 10:03:27 +08:00
Kevin Hester
4a70ba1f7a fix nodeinfo stored times (I think) for @lgoix 2020-10-09 10:01:13 +08:00
Kevin Hester
dd6a402ea0 coroutine: wip 2020-10-09 09:10:44 +08:00
Kevin Hester
bed7d8a619 threads: begin change to cooperative threading 2020-10-08 13:32:34 +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
7a4b8cde11 keep rf95 max power at 20 dBm so users don't smoke their boards 2020-10-08 10:51:31 +08:00
Kevin Hester
113859e791 increase sx1272 max power
+#define MAX_POWER 27
 // if we use 20 we are limited to 1% duty cycle or hw might overheat.  For continuous operation set a limit of 17
+// In theory up to 27 dBm is possible, but the modules installed in most radios can cope with a max of 20.  So BIG WARNING
+// if you set power to something higher than 17 or 20 you might fry your board.
2020-10-08 09:57:59 +08:00
Kevin Hester
023f1c24fb RTC: add notion of 'quality' for different time sources
Allow use of mesh based time until a GPS time arrives
2020-10-08 07:46:20 +08:00
Kevin Hester
f00d07baa3 RTC: pull rtc code into own file for cleanup 2020-10-08 07:28:57 +08:00
Kevin Hester
62c228b986 gps: don't stop lock attempts just because the main cpu is sleeping 2020-10-08 06:23:53 +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
bdcd5c3981 allow reporting # sats before we ahve a fix 2020-10-08 06:22:25 +08:00
Kevin Hester
fc82e872d6 don't require gps to have lock before we'll trust GPS time 2020-10-08 05:23:52 +08:00
Kevin Hester
b47c54b5b6 keep lora radio totally unpowered when in deep-sleep 2020-10-07 17:52:44 +08:00
Kevin Hester
c0c83ad389 If we are not supposed to share locations make sure phone doesn't either 2020-10-07 17:46:25 +08:00
Kevin Hester
eca7242a1f fix NRF52 build 2020-10-07 14:00:59 +08:00
Kevin Hester
269f90c510 Force GPS power to zero when in deep sleep 2020-10-07 13:44:17 +08:00
Kevin Hester
7a5832ab8a SX1262: fix serious bug with detecting if we have a rx packet in progress
Could cause hangs on the way into sleep (and enormous power consumption).
Instead of checking for rx packet length (which only changes at completion)
check if we've received preamble bits but haven't yet received a completed
packet interrupt.

notes:


wait to sleep loop problem
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Can not send yet, busyRx
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0

vs normal run
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Starting low level send (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
Completed sending (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
2020-10-07 13:43:51 +08:00
Kevin Hester
044cc26340 #376 use power off command instead of killing gps power per manual 9.5 2020-10-07 11:44:30 +08:00
Kevin Hester
4ccd03623f bug #376: disable the "wake on serial" feature, because it causes
bogus wakes on TBEAMS because the USB->SERIAL chip pulls the RX input
to ground.  This feature is no longer needed because in !isRouter
nodes we force the node to never sleep anyways when on USB power.

    // this doesn't work on TBEAMs when the USB is depowered (causes bogus interrupts)
    // So we disable this "wake on serial" feature - because now when a TBEAM (only) has power connected it
    // never tries to go to sleep if the user is using the API
    // gpio_wakeup_enable((gpio_num_t)SERIAL0_RX_GPIO, GPIO_INTR_LOW_LEVEL);
2020-10-06 14:24:08 +08:00
Kevin Hester
7854a22fbf bug #376 - stop using pmu IRQ - we don't need it and it causes LS wakes 2020-10-06 12:45:19 +08:00
Kevin Hester
943d5cb08d bug #376 we were not staying in light sleep as long as intended 2020-10-06 11:48:53 +08:00
Kevin Hester
7480eb1826 Change to use zeros for timeout values that are 'default' 2020-10-06 09:43:00 +08:00
Kevin Hester
c32c97c389 TBEAM 1.1 has an extra controllable LED - blink that also 2020-10-06 08:20:06 +08:00
BeardyWalrus
b4b1b24c84 always need double press, even if you dont have a screen 2020-10-05 20:13:04 -04:00
Kevin Hester
ef146fc0b5 bug #376 - wip time only mode now works 2020-10-06 06:27:46 +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
736642455f bug #376 wip - we now respect the new gps_operating_mode pref. 2020-10-06 05:34:56 +08:00
Kevin Hester
3c1c11e439 bug #376 wip - we now kill gps power when it is supposed to be asleep 2020-10-05 15:29:26 +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
bacc6caf04 wip gps power fixes #376 2020-10-01 09:17:43 -07:00
geeksville
d66cede7fc Merge branch 'eink' into power 2020-10-01 07:51:01 -07:00
geeksville
3a638090a2 update protos for #376 2020-09-30 07:47:16 -07:00
BeardyWalrus
5150d15997
Merge branch 'master' into master 2020-09-29 19:57:01 -04:00
BeardyWalrus
7d6dbcfa3f Update BluetoothUtil.cpp
fix for #357
use presence of ssd1306 display to set display functionality for bluetooth security.
2020-09-29 19:51:39 -04:00
Kevin Hester
cfb9a600e4
Merge branch 'master' into eink 2020-09-29 14:14:10 -07:00
Jm Casler
423cbc2c6d Added frequency information to debug output (#447) and cleanup of screen.cpp and meshwifi.cpp 2020-09-29 00:59:26 -07:00
geeksville
124a82888d add power testing notes for eink 2020-09-28 17:38:36 -07:00
geeksville
fec7a6bf17 add air530 gps sleep support 2020-09-28 17:04:19 -07:00
geeksville
bc50b39a3b put eink screen to sleep to save power 2020-09-28 16:08:52 -07:00
geeksville
a0fd83428f eink use RESET button as regular button instead 2020-09-28 13:10:27 -07:00
geeksville
e5d4fbb164 fix pins per email eink 2020-09-28 13:03:54 -07:00
Jm Casler
848760e5bf Set device hostname with hardwire ID #445 2020-09-27 00:55:41 -07:00
Jm Casler
5ebac0cd54 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2020-09-26 23:38:22 -07:00
Jm Casler
9b4079317b Give more details of why wifi is disconnected 2020-09-26 23:37:58 -07:00
Jm Casler
fd62edbcab
Merge branch 'master' into master 2020-09-26 18:44:53 -07:00
Jm Casler
b5361ef89f Display gps altitude on display #443 2020-09-26 18:37:51 -07:00
geeksville
648589ed16 translate important parts of the Air530 datasheet to english 2020-09-26 18:16:32 -07:00
geeksville
28ec0e310d make bat voltage sensing work on eink 2020-09-26 18:13:16 -07:00
geeksville
956d9e96f2 Merge branch 'eink' of https://github.com/geeksville/Meshtastic-esp32 into eink 2020-09-26 13:49:54 -07:00
geeksville
266ba03bb7 route debug output back to the CDC-ACM device instead of JLINK 2020-09-26 13:49:22 -07:00