kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity
5,752 Commits 1 Branch 0 Tags
8aab63dace4683cf641fe1bfec8ea2b6e2f75b29
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Meadors f9f083da51 Merge branch 'master' into SH1107 2023-01-20 14:44:19 -06:00
Ben Meadors 9a7121d8c9 Merge pull request #2175 from GUVWAF/printFixes 
Fix two print format specifiers
 2023-01-20 09:26:39 -06:00
Ben Meadors 384eac9a87 Format plz 2023-01-18 21:13:31 -06:00
Ben Meadors 6a5e0edb60 Double click sends ad-hoc position, triple turns off gps 2023-01-18 21:02:45 -06:00
Ben Meadors 4cfedc4b57 Kill it and grill it 2023-01-18 16:34:21 -06:00
Ben Meadors cd57df3f4f Update main_matrix.yml 2023-01-18 16:18:01 -06:00
Ben Meadors 6c41960919 Remove simulator for now 2023-01-18 15:55:58 -06:00
Ben Meadors 48609b5bdd Merge pull request #2170 from meshtastic/device-metadata-enhanced 
Add role and position flags to metadata
 2023-01-18 15:16:40 -06:00
Ben Meadors dad8e2bf6a Merge branch 'master' into device-metadata-enhanced 2023-01-18 15:16:20 -06:00
Ben Meadors 9cda2e9058 Add role and position flags to metadata 2023-01-18 15:15:02 -06:00
Ben Meadors 72dad37138 Merge pull request #2169 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-18 15:12:44 -06:00
Ben Meadors 9046dacec8 I don't like this formatting but I need trunk to STFU 2023-01-18 14:51:48 -06:00
Ben Meadors b218ea9ec7 Hopefully ignore generated files 2023-01-18 11:04:06 -06:00
Ben Meadors 6f70d39bae Merge pull request #2166 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-18 10:22:33 -06:00
Ben Meadors 36b3bf2211 Strip namspace prefix 2023-01-18 10:16:15 -06:00
Ben Meadors 92525587e1 Merge pull request #2164 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-18 09:00:17 -06:00
Ben Meadors 4d4af7de59 generated paths experiment 2023-01-18 08:56:47 -06:00
Ben Meadors 1b932c6bbe Fix scripts patch and remove files in previous dir 2023-01-18 07:53:19 -06:00
Ben Meadors 4065fb1709 Merge pull request #2162 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-18 07:43:35 -06:00
Ben Meadors d7fa8fea8d Update protos path for generator scripts 2023-01-18 07:39:05 -06:00
Ben Meadors d5f7d741c3 Merge pull request #2153 from meshtastic/develop 
Develop to master
 2023-01-16 13:00:15 -06:00
Ben Meadors cc0cccbd1b Coerce int 2023-01-16 12:26:10 -06:00
Ben Meadors 6c388e0da8 Merge branch 'master' into develop 2023-01-16 11:10:08 -06:00
Ben Meadors 34b2d51113 Patch locked_to 2023-01-16 11:05:36 -06:00
Ben Meadors a4d3fa55db Remove HAS_GPS for WSLv3 2023-01-16 14:54:50 +01:00
Ben Meadors 7e27729dae Remove HAS_GPS for WSLv3 2023-01-15 08:24:20 -06:00
Ben Meadors d49f19a67c Merge pull request #2137 from meshtastic/cherrypick-serialfix 
re-merge fixes by @lesykm
 2023-01-12 12:16:53 -06:00
Ben Meadors 5520d68b34 Merge pull request #2136 from meshtastic/serial-fix 
re-merge fixes by @lesykm
 2023-01-12 12:16:40 -06:00
Ben Meadors a3636ae8a1 Merge pull request #2133 from meshtastic/master 
Master downstream merge
 2023-01-12 10:22:56 -06:00
Ben Meadors 7936c7c8ae Remove the D! 2023-01-12 10:07:17 -06:00
Ben Meadors 2f3f19fda7 Merge pull request #2132 from meshtastic/develop 
Remove DEBUG_HEAP flag from esp32 pio config on release
 2023-01-12 09:37:33 -06:00
