Wykres commitów

5742 Commity (6cf18b7d07e11567b053bb9de2bcfd86c96368dc)

Autor SHA1 Wiadomość Data
Thomas Göttgens 6cf18b7d07 trunk recommended this change ¯\_(ツ)_/¯ 2023-01-21 21:23:24 +01:00
GUVWAF d8e644191b
Merge pull request #2184 from GUVWAF/trunk
Make Trunk happy
2023-01-21 13:27:30 +01:00
GUVWAF bcf24b8187 Make Trunk happy 2023-01-21 13:01:19 +01:00
GUVWAF c628c70db2
Merge pull request #2179 from nukevoid/master
Fix vulnerability with "h.from == 0"
2023-01-21 12:37:50 +01:00
Nukevoid 7f9e638140
Merge branch 'master' into master 2023-01-21 02:18:33 +02:00
a_filonichev 5a2ad03294 Merge branch 'master' of https://github.com/nukevoid/firmware 2023-01-20 23:41:23 +02:00
a_filonichev a584cac827 fix rxGood counter 2023-01-20 23:41:05 +02:00
Thomas Göttgens 8f5338dc85
Merge pull request #2174 from meshtastic/SH1107
Sh1107 support (128x128)
2023-01-20 22:15:02 +01:00
Thomas Göttgens 8c434c7084 Merge branch 'SH1107' of github.com:meshtastic/firmware into SH1107 2023-01-20 21:54:03 +01:00
Thomas Göttgens 88c84dd806 trunk again 2023-01-20 21:53:34 +01:00
Ben Meadors f9f083da51
Merge branch 'master' into SH1107 2023-01-20 14:44:19 -06:00
Nukevoid 481880872c
Merge branch 'master' into master 2023-01-20 19:03:37 +02:00
Thomas Göttgens 0eaf0747f4 fix building other screen adapters 2023-01-20 16:34:39 +01:00
Ben Meadors 9a7121d8c9
Merge pull request #2175 from GUVWAF/printFixes
Fix two print format specifiers
2023-01-20 09:26:39 -06:00
Thomas Göttgens cbd6a0065b trunk format 2023-01-20 15:04:09 +01:00
Thomas Göttgens 50f72b0ea0 add the possibility to #define USE_SH1107 to fix boards to this display. 2023-01-20 15:04:09 +01:00
Thomas Göttgens 74ec5e8a5c add support for 128x128 b/w display GME128128-01-IIC 2023-01-20 15:04:09 +01:00
Thomas Göttgens bec0cda175
Merge branch 'master' into printFixes 2023-01-20 14:32:03 +01:00
a_filonichev 3eaa054c68 Fix vulnerability with "h.from == 0"
// altered packed with "from == 0" can do Remote Node Administration without permission
2023-01-20 01:38:13 +02:00
Thomas Göttgens 48ea836a5c
Merge pull request #2177 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2023-01-19 15:46:06 +01:00
caveman99 fda1e29c4d [create-pull-request] automated change 2023-01-19 14:14:12 +00:00
GUVWAF 836559cda1 Fix two print format specifiers 2023-01-19 15:01:44 +01:00
Thomas Göttgens c04980084a Fix line endings at LF and make windows proto generation work again. needs cygwin64 in path 2023-01-19 14:04:31 +01:00
Thomas Göttgens 111ec56028
Merge pull request #2173 from meshtastic/triple-double
Double click sends ad-hoc position, triple turns off gps
2023-01-19 08:20:53 +01: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
thebentern ee25a488ef [create-pull-request] automated change 2023-01-18 21:12:03 +00: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
thebentern 80f259cc6c [create-pull-request] automated change 2023-01-18 16:19:47 +00: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
thebentern 5189e328b6 [create-pull-request] automated change 2023-01-18 14:57:44 +00: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
thebentern cf39628222 [create-pull-request] automated change 2023-01-18 13:42:53 +00:00
Ben Meadors d7fa8fea8d Update protos path for generator scripts 2023-01-18 07:39:05 -06:00
Sacha Weatherstone db3d66544d
Setup Trunk (#2143)
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2023-01-17 17:35:26 +11:00
Thomas Göttgens d35b619063
Merge pull request #2112 from meshtastic/xmodem-proto
Add Chunked File Transfer to API
2023-01-16 20:36:09 +01:00
Thomas Göttgens 0e51a42ce2
Merge branch 'master' into xmodem-proto 2023-01-16 20:11:02 +01:00
Ben Meadors d5f7d741c3
Merge pull request #2153 from meshtastic/develop
Develop to master
2023-01-16 13:00:15 -06:00