ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-19 09:51:30 +10:00
Code Releases Activity
2,257 Commits 119 Branches 324 Tags
66638655a5b482f0118b295dcc1b6d73e31822c4
Commit Graph
2257 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hester 66638655a5 Merge branch 'dev' into dev1.2 
# Conflicts:
#	src/mesh/NodeDB.cpp
 2021-02-25 08:56:36 +08:00
Kevin Hester 2d214df76f Merge remote-tracking branch 'root/master' into dev 2021-02-25 08:52:26 +08:00
Kevin Hester 8f1cd33d14 Merge pull request #709 from Eninspace/patch-1 
Update README.md
 2021-02-25 08:51:47 +08:00
Kevin Hester b2c47a7dea fix #710. nodes disappearing from map. thanks @DylanHoen for noticing! 2021-02-25 08:50:46 +08:00
Niko 5f3f62ed46 Update README.md 
Added Russian community group link
 2021-02-24 13:45:21 +03:00
Kevin Hester 577336d2df oh well - github actions defeated me 2021-02-23 17:16:12 +08:00
Kevin Hester 245638a1d4 get more parallism in CI build 2021-02-23 17:07:38 +08:00
Kevin Hester ada05a1374 fix linux 2021-02-23 16:56:28 +08:00
Kevin Hester 4b07f9e160 todo update 2021-02-23 14:45:02 +08:00
Kevin Hester f8d8dc25c0 properly route messages to phone again 2021-02-23 14:35:34 +08:00
Kevin Hester aa8b86c6b2 multichannel send/rx kinda works 2021-02-23 11:43:30 +08:00
Kevin Hester ae6b7e7259 multichannel code is done! (only basic testing completed though) 2021-02-23 10:45:03 +08:00
Kevin Hester 2761c85564 clean up the crypto api 2021-02-23 10:10:35 +08:00
Kevin Hester 94cd96cfde begin multichannel hash impl 2021-02-22 12:57:26 +08:00
Kevin Hester 923ecc9d8a fix printf warnings 2021-02-22 12:57:03 +08:00
Kevin Hester d6c2e9063a 1.2 channel cleanup 2021-02-22 11:16:38 +08:00
Kevin Hester 3088fe3f91 Stay up-to-date wrt master (cc @mc-hamster) 
# Conflicts:
#	src/plugins/Plugins.cpp
#	src/plugins/RangeTestPlugin.cpp
#	src/plugins/StoreForwardPlugin.cpp
 2021-02-22 10:39:46 +08:00
Kevin Hester d4781280b7 update protos 2021-02-22 10:29:27 +08:00
Kevin Hester 008187caa4 1.2 wip - psk work 2021-02-22 10:26:11 +08:00
Jm Casler c6864417c6 Merge pull request #646 from crossan007/AddEnvironmentMessage 
Add Environmental Measurement Plugin
 2021-02-21 08:31:13 -08:00
Charles Crossan 27f74382aa Fix CI build for non-esp32 devices 2021-02-21 11:09:58 -05:00
Charles Crossan 77961e8e93 Un-derp testing details 2021-02-21 11:00:58 -05:00
Charles Crossan 3c564796e0 2021-02-21 10:55:33 -05:00
Kevin Hester c6091338ab admin ops 2021-02-21 14:03:44 +08:00
Kevin Hester 99467cd874 1.2 WIP at least doesn't crash 2021-02-21 12:59:47 +08:00
Kevin Hester 587102f6bc fix android lint warning 2021-02-21 11:36:34 +08:00
Jm Casler f41d79d586 Merge pull request #703 from mc-hamster/master 
#701, #697 - Bug fix and update to debug output.
 2021-02-20 00:53:07 -08:00
Jm Casler fc5030ff7b Merge branch 'master' into master 2021-02-20 00:46:03 -08:00
Jm ca40cb4be3 Update RangeTestPlugin.cpp 2021-02-20 00:43:56 -08:00
Jm e4141df0e9 #697 GPIO 12 is an odd pin. 2021-02-20 00:34:25 -08:00
Jm c690f81574 #697 Disable internal pullup on this board. 2021-02-19 18:19:14 -08:00
Jm 47b942ca00 #697 - Fixed button selection for tlora v2 1.6 2021-02-19 17:46:15 -08:00
Jm 621313d63c #701 - Add system up time to debug output 2021-02-19 16:58:52 -08:00
Jm Casler d361935c09 Merge pull request #699 from crossan007/fix-exception-decoder 
Fix exception decoder output
 2021-02-19 16:46:46 -08:00
Charles Crossan a2bea87332 Fix exception decoder output 2021-02-19 19:24:18 -05:00
Jm 13b8c140b4 Update StoreForwardPlugin.md 2021-02-18 21:47:16 -08:00
Kevin Hester 69a11e7375 WIP phone api changes for dev1.2 2021-02-17 19:04:41 +08:00
Kevin Hester 60a01567d9 remove region specific builds 2021-02-17 19:01:20 +08:00
Kevin Hester f064e56dc9 fix esp32 build for dev1.2 2021-02-17 16:17:46 +08:00
Kevin Hester 42ae27973e WIP 1.2 move routing into plugin 2021-02-17 13:06:23 +08:00
Jm Casler f6e2695a4d Merge pull request #695 from mc-hamster/master 
Range test plugin done-enough
 2021-02-16 18:54:42 -08:00
Jm e840465ef3 fix for failed builds on nrf and linux 2021-02-16 18:46:16 -08:00
Jm Casler f24e8e5f5c Rename src/plugins/RangeTestPlugin.h to src/plugins/esp32/RangeTestPlugin.h 2021-02-16 18:36:58 -08:00
Jm Casler 6376ab51f1 Moving to plugins/esp32 2021-02-16 18:36:30 -08:00
Jm Casler bd29d78a29 Update StoreForwardPlugin.md 2021-02-16 18:24:37 -08:00
Jm Casler b35cd76854 Update StoreForwardPlugin.md 2021-02-16 18:19:24 -08:00
Kevin Hester 205282c4bc show hwvendor at boot 2021-02-17 10:08:33 +08:00
Jm a4fd74b58e Update Plugins.cpp 2021-02-16 18:07:02 -08:00
Jm Casler 25072f0637 Merge branch 'master' into master 2021-02-16 17:44:17 -08:00
Jm 937955b36d Updating range test and storeforward. 2021-02-16 17:42:46 -08:00