kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity
2,315 Commits 1 Branch 0 Tags
69de2a047fa34dee80dd32aeb23d021089d4fa2f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hester 69de2a047f Merge pull request #706 from geeksville/dev1.2 
merging 1.2 soon!
 2021-03-03 11:23:40 +08:00
Kevin Hester 05c458225f Merge remote-tracking branch 'root/master' into dev1.2 2021-03-02 15:46:16 +08:00
Kevin Hester 866125f2ab fix release script for universal builds 2021-03-02 15:37:56 +08:00
Kevin Hester d0263e4fa3 Merge branch 'dev' into dev1.2 2021-03-02 15:16:28 +08:00
Kevin Hester e884ace0ab show build name 2021-03-02 15:16:22 +08:00
Kevin Hester 2ac4106004 add play store link 2021-03-02 12:53:23 +08:00
Kevin Hester 59a63e4aea Merge pull request #721 from geeksville/dev 
add (editable) android warning landing page
 2021-03-02 12:47:19 +08:00
Kevin Hester fbdf1f19f0 add (editable) android warning landing page 2021-03-02 12:46:19 +08:00
Kevin Hester 082101f99f wire compat 2021-03-02 12:44:48 +08:00
Kevin Hester f6761d637f proto update 2021-03-02 11:46:00 +08:00
Kevin Hester ef612d0b58 Merge remote-tracking branch 'root/master' into dev1.2 
# Conflicts:
#	src/plugins/Plugins.cpp
#	version.properties
 2021-03-01 10:26:16 +08:00
Kevin Hester 43673c0598 Merge pull request #719 from geeksville/dev 
1.1.50
 2021-03-01 09:21:42 +08:00
Kevin Hester 9b45749bf0 1.1.50 2021-03-01 08:33:01 +08:00
Kevin Hester a51c08bfb1 todo updated 2021-02-27 14:42:07 +08:00
Kevin Hester fb47c3a03d move channel and settings protos 2021-02-27 13:17:18 +08:00
Kevin Hester 63e0b53054 1 index channel index 2021-02-27 09:17:58 +08:00
Kevin Hester 989f52494d clean up ack packets 2021-02-26 20:36:22 +08:00
Kevin Hester 0307e4161e get settings message works 2021-02-26 20:10:41 +08:00
Kevin Hester c7c8b34adf impl get channels/get radio remote api 2021-02-26 15:34:00 +08:00
Kevin Hester 5ae4edf8fd move admin out of core proto 2021-02-25 20:36:37 +08:00
Kevin Hester d3df6d3749 Merge pull request #711 from geeksville/dev 
fixes for 1.1.49
 2021-02-25 20:04:05 +08:00
