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
Jm Casler
f22243a209
Merge pull request #716 from apt105/master
...
Add files via upload
2021-02-28 12:30:18 -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
Adrian
3b8f5ea099
Add files via upload
2021-02-27 02:01:51 +00: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
Jm Casler
1faf6c99db
Merge pull request #712 from mc-hamster/master
...
Update how airtime report gathers data, update stable storeandforward build code
2021-02-25 08:25:42 -08:00
Jm
5f041ea7e9
Update Plugins.cpp
2021-02-25 08:14:07 -08:00
Jm Casler
14271be816
Rename src/plugins/StoreForwardPlugin.h to src/plugins/esp32/StoreForwardPlugin.h
2021-02-25 08:12:57 -08:00
Jm Casler
30d600040b
Rename src/plugins/StoreForwardPlugin.cpp to src/plugins/esp32/StoreForwardPlugin.cpp
2021-02-25 08:12:30 -08:00
Jm Casler
10dd2337fc
Merge branch 'master' into master
2021-02-25 08:04:41 -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
Niko
204c42234c
Update README.md
...
Added line break
2021-02-25 13:12:47 +03:00
Jm Casler
0fe046b92d
Merge pull request #72 from meshtastic/master
...
Update from head
2021-02-24 20:27:58 -08:00
Jm
fd6842cb5b
Partial Work, stable build.
2021-02-24 20:27:21 -08:00
Jm Casler
4f40128bbe
Merge pull request #705 from crossan007/AddEnvironmentMessage
...
Changes to Environmental Measurement App
2021-02-24 20:26:44 -08:00
Jm Casler
3d4580c03e
Merge branch 'master' into AddEnvironmentMessage
2021-02-24 20:20:23 -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
Niko
5f3f62ed46
Update README.md
...
Added Russian community group link
2021-02-24 13:45:21 +03:00
Charles Crossan
bfdad7d4d5
Merge branch 'master' into AddEnvironmentMessage
2021-02-23 20:23:13 -05: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