Ben Meadors c89ca50cc4 Remove DEBUG_HEAP flag from esp32 pio config on release 2023-01-12 09:33:55 -06:00
Ben Meadors 28b1616630 Merge pull request #2131 from meshtastic/develop 
Develop to master for 2.0.13 release candidate
 2023-01-12 08:37:11 -06:00
Ben Meadors f905763161 Merge pull request #2129 from meshtastic/nice-duty-cycle 
Chance calculation for Nice TX. Still same value but dynamically based on duty cycle.
 2023-01-12 07:20:29 -06:00
Ben Meadors e3fd17772d Merge pull request #2127 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-11 19:40:51 -06:00
Ben Meadors cf0fb13a12 Merge pull request #2126 from GUVWAF/TxAirLim 
Don't send NodeInfo and DeviceTelemetry at high Tx air utilization
 2023-01-11 19:26:40 -06:00
Ben Meadors d7a71e46aa Merge pull request #2125 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-11 14:36:10 -06:00
Ben Meadors a354cebd88 Update protos ref 2023-01-11 14:28:10 -06:00
Ben Meadors 97680ca730 Merge pull request #2123 from meshtastic/time 
Allow time from phone to be sent to the mesh
 2023-01-11 09:11:45 -06:00
Ben Meadors 17a2589b35 Allow time from phone to be sent to the mesh 2023-01-11 07:50:07 -06:00
Ben Meadors 1f6a8eae86 Merge pull request #2121 from GUVWAF/NAKtoAPI 
Send NAK to API only upon duty cycle limit
 2023-01-10 14:20:51 -06:00
Ben Meadors 713f7d5996 Turn of 3.3v rail on RAK-4631 on shutdown 2023-01-10 07:36:19 -06:00
Ben Meadors e7d425ef6e Until we figure out what's going on 2023-01-09 16:19:42 -06:00
Ben Meadors 57f185c26b Merge pull request #2104 from meshtastic/hydra-gps 
Hydra gps troubleshooting
 2023-01-07 14:51:46 -06:00
Ben Meadors f4099261df Hydra gps troubleshooting 2023-01-06 15:04:11 -06:00
Ben Meadors 09efbb75b1 Merge pull request #2099 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-04 11:22:59 -06:00
Ben Meadors b544163c3f Merge pull request #2095 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-03 19:25:51 -06:00
Ben Meadors 8914d1a184 Merge pull request #2094 from meshtastic/yank-mqtt-queue 
Yank mqtt service envelope queue
 2023-01-03 15:46:50 -06:00
Ben Meadors 42b24d4510 Yank mqtt service envelope queue 2023-01-03 14:32:28 -06:00
Ben Meadors d750109d00 Merge pull request #2093 from meshtastic/develop 
Merge develop to master
 2023-01-03 13:55:24 -06:00
Ben Meadors 7f0a8d329f Merge pull request #2092 from meshtastic/develop-2-master 
Develop -> Master merge branch
 2023-01-03 12:53:35 -06:00
Ben Meadors e0002ef2d5 Merge remote-tracking branch 'origin/master' into develop-2-master 2023-01-03 11:34:53 -06:00
Ben Meadors 021fc8235c Renamed eth_mode to address_mode 2023-01-03 06:24:47 -06:00
Ben Meadors 0305c7394f Merge pull request #2089 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2023-01-03 06:22:21 -06:00
Ben Meadors b55fe549e3 Update CI badge 2022-12-31 20:10:44 -06:00
Ben Meadors 69ff724f0f Merge pull request #2081 from meshtastic/log-levels 
Created more structured enterprisey logging with levels
 2022-12-30 11:30:23 -06:00
