Wykres commitów

3213 Commity (f1c029d6dad9183584adc9791df8ed0650a361b7)

Autor SHA1 Wiadomość Data
Jm Casler f1c029d6da updating proto submodule to latest 2021-12-28 23:33:12 -08:00
Jm Casler a2883789d1 updating proto submodule to latest 2021-12-28 23:29:30 -08:00
Jm Casler c1abe84abc
Merge pull request #1024 from mc-hamster/master
Attempt to update esp8266-oled-ssd1306 (Attempt didn't work, this contains cleanup)
2021-12-28 17:25:37 -08:00
Jm Casler f3427084c2
Merge branch 'meshtastic:master' into master 2021-12-28 16:41:09 -08:00
Jm Casler 638d43a341 Roll back oled update 2021-12-28 16:40:53 -08:00
Ben Meadors 1063415292
Remove networking operations from presentation layer (#1033)
* Remove networking operations from presentation layer
2021-12-28 14:17:56 -06:00
Ben Meadors a70b849039
Changed getMacAddr behavior (#1017) 2021-12-28 11:20:45 -06:00
Jm Casler 33769b8657
Merge pull request #1031 from linagee/master
Ham, not HAM
2021-12-27 21:34:13 -08:00
linagee a534eae43c
Grammar. 2021-12-27 21:21:56 -07:00
linagee 5a22b49a24
Ham, not HAM
Originally discovered in 1ffa55d39a

https://www.kb6nu.com/ham-ham-radio-ham-radio-amateur-radio/#:~:text=Of%20course%20either%20term%20may,be%20avoided%20at%20all%20costs.
2021-12-27 21:18:10 -07:00
riddick 06a6f75f00
Update device-install.sh (#1029)
fix for #911

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2021-12-27 18:01:21 -06:00
Thomas Göttgens bea9dfff38
CI/CD for building on GitLab instance (#1028)
This yml is basically a wrapper for build-all.sh that makes sure the submodules are checked out and pushes a release package to the gitlab registry. Not needed for building on github!

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2021-12-27 14:25:08 -06:00
Jm Casler 2818dfc948
Merge pull request #1030 from mc-hamster/StoreAndForward
Support for MeshPacket_Delayed_DELAYED_BROADCAST
2021-12-27 10:03:36 -08:00
Jm Casler f521878308
Merge branch 'meshtastic:master' into StoreAndForward 2021-12-27 10:03:09 -08:00
Jm Casler 648e8bb5e1 Support for MeshPacket_Delayed_DELAYED_BROADCAST 2021-12-27 10:02:43 -08:00
Jm Casler 6907cb192e
Merge pull request #1027 from mc-hamster/StoreAndForward
S&F - Add support for secondary channels that don't have their own PSK & Update broadcast address to NODENUM_BROADCAST
2021-12-26 16:20:12 -08:00
Jm Casler 988f8c4d23
Merge branch 'master' into StoreAndForward 2021-12-26 15:53:54 -08:00
Jm Casler 4a3bdb284d
Merge pull request #1026 from mc-hamster/wifi
Apply formatting to wifi related sections
2021-12-26 15:53:42 -08:00
Jm Casler efdd2ad490 Apply formatting to S&F 2021-12-26 15:51:27 -08:00
Jm Casler 228be41ba6
Merge branch 'meshtastic:master' into StoreAndForward 2021-12-26 15:49:52 -08:00
Jm Casler 5432d3d44b
Merge branch 'meshtastic:master' into wifi 2021-12-26 15:48:18 -08:00
Jm Casler e77cbd0588 Apply formatting to wifi related sections 2021-12-26 15:46:23 -08:00
Jm Casler 072707c77e Update esp8266-oled-ssd1306 2021-12-26 09:08:49 -08:00
Jm Casler 366a028502 Remove unused comments. 2021-12-26 09:05:35 -08:00
Jm Casler ea7bceb85b
Merge pull request #1018 from joshpirihi/master
Add mqtt_username and mqtt_password user preferences
2021-12-24 22:25:10 -08:00
Jm Casler caa4f3cd71
Merge branch 'master' into master 2021-12-24 13:52:25 -08:00
Jm Casler 521c55595a
Merge pull request #1022 from mc-hamster/wifi
Cleanup comments
2021-12-24 13:51:35 -08:00
Jm Casler a0c9d18e0d Merge branch 'wifi' of https://github.com/mc-hamster/Meshtastic-device into wifi 2021-12-24 13:08:36 -08:00
Jm Casler 0938cded58 Cleanup comments 2021-12-24 13:08:30 -08:00
Jm Casler 0ea12436b6
Merge pull request #1020 from mc-hamster/wifi
Fix for SoftAP bugs
2021-12-23 20:34:29 -08:00
Jm Casler 8e50e25eec Cleanup content handler and remove request counter. 2021-12-23 19:56:37 -08:00
Jm Casler 2d8bf4d684 Fix for SoftAP bugs 2021-12-23 18:18:07 -08:00
Joshua Pirihi 0aa4ea86a0 Add mqtt_username and mqtt_password user preferences 2021-12-24 06:17:08 +13:00
Jm Casler d09754fbcf Add support for secondary channels that don't have their own PSK. 2021-12-21 19:28:47 -05:00
Jm Casler a192da5cd0
Merge pull request #1010 from andrekir/backlight
add T-Echo backlight trigger
2021-12-19 19:38:28 -05:00
Jm Casler 73985c47d6
Merge branch 'master' into backlight 2021-12-19 19:34:29 -05:00
Jm Casler 476c6f25ce
Merge pull request #1012 from mc-hamster/master
Update to show fixed gps alternating with location info
2021-12-19 19:34:06 -05:00
Jm Casler 836113ef8b
Merge pull request #92 from syund/Show-fixed-GPS-coordinates-on-screen
Fix coordinates not displaying when fixed
2021-12-19 15:16:33 -05:00
Jm Casler 3e31d561ea Merge branch 'StoreAndForward' of https://github.com/mc-hamster/Meshtastic-device into StoreAndForward 2021-12-19 15:11:38 -05:00
Jm Casler 192feeaf0e Update broadcast address to NODENUM_BROADCAST 2021-12-19 15:11:30 -05:00
Sam 9f63a8c330 Fix coordinates not displaying when fixed 2021-12-19 14:55:57 -05:00
Jm Casler b6d72d3248
Merge branch 'meshtastic:master' into master 2021-12-19 14:28:08 -05:00
Jm Casler 756528180e
Merge pull request #978 from mc-hamster/StoreAndForward
S&F - Describe if the message is real time or delayed in MeshPacket
2021-12-19 14:27:55 -05:00
Jm Casler 8d8fece89d Update to show fixed gps alternating with location info. 2021-12-19 14:27:49 -05:00
Jm Casler 7af4a31329 Adding MeshPacket_Delayed 2021-12-19 14:02:36 -05:00
Jm Casler 2ace1f48b8
Merge branch 'meshtastic:master' into StoreAndForward 2021-12-19 13:58:22 -05:00
Jm Casler d1d096d52a S&F - Describe if the message is real time or delayed in MeshPacket 2021-12-19 13:58:01 -05:00
Jm Casler 3adb79bd18 updating proto submodule to latest 2021-12-19 13:54:51 -05:00
Jm Casler 34908a8f79
Merge pull request #1009 from meshtastic/nimble-lib-swap
Nimble lib swap
2021-12-18 16:30:27 -05:00
Jm Casler 9b15bb51b3
Merge pull request #1008 from mc-hamster/master
Show fixed position indicator on screen & show fixed position indicator on screen
2021-12-18 16:24:33 -05:00