5310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Trevor Birss	f08874dd37	Update platformio.ini	2022-11-23 21:24:34 +02:00
Mark Trevor Birss	648054da9b	Add files via upload	2022-11-23 21:19:20 +02:00
GUVWAF	70bf7c490c	Revert "Override RoutingModule's ACK if on wrong channel" ... This reverts commit 71c163a8ee.	2022-11-23 19:27:57 +01:00
Thomas Göttgens	adbed5de95	- fix NTP sync on connect ... - disable extended GPS mode again - add --inline-suppr to cppflags	2022-11-22 17:19:24 +01:00
Thomas Göttgens	fe989f0bff	Merge pull request #1973 from meshtastic/master ... Develop refresh to Master	2022-11-22 17:08:04 +01:00
Thomas Göttgens	679e346bcb	change old field denominator	2022-11-22 16:47:54 +01:00
Thomas Göttgens	832439b336	strange enough _that_ suppression works	2022-11-22 15:56:13 +01:00
Thomas Göttgens	71c2af04ec	why is this working on pio/windows?	2022-11-22 15:03:01 +01:00
Ben Meadors	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
Thomas Göttgens	23466d8eee	yank that dreaded json11 - first try	2022-11-22 14:29:00 +01:00
thebentern	8edbba2180	[create-pull-request] automated change	2022-11-22 00:56:46 +00:00
Ben Meadors	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 Meadors	35d7e11678	Merge branch 'master' into master	2022-11-21 16:36:11 -06:00
Ben Meadors	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
GUVWAF	71c163a8ee	Override RoutingModule's ACK if on wrong channel	2022-11-21 20:43:17 +01:00
GUVWAF	5d8e661807	Send NAK on primary channel if it cannot decode it	2022-11-21 20:43:17 +01:00
Ben Meadors	24244e8474	Update AdminModule.cpp	2022-11-21 12:24:05 -06:00
Ben Meadors	fb4f9bdc40	Merge branch 'master' into transactional-config-edits	2022-11-21 12:10:49 -06:00
Ben Meadors	668c46e0cf	Merge pull request #1968 from meshtastic/develop ... Merge develop upstream	2022-11-21 12:10:14 -06:00
Ben Meadors	abf8fdb661	Merge branch 'master' into develop	2022-11-21 09:39:22 -06:00
Ben Meadors	a28a04b7a0	Merge pull request #1964 from meshtastic/mqtt-init-defaults ... Init default mqtt configurations	2022-11-21 09:39:10 -06:00
Ben Meadors	cd9671650b	Merge branch 'master' into mqtt-init-defaults	2022-11-21 09:39:05 -06:00
Ben Meadors	00bc762bf1	Merge branch 'master' into develop	2022-11-21 09:38:46 -06:00
Thomas Göttgens	9a065bce03	Merge pull request #1970 from meshtastic/caveman99-OLED-FIX ... fix TLora V1 Boards Display Init	2022-11-21 16:37:55 +01:00
Thomas Göttgens	3b2b0bdc97	fix TLora V1 Boards Display Init	2022-11-21 15:50:47 +01:00
Ben Meadors	53cd6bdf15	Merge branch 'master' into develop	2022-11-21 07:35:46 -06:00
Thomas Göttgens	edc97c1c07	Merge branch 'master' of github.com:meshtastic/firmware	2022-11-21 14:28:45 +01:00
Ben Meadors	6a24ef2263	Merge branch 'master' into transactional-config-edits	2022-11-21 07:26:18 -06:00
Ben Meadors	50ba523fb4	Merge branch 'master' into mqtt-init-defaults	2022-11-21 07:14:47 -06:00
Thomas Göttgens	a33325f90f	update web server reference to latest commit	2022-11-21 13:46:22 +01:00
Thomas Göttgens	a173b7159a	Merge pull request #1967 from D4rk4/SAST ... Remove empty workflow file	2022-11-21 09:01:16 +01:00
Thomas Göttgens	91295d3772	Merge branch 'master' of github.com:meshtastic/firmware	2022-11-21 08:50:53 +01:00
Dmitry Galenko	9c1c04a8db	Merge branch 'master' into SAST	2022-11-21 08:14:39 +01:00
Dmitry Galenko	51d0d0d779	Fix empty workflow	2022-11-21 08:13:28 +01:00
Dmitry Galenko	9cdf627ae3	Revert "Fix empty workflow" ... This reverts commit 4b9c482384.	2022-11-21 08:12:52 +01:00
Dmitry Galenko	4b9c482384	Fix empty workflow	2022-11-21 08:10:21 +01:00
Ben Meadors	b1ba807ec9	Only save and reboot while a transaction isnt open	2022-11-20 19:50:45 -06:00
Ben Meadors	c844f153e1	Merge branch 'master' into mqtt-init-defaults	2022-11-20 15:31:54 -06:00
Thomas Göttgens	4a2b02347f	Keymatrix Bugfix: Allow key 3 to send associated text ... Feature: setting a text "~" emulates IO5/Userbutton with keymatrix.	2022-11-20 20:59:48 +01:00
Thomas Göttgens	e8a05d1874	Merge pull request #1947 from meshtastic/bug-1821 ... testing issues with RAK11200/13300	2022-11-20 19:40:52 +01:00
Ben Meadors	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 Meadors	aa553ea5d8	Merge pull request #1958 from D4rk4/SAST ... Implement automatic static code scan with Semgrep & Flawfinder	2022-11-20 11:10:19 -06:00
Thomas Göttgens	a00bd59e27	Merge branch 'master' of github.com:meshtastic/firmware	2022-11-20 18:03:18 +01:00
Thomas Göttgens	f02c6c49ee	Merge branch 'master' into bug-1821	2022-11-20 17:26:42 +01:00
Dmitry Galenko	e54e37a600	Rename security workflows to sec_*	2022-11-20 16:17:58 +01:00
Dmitry Galenko	b95103cab0	Run flawfinder only on push to specific branch	2022-11-20 16:16:04 +01:00
Dmitry Galenko	9b43e49116	Ignore upstream defect	2022-11-20 16:14:32 +01:00
Ben Meadors	457538c8f6	Merge branch 'master' into SAST	2022-11-20 08:13:47 -06:00
Ben Meadors	da48f0704b	Merge pull request #1960 from D4rk4/SEC ... Security fixes	2022-11-20 08:05:04 -06:00