Commit graph

1296 commits

Author SHA1 Message Date
Garth Vander Houwen d6f6123ddd
Merge branch 'master' into ota-update 2023-07-08 14:42:23 -07:00
Mark Trevor Birss 8a16e6e372
Update trademark-grants.mdx 2023-07-08 18:24:49 +02:00
Ben Lipsey 8bf45c644b
Merge branch 'master' into ota-update 2023-07-07 08:19:35 -07:00
pdxlocations 3e29ff61fb a bit of clarification 2023-07-07 08:18:15 -07:00
charminULTRA 8ec63c4bde
Merge branch 'master' into canned-messages-update 2023-07-07 10:51:11 -04:00
pdxlocations f40700805d remove extra space 2023-07-06 22:51:56 -07:00
pdxlocations 8e2ee9ef08 add options to summary and move active 2023-07-06 22:51:08 -07:00
pdxlocations 8cfb3618f0 correct options and commands 2023-07-06 15:53:30 -07:00
charminULTRA 716799761c
Merge branch 'master' into audio-config 2023-07-06 16:13:55 -04:00
Ben Meadors 8891c545a6
Merge branch 'master' into ota-update 2023-07-06 15:13:11 -05:00
Ben Meadors bde79b17f8
Merge branch 'master' into trademark-grants 2023-07-06 15:12:26 -05:00
pdxlocations 3633302b97 add Ben Lipsey 2023-07-06 12:57:16 -07:00
charminULTRA bfcb89b4ee
Merge branch 'master' into audio-config 2023-07-06 15:25:52 -04:00
charminULTRA ab537fb59f
Merge branch 'master' into user-config 2023-07-06 15:18:49 -04:00
pdxlocations 51df9c8175 fix cli examples 2023-07-06 11:57:01 -07:00
pdxlocations 65a77b1ea0 fix audio enabled command 2023-07-06 11:54:07 -07:00
charminULTRA 10a237b577
Merge branch 'master' into power-config 2023-07-06 14:01:35 -04:00
charminULTRA 5dd5bd1d0f
Merge branch 'master' into ota-update 2023-07-06 10:08:14 -04:00
pdxlocations bd629bd593 default tab to apple 2023-07-05 23:56:14 -07:00
pdxlocations 4fdfa015e5 nrf52 OTA documentation framework 2023-07-05 23:29:29 -07:00
pdxlocations a549cc0b79 fix cli ls_secs default value 2023-07-05 22:10:45 -07:00
pdxlocations 2013a4f908 update apple config options 2023-07-05 21:30:06 -07:00
charminULTRA 9361a6db07
Merge branch 'master' into power-config 2023-07-05 20:37:50 -04:00
pdxlocations bef945f185 add ina address to summary 2023-07-05 16:19:37 -07:00
pdxlocations d92e916e51 position updates and corrections 2023-07-05 14:01:30 -07:00
charminULTRA f9287188ea
Merge branch 'master' into network-config 2023-07-05 13:58:42 -04:00
pdxlocations ca9895fbb9 network config avail on apple OS's 2023-07-05 07:18:25 -07:00
Ben Meadors 19a5ff8741
Merge pull request #688 from pdxlocations/test-serial-01
Update Mac System Report path and replace Windows 'fixme'
2023-07-05 06:56:12 -05:00
Ben Meadors c6f2f0e958
Merge branch 'master' into lora-config 2023-07-05 06:55:25 -05:00
Ben Meadors 21a855f4c4
Merge branch 'master' into serial-adapter-01 2023-07-05 06:05:20 -05:00
Ben Meadors 6ee94d3df6
Merge branch 'master' into lora-config 2023-07-05 06:05:00 -05:00
Ben Meadors 5f60e4f6f7
Merge branch 'master' into channel-configuration-01 2023-07-05 05:59:01 -05:00
Ben Meadors 629e2d6aa9
Merge branch 'master' into network-config 2023-07-05 05:58:37 -05:00
Ben Meadors 0f38b064ad
Merge branch 'master' into flashing-esp32-cli 2023-07-05 05:57:32 -05:00
Ben Lipsey 3ec7a0eebd
Merge branch 'master' into serial-adapter-01 2023-07-04 23:48:38 -07:00
pdxlocations e80b1ebd69 options back to values 2023-07-04 23:47:11 -07:00
pdxlocations f072e557dc 's and add cli commands 2023-07-04 23:26:25 -07:00
pdxlocations 9b792d90c7 reword config options to match nav order 2023-07-04 22:36:44 -07:00
pdxlocations cc5cdabf0b update platform options 2023-07-04 22:28:28 -07:00
pdxlocations e27b0626c5 add config options 2023-07-04 22:04:11 -07:00
charminULTRA ce227a7b53
Merge branch 'master' into canned-messages-youtube 2023-07-04 23:51:40 -04:00
charminULTRA 658117c8f8
Merge branch 'master' into community-guide 2023-07-04 23:48:01 -04:00
charminULTRA f83cc1635a
Merge branch 'master' into display-config 2023-07-04 23:41:54 -04:00
charminULTRA 1fa1987408
Merge branch 'master' into update-bluetooth 2023-07-04 18:11:38 -04:00
charminULTRA 1ca8214267
Merge branch 'master' into remove-gui-flasher 2023-07-04 18:06:00 -04:00
charminULTRA 7f360f31c1
Merge branch 'master' into update-bluetooth 2023-07-04 18:05:35 -04:00
charminULTRA 2457d83e27
Merge branch 'master' into update-bluetooth 2023-07-04 17:59:08 -04:00
charminULTRA f2b8707099
Merge branch 'master' into nRF52-erase 2023-07-04 17:59:00 -04:00
charminULTRA 82f347fb6f
Merge branch 'master' into remove-gui-flasher 2023-07-04 17:05:10 -04:00
charminULTRA abecd8a78c
Merge branch 'master' into update-bluetooth 2023-07-04 16:59:51 -04:00