pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 18:59:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
3,969 Commits 26 Branches 279 Tags 189 MiB
04723bd1a0
Commit Graph

3969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Meadors
6151af0343
Merge branch 'master' into master 2022-03-06 02:39:54 +00:00
hb9tob
bcac20490e
Update Screen.cpp (#1274) 2022-03-05 20:26:25 -06:00
Jm Casler
ec86246da9 Update to flooding router 2022-03-05 12:38:26 -08:00
Joshua Pirihi
d27efd0749 Merge branch 'master' of https://github.com/joshpirihi/Meshtastic-device into mymaster 2022-03-06 05:59:20 +13:00
Joshua Pirihi
a48838153b NimBLE merge conflicts 2022-03-06 05:59:13 +13:00
Joshua Pirihi
d59de171c5 NimBLE implementation 2022-03-06 05:57:38 +13:00
Joshua Pirihi
facf7f56c2 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2022-03-06 05:56:34 +13:00
joshpirihi
0a14f5d168
Merge branch 'meshtastic:master' into master 2022-03-06 05:46:32 +13:00
Joshua Pirihi
3ab2ca57e9 NimBLE implementation 2022-03-06 05:43:26 +13:00
mkinney
ea99f96014
Merge pull request #1270 from mkinney/bugfixes_from_1_2 
merge the 1.2 hang bugfix to 1.3
 2022-03-02 21:36:56 -08:00
mkinney
6001e96c82
Merge branch 'master' into bugfixes_from_1_2 2022-03-02 21:28:11 -08:00
Jm Casler
2fe124eb17 Bump to 1.3.3 2022-03-02 20:50:09 -08:00
mkinney
d91a63a5ee
Merge branch 'master' into bugfixes_from_1_2 2022-03-02 20:43:12 -08:00
Jm Casler
a450aac3b5 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2022-03-02 20:42:06 -08:00
Jm Casler
958f20da1a Update to 1.3.2 2022-03-02 20:42:05 -08:00
mkinney
047c5ec36a
Merge branch 'master' into bugfixes_from_1_2 2022-03-02 20:40:36 -08:00
Jm Casler
ef4c01f4ea
Merge pull request #1271 from mc-hamster/router 
Update PERIODS_TO_LOG
 2022-03-02 20:39:10 -08:00
Jm Casler
97c76cde3c
Merge branch 'master' into router 2022-03-02 20:39:01 -08:00
Jm Casler
2ab0548dda Merge branch 'router' of https://github.com/mc-hamster/Meshtastic-device into router 2022-03-02 20:38:15 -08:00
Jm Casler
75bf2cc9c6 Update PERIODS_TO_LOG 2022-03-02 20:38:14 -08:00
Mike Kinney
0f862edc47 remove the --user 2022-03-03 04:29:34 +00:00
Mike Kinney
c1613de426 merge the 1.2 hang bugfix to 1.3 2022-03-03 04:27:49 +00:00
Jm Casler
ee533b2d5c Bumping to 1.3.1 2022-03-02 19:02:08 -08:00
Jm Casler
52960f5fa2
Merge pull request #1269 from mc-hamster/router 
Fix tophone build error
 2022-03-02 18:55:43 -08:00
Jm Casler
5c281154fd
Merge branch 'meshtastic:master' into router 2022-03-02 18:55:26 -08:00
Jm Casler
2c7b3acbb9 Fix tophone build error 2022-03-02 18:55:11 -08:00
Jm Casler
cf928fca93
Merge pull request #1268 from mc-hamster/router 
Added router to mynodeinfo
 2022-03-02 18:52:52 -08:00
Jm Casler
8eaaf842ab
Merge branch 'meshtastic:master' into router 2022-03-02 18:52:25 -08:00
Jm Casler
09edd7f89b updating proto submodule to latest 2022-03-02 18:49:46 -08:00
Ben Meadors
556fc6210d
Moved power fsm thread out of main (#1265) 2022-03-01 12:40:21 -06:00
Jm Casler
4d8c0c11dc Added router to mynodeinfo 2022-02-28 22:44:51 -08:00
Jm Casler
950b54aaba
Merge pull request #1263 from mc-hamster/router 
Add rssi to printPacket
 2022-02-28 22:06:01 -08:00
Jm Casler
4b87a82eb3
Merge branch 'meshtastic:master' into router 2022-02-28 22:05:20 -08:00
Jm Casler
2fa8f45d74 updating proto submodule to latest 2022-02-28 22:03:39 -08:00
Jm Casler
4209fc8b2c updating proto submodule to latest 2022-02-28 19:35:59 -08:00
Jm Casler
6d4d2bb6fa Merge branch 'router' of https://github.com/mc-hamster/Meshtastic-device into router 2022-02-28 17:47:11 -08:00
Jm Casler
32ef354c22 Add rssi to printPacket 2022-02-28 17:47:09 -08:00
Jm Casler
a0395c1027
Merge pull request #1261 from mc-hamster/router 
Add rssi meta data to the rf95 interface
 2022-02-28 17:09:00 -08:00
Jm Casler
1f43132b52
Merge branch 'master' into router 2022-02-28 17:08:43 -08:00
Jm Casler
ac8ba706f0 Add rssi meta data to the rf95 interface 2022-02-28 17:07:31 -08:00
Ben Meadors
ca4c1c9d7c
Moved button thread to its own file (#1260) 
* Moved button thread to its own file

* Move some debug code blocks into their own files

* Shutdown refactoring

* Removed GENIEBLOCKS
 2022-02-28 15:19:38 -06:00
Jm Casler
7b8746d596
Merge pull request #1259 from puzzled-pancake/master 
Added comments on ANZ added 1w limit
 2022-02-27 14:48:12 -08:00
puzzled-pancake
91b0fcb257
Added comments on ANZ added 1w limit 
Added comments 
https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
https://www.iot.org.au/wp/wp-content/uploads/2016/12/IoTSpectrumFactSheet.pdf

As noted 1w limit on both
 2022-02-28 10:39:48 +13:00
Jm Casler
768c26bb1b
Merge pull request #1258 from mc-hamster/router 
Add role to generated proto
 2022-02-27 12:56:49 -08:00
Jm Casler
e5e13d78c3 Add role to generated proto 2022-02-27 12:56:18 -08:00
Jm Casler
a2eb148c50 Revert "Merge pull request #1257 from mc-hamster/router" 
This reverts commit 33ed9476f8, reversing
changes made to 10fefe7c7b.
 2022-02-27 12:50:50 -08:00
Jm Casler
33ed9476f8
Merge pull request #1257 from mc-hamster/router 
Remove incomplete ReliableRouter implementation
 2022-02-27 12:46:59 -08:00
Jm Casler
92d5dedc63 Remove incomplete ReliableRouter implementation 2022-02-27 12:46:23 -08:00
Jm Casler
10fefe7c7b updating proto submodule to latest 2022-02-27 10:01:40 -08:00
Jm Casler
92ffbca339 updating proto submodule to latest 2022-02-27 09:57:09 -08:00