Wykres commitów

7796 Commity (074ccbaa0cf1a25b8f407156206ea5645a5387d6)

Autor SHA1 Wiadomość Data
Thomas Göttgens 074ccbaa0c
Merge branch 'master' into apollo 2024-06-19 21:38:29 +02:00
Thomas Göttgens e780b9a798
Merge pull request #4142 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2024-06-19 21:32:37 +02:00
caveman99 3c4fa2101f [create-pull-request] automated change 2024-06-19 19:31:05 +00:00
Andrew Litt 3765b9f3af
Get apollo3 building again (#4141) 2024-06-19 11:22:35 -05:00
Thomas Göttgens 8fa0911ec8
speed up OLED Display by transferring bigger chunks (#4138) 2024-06-18 15:59:47 -05:00
Thomas Göttgens 5fceab7f0f
Merge pull request #3933 from HarukiToreda/master
Boot issue fix of Cardkb on ESP32
2024-06-17 23:24:42 +02:00
Thomas Göttgens 5cebe4a0a7 trunk fmt 2024-06-17 23:24:27 +02:00
Thomas Göttgens 275e393115
Merge branch 'master' into master 2024-06-17 22:33:54 +02:00
Manuel e7181988b6
Merge pull request #4130 from meshtastic/fix-module-defines
fix for MESHTASTIC_EXCLUDE_INPUTBROKER
2024-06-17 22:17:38 +02:00
mverch67 e822525ce5 more semi colons >_< 2024-06-17 21:23:07 +02:00
mverch67 5e92136ed0 semi colon 2024-06-17 21:19:36 +02:00
mverch67 cd60ee80bd fix wrong include file exclusion 2024-06-17 21:17:25 +02:00
mverch67 9d8a5221a9 fix for MESHTASTIC_EXCLUDE_INPUTBROKER 2024-06-17 20:17:56 +02:00
Thomas Göttgens 30b14c57e7
Merge branch 'master' into master 2024-06-17 17:06:37 +02:00
Thomas Göttgens 7a25e0b69a don't close the wire when we didn't find anything. We might rescan later. 2024-06-17 17:03:32 +02:00
Thomas Göttgens b6066a78c1 WIP 2024-06-17 15:09:38 +02:00
github-actions[bot] 5d2f7d1962
[create-pull-request] automated change (#4127)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
2024-06-17 07:17:36 -05:00
todd-herbert 83f5ba0161
Update OLED ref (#4125)
Upstream changes to the library temporarily reverted to restore debug info frame
2024-06-17 06:14:20 -05:00
Ben Meadors 12b8dc1918
Revert "[create-pull-request] automated change (#4121)" (#4124)
This reverts commit 7afa8107ae.
2024-06-17 06:09:50 -05:00
Thomas Göttgens 00162b4ccf Merge branch 'master' of https://github.com/HarukiToreda/ESP32-CardKB-Fix 2024-06-17 12:01:26 +02:00
Thomas Göttgens ce3be5b4e8
Merge branch 'master' into master 2024-06-17 12:00:16 +02:00
Thomas Göttgens cf2a824cc1 Merge branch 'master' of https://github.com/HarukiToreda/ESP32-CardKB-Fix 2024-06-17 11:52:47 +02:00
Thomas Göttgens 1f214211ba
Merge pull request #4123 from geeksville/pr-nrf52-dap
Add rak4631_dap variant for debugging with NanoDAP debug probe device.
2024-06-17 11:51:38 +02:00
geeksville 96853aeeea
Merge branch 'master' into pr-nrf52-dap 2024-06-16 22:25:58 -07:00
geeksville af36ee3a05 Merge branch 'pr-nrf52-dap' of https://github.com/geeksville/Meshtastic-esp32 into pr-nrf52-dap 2024-06-16 22:24:57 -07:00
geeksville c593e7ce56 Add rak4631_dap variant for debugging with NanoDAP debug probe device.
use board_level = extra
2024-06-16 22:21:54 -07:00
geeksville 15250a566a Turn off vscode cmake prompt - we don't use cmake on meshtastic (#4122) 2024-06-16 22:21:54 -07:00
github-actions[bot] 7afa8107ae
[create-pull-request] automated change (#4121)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
2024-06-16 19:22:51 -05:00
Ben Meadors c2097d38fd
Merge branch 'master' into pr-nrf52-dap 2024-06-16 19:17:30 -05:00
geeksville 163a732ddc
Turn off vscode cmake prompt - we don't use cmake on meshtastic (#4122) 2024-06-16 19:17:19 -05:00
geeksville ea69b999f9 Add rak4631_dap variant for debugging with NanoDAP debug probe device. 2024-06-16 15:19:29 -07:00
Thomas Göttgens 7aea056ac0
exclude debs from release zip 2024-06-16 22:43:16 +02:00
Thomas Göttgens 369d379720
CI is creating the uf2 file during build 2024-06-16 21:08:34 +02:00
Thomas Göttgens 02050a4775
Merge pull request #4117 from beegee-tokyo/master
Add RAKwireless WisMesh Hub (RAK2560/RAK9154)
2024-06-16 20:44:35 +02:00
Thomas Göttgens aca0807acf more try more fix 2024-06-16 20:41:23 +02:00
Thomas Göttgens 4fe281cf7f tryfix linter error 2024-06-16 20:11:58 +02:00
Thomas Göttgens 11c3ca541f add proper RAK variant and change pathspec 2024-06-16 20:03:45 +02:00
Thomas Göttgens ceb884cf18 trunk fmt 2024-06-16 16:29:45 +02:00
beegee-tokyo e546220a80 Merge branch 'master' of https://github.com/beegee-tokyo/firmware 2024-06-16 21:06:43 +08:00
beegee-tokyo f50073ed9f Separate RAK4631 and RAK2560 variants 2024-06-16 21:06:38 +08:00
Ben Meadors 0c45c99b15
Merge branch 'master' into master 2024-06-16 07:39:46 -05:00
Thomas Göttgens abdb7f52bc
Merge pull request #4118 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2024-06-16 14:37:33 +02:00
thebentern 471ee78a5e [create-pull-request] automated change 2024-06-16 12:25:52 +00:00
beegee-tokyo 85d621d9c6 Move RAK9154 to variants, fix json 2024-06-16 19:45:17 +08:00
Thomas Göttgens a453d7f52c Iterate through uint array 2024-06-16 11:59:21 +02:00
Thomas Göttgens ba14ffb8d3 change type to 8 bit uint 2024-06-16 11:59:21 +02:00
Thomas Göttgens 2eb3cfd5e0 change the main scan class so they scan only for wanted bits - UNTESTED 2024-06-16 11:59:21 +02:00
HarukiToreda ce9e63a2cb Added fix for ESP32 2024-06-16 11:59:21 +02:00
Thomas Göttgens dbb254ba7a change the main scan class so they scan only for wanted bits - UNTESTED 2024-06-16 11:59:21 +02:00
HarukiToreda 27bb3506d3 Added fix for ESP32 2024-06-16 11:59:21 +02:00