Wykres commitów

427 Commity (dfd06451e9525ce03f39226547620a5b19bcf684)

Autor SHA1 Wiadomość Data
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
Ben Meadors fa42cb4d3a Add voltage and current for upcoming sensors 2022-01-27 07:14:54 -06:00
Joshua Pirihi 47195848f0 Add UserPreference to enable or disable MQTT uplink encryption 2022-01-27 14:35:07 +13:00
Ben Meadors 785fb20a0d
Merge pull request #84 from meshtastic/add-bosch-sensors
Add gas resistance
2022-01-26 15:21:35 -06:00
Ben Meadors ee1f19b212 Add gas resistance 2022-01-26 15:20:25 -06:00
Ben Meadors b47cadbc37
Merge pull request #83 from meshtastic/thebentern-patch-1
Add RAK11200 device model
2022-01-24 13:49:25 -06:00
Ben Meadors c4a7b9d52f
Add RAK11200 device model 2022-01-24 13:48:41 -06:00
Jm Casler 6c39b5bf47
Merge pull request #82 from mc-hamster/master
Add reply_id and is_tapback
2022-01-23 09:10:14 -08:00
Jm Casler 92d56ce491 Fix for linting error 2022-01-23 09:08:45 -08:00
Jm Casler 7915bfa652 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-protobufs 2022-01-23 09:08:40 -08:00
Jm Casler c9c34f6c15 Remove from reply/tapback meshpacket 2022-01-23 09:06:21 -08:00
Jm Casler 7b56336dee
Merge branch 'meshtastic:master' into master 2022-01-23 09:03:29 -08:00
Jm Casler cea7ca10db Add reply_id and is_tapback 2022-01-23 09:02:39 -08:00
Ben Meadors 60cf054561
Merge pull request #81 from meshtastic/add-bosch-sensors
Adding bosch sensors for pending support in device
2022-01-22 09:04:17 -06:00
Ben Meadors 3e847b17c9 Adding bosch sensors for pending support in device 2022-01-22 09:02:47 -06:00
Ben Meadors 62cb78fcbe
Merge pull request #80 from meshtastic/shutdown-addition
Shutdown admin message
2022-01-20 19:01:49 -06:00
Ben Meadors 042d42122d Shutdown admin message 2022-01-20 18:45:47 -06:00
mkinney 5af171a1a2
Update README.md
add ci badge
2022-01-20 10:03:25 -08:00
mkinney 3d25dfda00
Merge pull request #79 from mkinney/master
need size eventho deprecated
2022-01-19 17:01:51 -08:00
Mike Kinney ba8bbb9069 need size eventho deprecated 2022-01-19 16:57:45 -08:00
mkinney b8f47da71a
Merge pull request #78 from mkinney/add_canned_messages_plumbing
Add canned messages plumbing
2022-01-19 15:48:05 -08:00
Mike Kinney 8f1209e3de fix lint warnings; deprecate inital messages field 2022-01-19 15:43:57 -08:00
Mike Kinney 48dafa52ca merge from upstream 2022-01-19 15:37:57 -08:00
mkinney 8cf54cb54b
Merge pull request #77 from prampec/master
Temporary fix on canned messages total length.
2022-01-19 15:36:05 -08:00
Mike Kinney 12257fcb75 change return type 2022-01-19 11:57:27 -08:00
Mike Kinney 1774f7405c broke out canned messages 2022-01-19 10:54:26 -08:00
Mike Kinney 22c12e043b adding the long canned messages 2022-01-18 17:39:38 -08:00
Balazs Kelemen d2bd49aca3 Temporary fix on canned messages total length. 2022-01-18 23:32:44 +01:00
mkinney be14ce595f
Merge pull request #76 from mkinney/add_dht22
add DHT22 sensor
2022-01-16 15:17:47 -08:00
Mike Kinney f60875612d going to add the other 2 devices too 2022-01-16 15:14:03 -08:00
Mike Kinney a4f63f5085 add DHT22 sensor 2022-01-16 15:01:23 -08:00
Jm Casler 6eff12b91d
Merge pull request #75 from prampec/master
CannedMessagePlugin typo fix.
2022-01-16 14:31:25 -08:00
Balazs Kelemen b95afc8cdd CannedMessagePlugin typo fix. 2022-01-16 23:04:48 +01:00