Commit Graph
5360 Commits
Author SHA1 Message Date
Dmitry Galenko 46f1cee2a8 Fix missed braces and etc 2022-12-14 10:21:11 +01:00
Dmitry GalenkoandGitHub 0386af721d Merge branch 'meshtastic:master' into master 2022-12-14 09:45:35 +01:00
Thomas GöttgensandGitHub de6b752db8 Merge pull request #2039 from ghostop14/master
Enable GPS capabilities on heltec V3
2022-12-14 09:38:06 +01:00
Dmitry Galenko 92fd5511ec Disable nRF sleep on discharge 2022-12-14 09:36:25 +01:00
ghostop14 59ec7f31ab Enable GPS capabilities on heltec V3 2022-12-13 12:31:39 -05:00
Ben MeadorsandGitHub 779d2352bd Merge pull request #2037 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-12-12 16:29:39 -06:00
thebenternandGitHub 0162db12b8 [create-pull-request] automated change 2022-12-12 19:23:34 +00:00
Ben MeadorsandGitHub 91ff7b9032 Merge pull request #2036 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-12-12 12:18:06 -06:00
thebenternandGitHub 643f99f577 [create-pull-request] automated change 2022-12-12 18:06:11 +00:00
Ben MeadorsandGitHub 152288b4cc Merge pull request #2025 from meshtastic/power-fsm-experiment
Power FSM experiment
2022-12-12 12:01:00 -06:00
Ben Meadors 45b518baf2 Move sds transition back into esp32 only 2022-12-12 10:24:51 -06:00
Ben MeadorsandGitHub 0c65c73f90 Merge branch 'master' into power-fsm-experiment 2022-12-09 19:50:26 -06:00
Thomas Göttgens 0f0dbc3274 reboot nrf52 on critical error 8 2022-12-09 11:18:43 +01:00
Thomas GöttgensandGitHub 06d34daeab Merge branch 'master' into power-fsm-experiment 2022-12-08 10:18:01 +01:00
Thomas GöttgensandGitHub ba1f68d758 Merge pull request #2027 from lewisxhe/master
Fix the charging parmas error of tbeam-s3core and change the default USB mode
2022-12-06 16:39:38 +01:00
Thomas GöttgensandGitHub d4c0977a70 Merge branch 'master' into master 2022-12-06 15:49:32 +01:00
Thomas GöttgensandGitHub 1a19d71e95 Merge pull request #2023 from meshtastic/2022-bug-recording-critical-error-11-at-srcmeshradiolibinterfacecpp389
Add debug output
2022-12-06 15:48:57 +01:00
Thomas GöttgensandGitHub 21c10934fc Merge pull request #2018 from arduionoGP/patch-3
Update MQTT.cpp
2022-12-06 15:47:30 +01:00
Thomas GöttgensandGitHub 13cca91097 Merge branch 'master' into patch-3 2022-12-06 14:09:29 +01:00
Thomas GöttgensandGitHub b335b1c66b Merge branch 'master' into 2022-bug-recording-critical-error-11-at-srcmeshradiolibinterfacecpp389 2022-12-06 14:08:48 +01:00
Thomas GöttgensandGitHub cc2653bfb5 Merge pull request #2029 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-12-06 14:05:51 +01:00
caveman99andGitHub fc5bf5a68f [create-pull-request] automated change 2022-12-06 13:03:26 +00:00
lewishe 63d7338311 fix tbeams3-core PMU charging cut-off voltage 2022-12-06 11:01:14 +08:00
lewishe 37f716d27b Change tbeams3-core the default USB mode to TinyUSB 2022-12-06 10:58:59 +08:00
Ben Meadors 0f2a835359 Remove hard coded !isPowered 2022-12-05 10:13:19 -06:00
Thomas Göttgens 2a84d39e40 Always do battery resampling if we use the ADC. Improves reading a lot. 2022-12-05 16:40:23 +01:00
Ben Meadors b14289e976 More cleanup 2022-12-05 08:35:54 -06:00
Ben Meadors 1fef6f0656 Clean up on battery shutdown condition 2022-12-05 07:37:01 -06:00
Thomas Göttgens 183ec2124f Add debug output 2022-12-05 11:48:46 +01:00
Ben Meadors aeb9bfa063 Return false 2022-12-04 20:41:00 -06:00
arduinoGPandGitHub b84c7ae49b Oops, added time to the Pos 2022-12-04 19:41:58 -05:00
Thomas GöttgensandGitHub 61598c5942 Merge pull request #2020 from meshtastic/serial-textmessage
Serial textmessage mode
2022-12-04 23:53:29 +01:00
Ben Meadors a3a24e0216 Don't put newlines in the text buffer 2022-12-04 16:03:57 -06:00
Ben Meadors 31ec2da0e9 Text message mode for serial 2022-12-04 15:40:28 -06:00
arduinoGPandGitHub 27a10b395f Update MQTT.cpp
(First real try at writing meaningful C++ but it seems to work.)
Allows sending JSON Position data from MQTT broker for broadcast to a LORA mesh via gateway device.
The new type is "sendposition". Valid envelope looks like:
{
    "sender": "someSender",
    "type": "sendposition",
    "payload": {
        "latitude_i": 399600000,
        "longitude_i": -862600000,
        "altitude": 100
    }
}
This complements the "sendtext" type envelope.
2022-12-04 00:00:43 -05:00
Ben Meadors 7570cdbd22 Fix shell scripts for both linux and darwin 2022-12-03 08:24:11 -06:00
Thomas GöttgensandGitHub c857474116 Merge pull request #2013 from arduionoGP/patch-2
Update MQTT.cpp
2022-12-01 22:17:35 +01:00
arduinoGPandGitHub 8ff5dacc3c Update MQTT.cpp
case Portnum_POSITION_APP adjusted so the various options allways get encoded into JSON as long as lat and long are present. There are circumstances where timestamp, time, or altitude might be missing and this causes silent failures of JSON encoding..
2022-12-01 15:44:47 -05:00
Ben Meadors f1179d31ba Fixed shell scripts 2022-11-27 07:40:40 -06:00
Ben MeadorsandGitHub abe60b96f1 Merge pull request #2001 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-11-27 06:11:39 -06:00
thebenternandGitHub 206520f179 [create-pull-request] automated change 2022-11-27 02:16:21 +00:00
Ben MeadorsandGitHub 97fd5cf2ab Merge pull request #2000 from meshtastic/develop
Develop upstream
2022-11-26 19:16:24 -06:00
Ben MeadorsandGitHub d13a095516 Merge pull request #1990 from GUVWAF/develop
Send 'ACK' response for handled admin message
2022-11-26 19:15:36 -06:00
Ben MeadorsandGitHub 4dc7d92cf1 Merge pull request #1999 from meshtastic/master
Fix conditional syntax
2022-11-26 15:09:56 -06:00
Ben Meadors e7dbbeb606 Fix conditional syntax 2022-11-26 14:50:07 -06:00
GUVWAFandGitHub 3e892fc391 Merge branch 'meshtastic:develop' into develop 2022-11-26 21:14:52 +01:00
Ben MeadorsandGitHub dfec37dfd0 Merge pull request #1996 from meshtastic/master
Develop downstream
2022-11-26 12:59:54 -06:00
Ben MeadorsandGitHub b82ab34f85 Merge pull request #1993 from meshtastic/potential-sx1262-fix
Don't set DIO2 switch if TXEN is defined
2022-11-26 12:59:02 -06:00
Ben MeadorsandGitHub 18a2cfeda4 Merge branch 'master' into potential-sx1262-fix 2022-11-26 10:18:14 -06:00
Thomas Göttgens 082aa07e7f update batch scripts to further check filename. 2022-11-26 17:00:33 +01:00