Ben Meadors 3d3aba584e Include 2022-12-30 10:56:57 -06:00
Ben Meadors ef1fb877ba Prefix log levels 2022-12-30 10:47:31 -06:00
Ben Meadors f1cdfd163d Replaced all of the logging with proper log levels 2022-12-30 10:27:07 -06:00
Ben Meadors 8193215294 Trace 2022-12-30 08:14:37 -06:00
Ben Meadors 3eefd46ca1 Log levels log function 2022-12-30 07:48:59 -06:00
Ben Meadors 0b5cae5393 Log levels refactoring 2022-12-29 20:41:37 -06:00
Ben Meadors be91b08b3e Missed one 2022-12-29 18:49:40 -06:00
Ben Meadors c7c5671cca More disables 2022-12-29 18:48:33 -06:00
Ben Meadors 979d12d607 Here we go 2022-12-29 16:59:52 -06:00
Ben Meadors 110c80d045 Make disable return an int32_t for runOnce usage 2022-12-29 16:54:39 -06:00
Ben Meadors 38a1315599 Refactor OSThread consumers to use disable() 2022-12-29 16:26:25 -06:00
Ben Meadors 8ebe0edc5a Merge pull request #2075 from meshtastic/load-save-proto 
add storage for ringtone
 2022-12-29 15:50:16 -06:00
Ben Meadors 96c272d3d1 Merge pull request #2077 from meshtastic/remotehardware-config 
add RemoteHardware (and the missing S&F config)
 2022-12-29 15:33:47 -06:00
Ben Meadors e09b12ca58 Merge pull request #2072 from meshtastic/hotfix-01 
Hotfix for user button not working
 2022-12-29 06:22:58 -06:00
Ben Meadors f632933b93 Merge pull request #2069 from GUVWAF/wantAckDM 
Flood ACKs on DM back to original sender
 2022-12-28 08:00:52 -06:00
Ben Meadors 28b954017f Copy pasta 2022-12-22 14:55:32 +01:00
Ben Meadors 16d826d6c7 Move to upstream espressif arduino 2022-12-22 14:55:32 +01:00
Ben Meadors 090e1660fe Merge pull request #2053 from meshtastic/upstream-heltec 
Move to upstream espressif arduino
 2022-12-21 07:47:27 -06:00
Ben Meadors 92c9b34d4f Copy pasta 2022-12-21 07:46:59 -06:00
Ben Meadors 3f50371ff3 Merge branch 'master' into upstream-heltec 2022-12-21 07:45:18 -06:00
Ben Meadors 815f9bfc5f Move to upstream espressif arduino 2022-12-21 07:41:26 -06:00
Ben Meadors 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
Ben Meadors 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
Ben Meadors 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 Meadors 0c65c73f90 Merge branch 'master' into power-fsm-experiment 2022-12-09 19:50:26 -06:00
Ben Meadors 0f2a835359 Remove hard coded !isPowered 2022-12-05 10:13:19 -06: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
Ben Meadors aeb9bfa063 Return false 2022-12-04 20:41:00 -06: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
Ben Meadors b1f3e117d1 Merge pull request #2015 from meshtastic/master 
Fix shell scripts for both linux and darwin
 2022-12-03 08:25:29 -06:00
Ben Meadors 7570cdbd22 Fix shell scripts for both linux and darwin 2022-12-03 08:24:11 -06:00
Ben Meadors 1787e2c775 Merge pull request #2014 from meshtastic/master 
Downstream
 2022-12-02 06:38:41 -06:00
Ben Meadors f1179d31ba Fixed shell scripts 2022-11-27 07:40:40 -06:00
Ben Meadors 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
Ben Meadors 97fd5cf2ab Merge pull request #2000 from meshtastic/develop 
Develop upstream
 2022-11-26 19:16:24 -06:00
Ben Meadors d13a095516 Merge pull request #1990 from GUVWAF/develop 
Send 'ACK' response for handled admin message
 2022-11-26 19:15:36 -06:00
Ben Meadors 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
Ben Meadors dfec37dfd0 Merge pull request #1996 from meshtastic/master 
Develop downstream
 2022-11-26 12:59:54 -06:00
Ben Meadors 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 Meadors 18a2cfeda4 Merge branch 'master' into potential-sx1262-fix 2022-11-26 10:18:14 -06:00