Wykres commitów

2603 Commity (bae1d7a8948b223c31c4cc149a5e1643db1f874a)

Autor SHA1 Wiadomość Data
Vadim Furman 7491af8ad7 Merge remote-tracking branch 'origin/master' 2021-03-19 17:07:16 -07:00
Kevin Hester fce95431e6
Merge pull request #746 from geeksville/dev1.2
fixing bugs for the sat release
2021-03-19 23:47:12 +08:00
Kevin Hester 591a07c0fe 1.2.11 2021-03-19 23:41:28 +08:00
Kevin Hester c410f2d151 fix tlora 1.6 build 2021-03-19 23:40:41 +08:00
Kevin Hester 9502fa62e6 todo updates 2021-03-19 23:40:24 +08:00
Kevin Hester 2a6480ec48 update release test scripts 2021-03-19 23:40:04 +08:00
Kevin Hester 7c5ab885be geeksville todo 2021-03-19 15:24:24 +08:00
Kevin Hester 21cfb151a8 specify clang for c++ formatting conventions 2021-03-19 15:24:05 +08:00
Kevin Hester 84505b1717 Merge remote-tracking branch 'root/master' into portduino 2021-03-19 15:22:56 +08:00
Kevin Hester d735e3006e
Merge pull request #745 from geeksville/portduino
add CI integration test using meshtastic-native
2021-03-18 19:59:27 +08:00
Kevin Hester af5d82dbde Merge remote-tracking branch 'root/master' into portduino 2021-03-18 19:49:13 +08:00
Kevin Hester a97072eca0 add first integration test for CI 2021-03-18 19:48:06 +08:00
Kevin Hester cef6e248e7 add newline 2021-03-18 19:40:00 +08:00
Kevin Hester b4c379f5fc add sim exit cmd 2021-03-18 19:09:31 +08:00
Jm 3bb1206b9c Update RangeTestPlugin.md 2021-03-17 22:47:19 -07:00
Jm 002532401d #743 - Stub out for "mode 10" - NMEA string. 2021-03-17 21:52:30 -07:00
Jm Casler 8957c5892f
Merge pull request #77 from meshtastic/master
update from head
2021-03-17 21:08:50 -07:00
Jm 1b8f41d353 Partial work on s&f 2021-03-17 21:03:11 -07:00
Vadim Furman 0c51cc3738 Fix hardware model 2021-03-17 10:56:45 -07:00
Vadim Furman 2b9a8f0822 Merge remote-tracking branch 'origin/master' 2021-03-17 10:49:04 -07:00
Vadim Furman ddcfff3b59 Fixed compilation on nrf52 and brownout code 2021-03-17 10:44:42 -07:00
Kevin Hester 449a3959b0
Merge pull request #742 from geeksville/portduino
wifi now works on portduino
2021-03-17 20:43:47 +08:00
Kevin Hester 719a0c485b Merge remote-tracking branch 'root/master' into portduino 2021-03-17 20:30:41 +08:00
Kevin Hester a4bbdc443f
Merge pull request #739 from geeksville/dev
Dev
2021-03-17 20:30:25 +08:00
Kevin Hester 999afdf05e wifi now works on portduino 2021-03-17 20:29:27 +08:00
Kevin Hester f492f6deb6 progress on Wifi in portduino 2021-03-15 19:59:31 +08:00
Kevin Hester 60f7ec8998 setup for intellij 2021-03-15 13:55:08 +08:00
Kevin Hester 469d0ade72 remove old intellij defs 2021-03-15 13:49:21 +08:00
Kevin Hester 1f33b03c30 turn off broken genieblocks_lora build 2021-03-15 13:43:22 +08:00
Kevin Hester 351be2f327 change portduino so it has a higher chance of building on OS-X and windows 2021-03-15 13:09:52 +08:00
Kevin Hester 3f401e8cac Merge branch 'dev' into portduino
# Conflicts:
#	.vscode/settings.json
2021-03-15 12:09:07 +08:00
Vadim Furman b20b21c553 pitches.h no more 2021-03-14 20:46:58 -07:00
Vadim Furman c62863b1dc Merge from origin 2021-03-14 19:42:57 -07:00
Vadim Furman 8505a0f260 Chargeing... 2021-03-14 19:17:28 -07:00
Vadim Furman 98d878cdfe Port to lora_isp4520 board 2021-03-14 19:00:20 -07:00
Jm Casler 6730731652
Merge pull request #76 from meshtastic/master
Update from head
2021-03-14 11:32:38 -07:00
Kevin Hester 27c35f69aa Fix flash flippy-flop error after commandline update (thanks @Stephen304) 2021-03-14 12:41:31 +08:00
Kevin Hester 53671283ae change hw_model_deprecated to intentionally break old apps 2021-03-14 10:57:26 +08:00
Kevin Hester d9fc7b32c3 move hw_model into User 2021-03-14 10:48:20 +08:00
Kevin Hester 9a03536e3d Use enums for hw_model per @sachaw idea. 2021-03-14 10:37:32 +08:00
Kevin Hester efebb8bb0b remove country from rom support 2021-03-14 10:13:28 +08:00
Kevin Hester 3bd1ae0be4 Merge remote-tracking branch 'root/master' into dev 2021-03-13 14:11:31 +08:00
Kevin Hester a07291d904 cleanup external notification plugin 2021-03-13 13:32:23 +08:00
Kevin Hester c0ac457cad lockdown plugins that touch hardware 2021-03-13 13:14:27 +08:00
Kevin Hester 6813a31895 fix hop limit defaults for android 2021-03-13 09:27:44 +08:00
Kevin Hester 8f5251583f
Merge pull request #738 from geeksville/eink
Eink
2021-03-13 09:00:57 +08:00
Kevin Hester c2122a6859 Merge remote-tracking branch 'root/master' into eink 2021-03-13 08:55:06 +08:00
Kevin Hester 6dd65adebd 1.2.10 2021-03-13 08:54:02 +08:00
Kevin Hester c227143b53 @mc-hamster, I think storeandforward was accidentally wrong (no worries though) 2021-03-13 08:41:50 +08:00
Kevin Hester cdd696c1ff todo updates 2021-03-13 08:30:07 +08:00