Wykres commitów

414 Commity (07ed86d8b44f53091fafd007f729a67f4785e270)

Autor SHA1 Wiadomość Data
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
Jm Casler d7b2791b7c
Merge pull request #74 from mc-hamster/master
Percent of airtime for transmission used within the last hour
2022-01-15 09:33:34 -08:00
Jm Casler e060f99b72
Percent of airtime for transmission used within the last hour 2022-01-15 09:33:16 -08:00
Jm Casler e992214cef
Merge pull request #72 from prampec/CannedMessagePlugin
CannedMessagePlugin
2022-01-13 16:55:03 -08:00
Balazs Kelemen d3b2eab090 CannedMessagePlugin 2022-01-13 14:14:28 +01:00
Jm Casler 18fc4cdb52
Merge pull request #71 from mc-hamster/master
Bool for is_power_saving
2022-01-09 22:22:39 -08:00
Jm Casler 5f715e4be5 Bool for is_power_saving 2022-01-09 22:22:10 -08:00
Ben Meadors 5ab590addb
Merge pull request #70 from ernax78/master
Disable TX from the LoRa radio. Useful for hot-swapping antennas
2022-01-06 10:49:18 -06:00
Erik R Norell e82617e10c Disable TX from the LoRa radio. Useful for hot-swapping antennas and other tests. 2022-01-06 18:52:00 +03:00
Jm Casler 7b80bde421
Merge pull request #69 from caveman99/Heltec-V1
Add original Heltec V1 board
2022-01-01 23:24:56 -08:00
Sacha Weatherstone 8837b0554e Fix formatting 2021-12-31 15:50:10 +11:00
Thomas Göttgens 2223818698
Add original Heltec V1 board
no longer in production
2021-12-30 22:08:59 +01:00
mkinney 4a64080d16
Merge pull request #68 from mkinney/test_ci
testing to see if ci will fail
2021-12-30 10:19:36 -08:00
Mike Kinney c2a5b01c06 fix spacing 2021-12-30 10:19:02 -08:00