Wykres commitów

3408 Commity (e1ef4950718679503340f88421d57a9fcd97b744)

Autor SHA1 Wiadomość Data
Ben Meadors e1ef495071
Add tlora-v2-1-1.6 to default envs for consistency (#1117) 2022-01-20 08:34:03 -06:00
Jm Casler 209c6253a6 updating proto submodule to latest 2022-01-19 18:18:55 -08:00
mkinney 1acabb9d35
Merge pull request #1110 from prampec/master
Temporary fix on canned messages total length.
2022-01-19 16:14:56 -08:00
mkinney 420495cb2d
Merge branch 'master' into master 2022-01-19 15:45:58 -08:00
Ben Meadors 9309824874
RAK / NRF shutdown functionality on user button long press (#1113) 2022-01-19 17:10:02 -06:00
Balázs Kelemen 4fc443e760
Merge branch 'meshtastic:master' into master 2022-01-19 17:22:34 +01:00
Balazs Kelemen 53399f06e5 Canned message plugin status fix. 2022-01-19 09:55:06 +01:00
Ben Meadors 4e3fda87a1
Initial configuration.h -> variants refactor (#1104)
* Initial configuration to variants refactor
2022-01-18 18:35:42 -06:00
Balazs Kelemen 1ff3b3326c Temporary fix on canned messages total length. 2022-01-18 23:15:54 +01:00
mkinney 9f0ddda6ca
Merge pull request #1107 from mkinney/fix_warning
change name of define because MAX_BLOCKSIZE is already taken
2022-01-17 23:14:26 -08:00
mkinney 8e3d30bd7f
Merge branch 'master' into fix_warning 2022-01-17 22:44:01 -08:00
mkinney 6ca3186bff
Merge pull request #1106 from mkinney/add_more_env_sensors
add DHT22
2022-01-17 22:17:48 -08:00
Mike Kinney 68fadfe26c change name of define because MAX_BLOCKSIZE is already taken 2022-01-18 06:13:43 +00:00
Jm Casler 92bcdb5e53 updating proto submodule to latest 2022-01-17 09:23:29 -08:00
Jm Casler 04b1948ee9
Merge pull request #1105 from prampec/master
CannedMessagePlugin typo fix.
2022-01-16 22:46:57 -08:00
Mike Kinney 6fdc16017a revert the cheking for esptool 2022-01-17 02:31:25 +00:00
Mike Kinney 7f759d6bb5 Merge remote-tracking branch 'prampec/master' into add_more_env_sensors 2022-01-17 00:03:14 +00:00
Mike Kinney 1f227797c1 updated file after updating protobufs 2022-01-16 23:54:10 +00:00
Mike Kinney ab87c0a9ee updating proto 2022-01-16 23:49:18 +00:00
Mike Kinney 6d960918e2 minor change to re-trigger ci 2022-01-16 15:22:17 -08:00
Mike Kinney 5797e32461 add support for other 2 sensors 2022-01-16 15:16:03 -08:00
Mike Kinney 41da6c3b99 add DHT22 2022-01-16 15:06:34 -08:00
Balazs Kelemen fe3a352511 CannedMessagePlugin typo fix. 2022-01-16 23:18:40 +01:00
Jm Casler b53f4214bc
Merge pull request #1099 from mc-hamster/master
AirTime - fix bug in array shifter
2022-01-15 15:28:39 -08:00
Jm Casler b6b1bcc5ad
Merge branch 'meshtastic:master' into master 2022-01-15 15:27:45 -08:00
Jm Casler 91117ca7c6 AirTime - fix bug in array shifter 2022-01-15 15:27:25 -08:00
Jm Casler 2d8e55a34e
Merge pull request #1098 from mc-hamster/master
Airtime - calculate ms in a hour in preprocessor
2022-01-15 12:24:50 -08:00
Jm Casler 3a7292d3d0
Merge branch 'meshtastic:master' into master 2022-01-15 12:24:31 -08:00
Jm Casler 3fea1c4e5f Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2022-01-15 12:24:17 -08:00
Jm Casler c2435470c1 Airtime - calculate ms in a hour in preprocessor 2022-01-15 12:24:16 -08:00
Jm Casler 1c993c10a1
Merge pull request #1097 from mc-hamster/master
airtime - reuse some functions
2022-01-15 11:20:33 -08:00
Jm Casler 0a62ce23af
Merge branch 'master' into master 2022-01-15 11:20:21 -08:00
Jm Casler 38efb8b3ad Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2022-01-15 11:19:52 -08:00
Jm Casler 9ee7f5e0bd airtime - reuse some functions 2022-01-15 11:19:50 -08:00
Jm Casler c798e1a2da
Merge pull request #1096 from mc-hamster/master
Airtime - removed debug message
2022-01-15 09:51:46 -08:00
Jm Casler 7eb4713422
Merge branch 'meshtastic:master' into master 2022-01-15 09:51:10 -08:00
Jm Casler a9ed26fdbc
Merge pull request #1090 from prampec/CannedMessagePlugin
Canned message plugin
2022-01-15 09:50:39 -08:00
Jm Casler a7451b6abe Airtime - removed debug message 2022-01-15 09:50:10 -08:00
Jm Casler e61db642bc
Merge pull request #1095 from mc-hamster/master
Add airtime tx calculation as a 1hr rolling window
2022-01-15 09:45:12 -08:00
Jm Casler 25a540c28b Add airtime tx calculation as a 1hr rolling window 2022-01-15 09:44:29 -08:00
Jm Casler 1993b8f8a6 updating proto submodule to latest 2022-01-15 09:34:11 -08:00
Jm Casler 38dd5612fd
Merge branch 'master' into CannedMessagePlugin 2022-01-15 09:20:10 -08:00
Jm Casler 8a63c6f3a3
Merge pull request #1094 from mc-hamster/master
Fix borked airtime report in /json/reports
2022-01-15 08:25:46 -08:00
Jm Casler 778d13dee7
Merge branch 'meshtastic:master' into master 2022-01-15 08:25:11 -08:00
Jm Casler 2fd0d2baff Fixed borked airtime report in /json/reports
For: https://github.com/meshtastic/Meshtastic-device/issues/1086
2022-01-15 08:24:39 -08:00
Jm Casler 399792803a
Merge pull request #1092 from mkinney/add_quotes_in_device_install
add quotes around PYTHON; add check for esptool
2022-01-15 07:49:30 -08:00
Mike Kinney 8a6bbcb985 add quotes around PYTHON; add check for esptool 2022-01-14 10:40:18 -08:00
Jm Casler 419349e13e
Merge branch 'master' into CannedMessagePlugin 2022-01-13 17:31:12 -08:00
Jm Casler 6b0770fdd5
Merge pull request #1088 from markbirss/master
Fix SSD1306 OLED pinout on TLORA_V1_3
2022-01-13 17:22:21 -08:00
Jm Casler ee2b05da78
Merge branch 'master' into master 2022-01-13 16:56:06 -08:00