Commit Graph
100 Commits
Author SHA1 Message Date
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
Ben MeadorsandGitHub a703ab4418 Merge branch 'master' into potential-sx1262-fix 2022-11-26 09:07:59 -06:00
Ben MeadorsandGitHub 63838a1632 Merge branch 'master' into potential-sx1262-fix 2022-11-26 08:19:13 -06:00
Ben MeadorsandGitHub 30d7f188e2 Merge pull request #1991 from meshtastic/develop
Merge develop to master
2022-11-26 08:18:59 -06:00
Ben MeadorsandGitHub 47a47f1e69 Merge branch 'master' into develop 2022-11-26 08:18:35 -06:00
Ben MeadorsandGitHub daac79f314 Merge branch 'master' into potential-sx1262-fix 2022-11-26 08:13:05 -06:00
Ben MeadorsandGitHub 1864216e78 Merge pull request #1992 from lewisxhe/master
Fix the format of t-echo Bluetooth pairing display page
2022-11-26 08:12:55 -06:00
Ben MeadorsandGitHub 71c0cf9b9a Don't set DIO2 switch if TXEN is defined 2022-11-26 08:11:32 -06:00
Ben MeadorsandGitHub ef87ddb798 Merge branch 'master' into master 2022-11-26 07:44:19 -06:00
Ben MeadorsandGitHub 711c748b44 Merge pull request #1986 from IhorNehrutsa/MESSAGES
Some DEBUG_MSG added/changed/commented.
2022-11-26 07:44:12 -06:00
Ben MeadorsandGitHub 10f14d27b7 Merge branch 'master' into MESSAGES 2022-11-26 07:13:20 -06:00
Ben MeadorsandGitHub 5e9d722b7d Merge pull request #1987 from lewisxhe/master
Add t-echo to the operation after the flash operation fails
2022-11-26 06:59:03 -06:00
Ben MeadorsandGitHub b324c04097 Merge branch 'master' into master 2022-11-26 06:44:28 -06:00
Ben MeadorsandGitHub 84a9d95b1f Merge branch 'master' into MESSAGES 2022-11-26 06:43:52 -06:00
Ben MeadorsandGitHub c71e32970c Merge pull request #1982 from meshtastic/master
Master to Develop
2022-11-24 08:07:24 -06:00
Ben MeadorsandGitHub 65e8209d51 Merge pull request #1976 from markbirss/master
M5Stack CoreInk enable buzzer
2022-11-23 14:32:18 -06:00
Ben MeadorsandGitHub aae5247caa Merge pull request #1977 from meshtastic/hotfix-reset-nodedb
Hotfix Add reset nodedb handler back
2022-11-23 14:31:50 -06:00
Ben Meadors 2fedb6b774 Add reset nodedb handler back 2022-11-23 14:12:44 -06:00
Ben MeadorsandGitHub b70c2d088d Merge pull request #1975 from GUVWAF/master
Revert "Override RoutingModule's ACK if on wrong channel"
2022-11-23 13:50:42 -06:00
Ben MeadorsandGitHub 0f4261d02f Merge pull request #1972 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-11-22 07:40:41 -06:00
Ben MeadorsandGitHub 5417671332 Merge pull request #1971 from GUVWAF/master
Cover two ACK/NAK edge cases for admin packets
2022-11-21 18:11:25 -06:00
Ben MeadorsandGitHub 35d7e11678 Merge branch 'master' into master 2022-11-21 16:36:11 -06:00
Ben MeadorsandGitHub 7a63ba827b Merge pull request #1965 from meshtastic/transactional-config-edits
Only save and reboot while a transaction isnt open
2022-11-21 16:12:55 -06:00
Ben MeadorsandGitHub 24244e8474 Update AdminModule.cpp 2022-11-21 12:24:05 -06:00
Ben MeadorsandGitHub fb4f9bdc40 Merge branch 'master' into transactional-config-edits 2022-11-21 12:10:49 -06:00
Ben MeadorsandGitHub 668c46e0cf Merge pull request #1968 from meshtastic/develop
Merge develop upstream
2022-11-21 12:10:14 -06:00
Ben MeadorsandGitHub abf8fdb661 Merge branch 'master' into develop 2022-11-21 09:39:22 -06:00
Ben MeadorsandGitHub a28a04b7a0 Merge pull request #1964 from meshtastic/mqtt-init-defaults
Init default mqtt configurations
2022-11-21 09:39:10 -06:00
Ben MeadorsandGitHub cd9671650b Merge branch 'master' into mqtt-init-defaults 2022-11-21 09:39:05 -06:00
Ben MeadorsandGitHub 00bc762bf1 Merge branch 'master' into develop 2022-11-21 09:38:46 -06:00
Ben MeadorsandGitHub 53cd6bdf15 Merge branch 'master' into develop 2022-11-21 07:35:46 -06:00
Ben MeadorsandGitHub 6a24ef2263 Merge branch 'master' into transactional-config-edits 2022-11-21 07:26:18 -06:00
Ben MeadorsandGitHub 50ba523fb4 Merge branch 'master' into mqtt-init-defaults 2022-11-21 07:14:47 -06:00
Ben Meadors b1ba807ec9 Only save and reboot while a transaction isnt open 2022-11-20 19:50:45 -06:00
Ben MeadorsandGitHub c844f153e1 Merge branch 'master' into mqtt-init-defaults 2022-11-20 15:31:54 -06:00
Ben MeadorsandGitHub 08c4e3fbd6 Merge branch 'master' into mqtt-init-defaults 2022-11-20 12:29:47 -06:00
Ben Meadors 1c5292ac86 Init default mqtt configurations 2022-11-20 12:29:10 -06:00
Ben MeadorsandGitHub aa553ea5d8 Merge pull request #1958 from D4rk4/SAST
Implement automatic static code scan with Semgrep & Flawfinder
2022-11-20 11:10:19 -06:00
Ben MeadorsandGitHub 457538c8f6 Merge branch 'master' into SAST 2022-11-20 08:13:47 -06:00
Ben MeadorsandGitHub da48f0704b Merge pull request #1960 from D4rk4/SEC
Security fixes
2022-11-20 08:05:04 -06:00
Ben Meadors ce16b50d5f Change docker push critera 2022-11-20 07:05:49 -06:00
Ben MeadorsandGitHub 4b7627595a Merge branch 'master' into bug-1821 2022-11-19 20:05:03 -06:00
Ben Meadors 6299e5483b Input boards 2022-11-19 19:39:39 -06:00
Ben Meadors 6118a966a6 Move em up 2022-11-19 19:30:19 -06:00
Ben Meadors 1fac9ee1f2 More reusable workflows 2022-11-19 19:23:35 -06:00
Ben Meadors 1e06b2d51e I think understand now 2022-11-19 18:57:06 -06:00
Ben Meadors f3a6ed9d61 Rename to action 2022-11-19 18:53:42 -06:00
Ben Meadors f71cbb6f6e Move to actions folder 2022-11-19 18:50:50 -06:00
Ben Meadors 23ea22c741 Checkout master first 2022-11-19 18:42:27 -06:00
Ben Meadors 8be65bb0ab Move the checkout 2022-11-19 18:40:17 -06:00
Ben Meadors 57e2e75d24 Add shells 2022-11-19 18:35:00 -06:00
Ben Meadors 29cd7568f5 Try a composite action instead 2022-11-19 18:30:43 -06:00
Ben Meadors 581076a5a1 Now let's take it further 2022-11-19 18:07:07 -06:00
Ben Meadors 27401bb9b8 Remove runs-on 2022-11-19 17:48:01 -06:00
Ben Meadors 10837ce549 With block 2022-11-19 17:45:33 -06:00
Ben Meadors 1dcd411d00 Fix indention 2022-11-19 17:43:18 -06:00
Ben Meadors 0533fd9227 Uses 2022-11-19 17:35:47 -06:00
Ben Meadors 5ce7ffc888 Show contents 2022-11-19 16:51:33 -06:00
Ben Meadors 9e914de995 Try going up a dir 2022-11-19 16:46:36 -06:00
Ben Meadors 0cc653263e Indent 2022-11-19 16:39:05 -06:00
Ben Meadors d2d2f278cf Apparently checkout before using a local workflow 2022-11-19 16:25:00 -06:00
Ben Meadors eb34a95ab7 Why fight me? 2022-11-19 16:23:09 -06:00
Ben Meadors eb1f6c0de6 Root path? 2022-11-19 16:13:26 -06:00
Ben Meadors 8de79e8fb6 Path 2022-11-19 16:08:11 -06:00
Ben Meadors fe00f0c369 Uses block 2022-11-19 16:06:59 -06:00
Ben MeadorsandGitHub f9ee8583b0 Merge pull request #1956 from meshtastic/docker-hub-and-ci-overhaul
Docker hub and ci overhaul
2022-11-19 16:04:21 -06:00
Ben Meadors a4d5f8c717 Reusable workflow 2022-11-19 16:03:55 -06:00
Ben Meadors 35c50f074b Build and push to docker hub 2022-11-19 15:44:59 -06:00
Ben Meadors dcfa226509 Remove extra git submodule update 2022-11-19 15:42:08 -06:00
Ben MeadorsandGitHub 20ee6a509d Remove more targets from checks 2022-11-17 13:35:16 -06:00
Ben Meadors bc1fed0fb4 Merge branch 'bug-1821' of https://github.com/meshtastic/firmware into bug-1821 2022-11-15 16:23:08 -06:00
Ben Meadors b23c364fc0 Test it this way 2022-11-15 16:22:53 -06:00
Ben Meadors 09fe616ac5 This number is a joke 2022-11-13 18:16:40 -06:00
Ben MeadorsandGitHub 2d7ff39ecc Merge pull request #1942 from meshtastic/develop
Develop to Master
2022-11-13 15:42:41 -06:00
Ben MeadorsandGitHub 6e856efd0e Merge branch 'master' into develop 2022-11-13 14:45:48 -06:00
Ben Meadors c3c899bc85 Upstream protos for resolving conflicts 2022-11-13 14:45:26 -06:00
Ben Meadors 916f3cac41 Sync protos 2022-11-13 14:40:18 -06:00
Ben Meadors 9b5f358823 Add new heltec targets 2022-11-13 14:30:32 -06:00
Ben MeadorsandGitHub 22119c272d Merge pull request #1941 from meshtastic/add-heltec-wsl
Add Heltec Wireless Stick Lite V3 support
2022-11-13 14:09:50 -06:00
Ben Meadors 8d4c526d16 Add Heltec Wireless Stick Lite V3 support 2022-11-13 13:28:02 -06:00
Ben MeadorsandGitHub 83aebb7a00 Merge pull request #1940 from meshtastic/add-heltec-v3
Added support for Heltec V3
2022-11-13 10:31:37 -06:00
Ben Meadors 33cd5ce6c1 Cleanup 2022-11-13 09:48:38 -06:00
Ben Meadors f22c2e768e Reorder 2022-11-13 09:47:55 -06:00
Ben Meadors 3d7dea0606 Added support for Heltec V3 2022-11-13 09:45:16 -06:00
Ben Meadors 30a87e3145 Switch to a smaller sample of devices for cppcheck 2022-11-10 07:26:28 -06:00
Ben MeadorsandGitHub 7da1e5c3e8 Merge pull request #1930 from meshtastic/bug-1928
fix #1928 valid NMEA sentences
2022-11-09 18:06:01 -06:00
Ben MeadorsandGitHub 8146e84200 Merge pull request #1926 from GUVWAF/master
Set preamble length back to 32
2022-11-09 14:29:54 -06:00
Ben MeadorsandThomas Göttgens 87c555bde3 Changed retention policy 2022-11-09 14:48:53 +01:00
Ben MeadorsandThomas Göttgens c4951b1236 Build cleanup and update deprecated platformio cmd 2022-11-09 14:48:53 +01:00
Ben MeadorsandGitHub f0279e7f92 Merge pull request #1923 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-11-09 07:33:27 -06:00
Ben MeadorsandGitHub 1a50181ace Merge branch 'master' into create-pull-request/patch 2022-11-09 07:33:02 -06:00
Ben Meadors d77bc239c1 Changed retention policy 2022-11-09 07:20:53 -06:00
Ben Meadors cb283f4c57 Build cleanup and update deprecated platformio cmd 2022-11-09 07:14:08 -06:00
Ben MeadorsandGitHub d9f1704e36 Merge pull request #1921 from meshtastic/update-phoneapi
Updated admin module and protobufs
2022-11-08 15:32:20 -06:00
Ben Meadors 32223a818c Updated admin module and protobufs 2022-11-08 15:04:24 -06:00
Ben MeadorsandGitHub 2331226bb6 Bump version 2022-11-08 07:27:48 -06:00
Ben MeadorsandGitHub 80ff118f0f Merge pull request #1918 from meshtastic/develop
Develop to master
2022-11-08 07:26:14 -06:00
Ben MeadorsandGitHub d6eeda7136 Merge pull request #1917 from meshtastic/master
Master Rollup
2022-11-08 07:25:40 -06:00