Kevin Hester 8ba43e1745 merge latest from master 2021-02-25 20:02:32 +08:00
Kevin Hester cedd87001d Merge branch 'dev' into dev1.2 2021-02-25 19:49:50 +08:00
Kevin Hester afc901ddbe fix build. platformio isn't smart enough to git pull latest without 
specifying a tag/commit/etc (I haven't tried specifying a branch?)

Without specifying the hash, the build breaks for anyone who already had
a repo (the CI build doesn't see this because it always pulls from scratch)

cc @crossan007 & @mc-hamster
 2021-02-25 19:49:34 +08:00
Kevin Hester e4eb7ab589 Merge branch 'dev' into dev1.2 
# Conflicts:
#	proto
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
#	src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp
 2021-02-25 19:44:08 +08:00
Kevin Hester b052928af2 Merge remote-tracking branch 'root/master' into dev 2021-02-25 19:33:06 +08:00
Kevin Hester a3b1c4608e Merge pull request #713 from Eninspace/patch-2 
Update README.md
 2021-02-25 18:28:05 +08:00
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
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
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
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
Kevin Hester 205282c4bc show hwvendor at boot 2021-02-17 10:08:33 +08:00
Kevin Hester 45caf394f0 WIP multichannel support 2021-02-16 15:41:52 +08:00
Kevin Hester 2b10a03178 Merge pull request #690 from geeksville/dev 
oops - 1.1.47 had bad bug
 2021-02-14 15:26:00 +08:00
Kevin Hester 80fb7e4ab8 Merge remote-tracking branch 'root/master' into dev 2021-02-14 15:15:28 +08:00
Kevin Hester 7c1ddd9447 1.1.48 2021-02-14 15:13:58 +08:00
Kevin Hester c55074f7fe oops: we should crash if we >MAX_THREADS, also raise max threads 2021-02-14 15:06:49 +08:00
Kevin Hester 450e877cfb fix #661 - create $archivedir 2021-02-14 14:14:50 +08:00
Kevin Hester c0fbfccf43 Merge pull request #689 from geeksville/dev 
Dev
 2021-02-14 13:48:39 +08:00
Kevin Hester 51ccc3aa9e 1.1.47 2021-02-14 12:28:27 +08:00
Kevin Hester e35f137986 clean up nodeinfo broadcasts and move into plugin 2021-02-14 12:27:10 +08:00
Kevin Hester 71c35304d6 delay position plugin start until 60 secs after first boot 2021-02-14 12:26:51 +08:00
Kevin Hester c1733a4ac6 Merge remote-tracking branch 'root/master' into dev 2021-02-14 12:07:11 +08:00
Kevin Hester 66a7e8eab9 oops - we were never sending 'fixed' gps positions to other nodes 2021-02-14 12:02:24 +08:00
Kevin Hester a872231f8a clean up position broadcasts, send them even if we don't have gps lock 2021-02-14 11:57:48 +08:00
Kevin Hester 52ec4d511c oops - we weren't properly stripping timestamps from new style positions 2021-02-14 11:37:32 +08:00
Kevin Hester 8c225a3c65 disable lora while updating, show "Updating" on oled screen 2021-02-12 13:48:12 +08:00
Kevin Hester 7ff1f3a759 Merge pull request #684 from geeksville/dev 
Dev
 2021-02-12 10:04:48 +08:00
Kevin Hester bbc8fc0269 fix build for nrf52 2021-02-12 09:56:42 +08:00
Kevin Hester 9d81511153 fix warning 2021-02-12 09:56:35 +08:00
Kevin Hester 16d63bd0ce 1.1.46 2021-02-12 09:42:04 +08:00
Kevin Hester f2b7ff2b79 an optimization for #681 - make want_ack packets higher priority 2021-02-12 09:40:20 +08:00
Kevin Hester bc8453283f Merge remote-tracking branch 'root/master' into dev 2021-02-12 09:10:48 +08:00
Kevin Hester 2ff5046dcd for #681, add MeshPacketQueue (a priority queue) to ensure acks get sent quickly 2021-02-12 09:08:49 +08:00
Kevin Hester 917090856f partial for #681: Never let stale nodeinfos/positions stay in xmit queue 2021-02-11 18:19:43 +08:00
Kevin Hester b45d633a34 Merge pull request #680 from geeksville/dev 
Dev
 2021-02-10 16:33:02 +08:00
Kevin Hester fdfe62edf0 updates to work with new protobuf names 2021-02-10 16:18:41 +08:00
Kevin Hester 8e8170b667 Merge remote-tracking branch 'root/master' into dev 2021-02-08 18:03:35 +08:00
Kevin Hester 2fa38c7dc4 update protos 2021-02-08 17:57:45 +08:00
Kevin Hester 58bb7169a0 use nodenum as the default nodeid 2021-02-08 10:15:02 +08:00
Kevin Hester f7beec4728 Merge pull request #678 from geeksville/dev 
misc bugs
 2021-02-07 11:00:09 +08:00
Kevin Hester ccf3450864 make CI build steps more atomic for easier reporting 2021-02-07 10:49:14 +08:00
Kevin Hester 86553a4fc9 add libs needed for linux build on CI server 2021-02-07 10:44:31 +08:00
Kevin Hester 55349ea570 1.1.42 2021-02-07 10:27:04 +08:00
Kevin Hester 486b03e985 bug 677. Don't assert fail for missing interfaces, instead return 
nak packet to clients.
 2021-02-07 10:26:11 +08:00
Kevin Hester ccb232b6ac make route errors a more general 'message delivery failure' reason 
in support of https://github.com/meshtastic/Meshtastic-device/issues/677
 2021-02-07 09:46:35 +08:00
Kevin Hester e7af338c31 add trademark 2021-02-04 15:46:57 +08:00
Kevin Hester 9069e5b33e no longer need to set num jobs, because my computer is better 2021-02-04 11:51:12 +08:00
Kevin Hester 1719a8e764 Merge pull request #667 from geeksville/dev 
kevins misc fixes
 2021-01-31 09:18:05 +08:00
Kevin Hester c0e2ec8dec 1.1.34 2021-01-30 21:23:03 +08:00
Kevin Hester c6f34c59b4 Update to logo by @thepoweroftwo 2021-01-29 13:26:08 +08:00
Kevin Hester 7f07725840 make improperly sized AES128/256 keys non fatal, instead pad with zeros 
Fixes rebooting the board if someone specifies an invalid key
 2021-01-29 10:15:48 +08:00
Kevin Hester c81d090464 someone added storerequest app? 2021-01-29 10:14:46 +08:00
Kevin Hester fa9e31fe03 Merge pull request #663 from geeksville/eink 
back in the saddle - reading github and slack next
 2021-01-28 10:38:46 +08:00
Kevin Hester 3ac5b045c4 Merge remote-tracking branch 'root/master' into eink 2021-01-28 10:31:56 +08:00
Kevin Hester 6a593e01e1 notes on eink1.0 2021-01-28 10:30:24 +08:00
Kevin Hester 6f6dd2291e fix typo 2021-01-28 10:30:00 +08:00
Kevin Hester 2b4ddc07f5 Merge pull request #651 from android606/log-tx-failure 
Set critical error and reboot when radio fails to generate Tx IRQ - fixes #138
 2021-01-27 18:05:56 +08:00
Kevin Hester 63c650c33e Merge branch 'master' into log-tx-failure 2021-01-27 17:54:06 +08:00