Wykres commitów

459 Commity (996940f44c2dbaa8409d82d885dcb968253228a3)

Autor SHA1 Wiadomość Data
Balazs Kelemen 996940f44c Canned message - Extend messages length 2022-02-21 22:05:40 +01:00
Jm Casler 95e22ccebd
Merge pull request #101 from mc-hamster/group-chat
Add groups to payloadVariant
2022-02-20 01:32:33 -08:00
Jm Casler 0c1c367cea
Merge branch 'meshtastic:master' into group-chat 2022-02-20 01:32:16 -08:00
Jm Casler 44ab5a4fc6 Add groups to payloadVariant 2022-02-20 01:31:49 -08:00
Jm Casler 91598a629e
Merge pull request #100 from mc-hamster/group-chat
Add group_info to DeviceState
2022-02-19 23:48:00 -08:00
Jm Casler 0542919b1b
Merge branch 'meshtastic:master' into group-chat 2022-02-19 23:47:44 -08:00
Jm Casler 6fbcb672dc Add group_info to DeviceState 2022-02-19 23:47:28 -08:00
Jm Casler 257c4ccdee
Merge pull request #99 from mc-hamster/group-chat
typo in Data.group_id
2022-02-19 23:16:28 -08:00
Jm Casler 5a3890a7b3 Merge branch 'group-chat' of https://github.com/mc-hamster/Meshtastic-protobufs into group-chat 2022-02-19 23:16:02 -08:00
Jm Casler c58e981c84 typo in Data.group_id 2022-02-19 23:15:55 -08:00
Jm Casler ce81bb93ae
Merge pull request #98 from mc-hamster/group-chat
Move max_length and max_count into .options
2022-02-19 23:10:28 -08:00
Jm Casler 8a9b8fb565
Merge branch 'meshtastic:master' into group-chat 2022-02-19 23:10:10 -08:00
Jm Casler 8302a04192 Move max_length and max_count into .options 2022-02-19 23:09:26 -08:00
Jm Casler 4ab31fc677
Merge pull request #97 from mc-hamster/group-chat
Group chat protos
2022-02-19 22:55:10 -08:00
Jm Casler 22a5d39fb6 Add GroupInfo 2022-02-19 22:54:05 -08:00
Jm Casler 90079e9001 Add GROUP_APP 2022-02-19 22:53:58 -08:00
Jm Casler 5f98af3261 Add group_id to Data 2022-02-19 22:32:11 -08:00
Jm Casler 6a66f8b1f8
Merge pull request #96 from mc-hamster/Radio&Band-Refactor
Add canned_message_plugin_messages back
2022-02-14 20:35:16 -08:00
Jm Casler 9e8cdde692
Merge branch 'meshtastic:master' into Radio&Band-Refactor 2022-02-14 20:34:59 -08:00
Jm Casler 8847aa718d Merge branch 'Radio&Band-Refactor' of https://github.com/mc-hamster/Meshtastic-protobufs into Radio&Band-Refactor 2022-02-14 20:34:16 -08:00
Jm Casler fcfed58083 Add canned_message_plugin_messages back 2022-02-14 20:34:10 -08:00
Jm Casler d192833e5c
Merge pull request #95 from mc-hamster/Radio&Band-Refactor
Remove deprecated protos
2022-02-14 20:08:07 -08:00
Jm Casler c7e32c4e27
Merge branch 'meshtastic:master' into Radio&Band-Refactor 2022-02-14 20:07:50 -08:00
Jm Casler 243c5f0656 Merge branch 'Radio&Band-Refactor' of https://github.com/mc-hamster/Meshtastic-protobufs into Radio&Band-Refactor 2022-02-14 20:07:38 -08:00
Jm Casler e5f1e3c90b Remove deprecated protos. 2022-02-14 20:07:33 -08:00
Jm Casler 35f102f0a5
Merge pull request #94 from mc-hamster/Radio&Band-Refactor
Removed LegacyRadioConfig and LegacyPreferences
2022-02-14 19:55:03 -08:00
Jm Casler 8576619a17
Merge branch 'meshtastic:master' into Radio&Band-Refactor 2022-02-14 19:54:42 -08:00
Jm Casler 3ca0b53430 Removed legacy LegacyRadioConfig and LegacyPreferences 2022-02-14 19:54:21 -08:00
Jm Casler b22f484bab
Merge pull request #93 from mc-hamster/Radio&Band-Refactor
Remove mynodeinfo.num_bands
2022-02-14 19:41:36 -08:00
Jm Casler e6ea3fdc79 Merge branch 'Radio&Band-Refactor' of https://github.com/mc-hamster/Meshtastic-protobufs into Radio&Band-Refactor 2022-02-14 19:40:59 -08:00
Jm Casler 3024fd6098 Remove mynodeinfo.num_bands 2022-02-14 19:40:57 -08:00
Jm Casler 956fa74e80
Merge pull request #92 from mc-hamster/Radio&Band-Refactor
Update with new default modem configurations
2022-02-14 17:56:54 -08:00
Jm Casler dfd06451e9
Merge branch 'meshtastic:master' into Radio&Band-Refactor 2022-02-14 17:56:35 -08:00
Jm Casler 4d844f6532 Update with new default modem configurations 2022-02-14 17:56:17 -08:00
Jm Casler d704491030
Merge pull request #91 from mc-hamster/Radio&Band-Refactor
Update EU865 to EU868 & Add TH and IN
2022-02-14 16:59:11 -08:00
Jm Casler d21899ff4f Add TH and IN 2022-02-14 16:58:16 -08:00
Jm Casler aaa019d3ba Update EU865 to EU868 2022-02-14 16:56:34 -08:00
mkinney c703d579b2
Merge pull request #90 from mkinney/add_shtc3
add SHTC3/RAK1901 sensor
2022-02-11 14:37:48 -08:00
Mike Kinney e5b20a5fb7 add SHTC3/RAK1901 sensor 2022-02-11 14:36:53 -08:00
Ben Meadors 2930129e8e
Merge pull request #89 adc_multiplier_override pref
adc_multiplier_override pref
2022-02-02 21:20:21 -06:00
Ben Meadors 1b5f2b8510
adc_multiplier_override 2022-02-02 21:19:24 -06:00
Ben Meadors 792027be93
Merge pull request #88 from RicInNewMexico/master
Addition of MCP9808 to radioconfig.proto
2022-01-31 14:06:45 -06:00
RicInNewMexico 20853fb403 Revert "Create blank.yml"
This reverts commit c2de2f420c.
2022-01-31 12:48:49 -07:00
Ric Letson c2de2f420c
Create blank.yml 2022-01-31 00:27:14 -07:00
RicInNewMexico 5d7317d1f2 Update radioconfig.proto
Add MCP9808 support
2022-01-31 00:24:37 -07:00
mkinney 07ed86d8b4
Merge pull request #87 from joshpirihi/master
Add a user preference to control MQTT encryption
2022-01-27 15:51:12 -08:00
mkinney 5220c6967d
Merge pull request #86 from caveman99/master
platformio split - private hardware id
2022-01-27 10:35:55 -08:00
joshpirihi a2027a6d05
Merge branch 'meshtastic:master' into master 2022-01-28 05:52:37 +13:00
Thomas Göttgens 6bb2500c45
Missing part of platformio split
ref. https://github.com/meshtastic/Meshtastic-device/pull/1141
2022-01-27 16:41:59 +01:00
Ben Meadors a9bba331e6
Merge pull request #85 from meshtastic/add-bosch-sensors
Add voltage and current for upcoming sensors
2022-01-27 07:16:44 -06:00