1139 Commits

Author SHA1 Message Date
Kevin Hester
e88b4e9f22 Merge pull request #257 from geeksville/dev1.2
Dev1.2
1.2.4
2021-03-05 14:30:37 +08:00
Kevin Hester
c6c327b32c Merge remote-tracking branch 'root/master' into dev1.2 2021-03-05 14:29:38 +08:00
Kevin Hester
a8e698c070 1.2.4 2021-03-05 14:29:31 +08:00
Kevin Hester
390413bd8a fix channel setting 2021-03-05 14:14:17 +08:00
Kevin Hester
d15ff7ed36 region setting is finished 2021-03-04 11:20:51 +08:00
Kevin Hester
bd1885aaf2 region setting from android now kinda works 2021-03-04 10:28:56 +08:00
Kevin Hester
81e76bfc51 fix bugs found via simulator 2021-03-04 09:08:29 +08:00
Kevin Hester
aa79ee4335 make our simulator work like 1.2 2021-03-03 14:43:29 +08:00
Kevin Hester
b53acd206b region GUI wip 2021-03-03 13:51:33 +08:00
Kevin Hester
dbc91e4ac5 remove deprecations 2021-03-03 08:14:40 +08:00
Kevin Hester
55d0110ff2 optimize channel rx 2021-03-03 07:49:23 +08:00
Kevin Hester
da95b4f0c2 basic settings and channel stuff works for android 2021-03-03 07:30:05 +08:00
Kevin Hester
02198864c5 WIP on getting new style settings/channels 2021-03-02 22:12:42 +08:00
Kevin Hester
a800bd1319 cleanup admin packet generation 2021-03-02 16:27:43 +08:00
Kevin Hester
ba86d3e88f localization 2021-03-02 16:27:34 +08:00
Kevin Hester
e27a3d937d show alert for old firmware 2021-03-02 15:12:57 +08:00
Kevin Hester
2fc4099bfc Merge branch 'dev' into dev1.2
# Conflicts:
#	app/src/main/java/com/geeksville/mesh/MainActivity.kt
#	app/src/main/java/com/geeksville/mesh/service/MeshService.kt
2021-03-02 14:38:55 +08:00
Kevin Hester
2614cba6a1 Merge pull request #255 from geeksville/dev
1.1.50
1.1.50
2021-03-02 14:20:24 +08:00
Kevin Hester
5c19b2649f 1.1.50 2021-03-02 14:19:44 +08:00
Kevin Hester
0fe6c91a4e fix #254 typo changed != to ==. fix rxtime displays 2021-03-02 14:16:57 +08:00
Kevin Hester
ae402e8fd2 add warning text for downrev apps 2021-03-02 13:22:55 +08:00
Kevin Hester
d33defb502 oops - I nuked a string by accident 2021-03-02 12:01:34 +08:00
Kevin Hester
b86e11a8c2 Merge remote-tracking branch 'root/master' into dev 2021-03-02 11:30:40 +08:00
Kevin Hester
2cf39096a7 lib update 2021-03-02 10:36:37 +08:00
Kevin Hester
d34efb46b4 Merge pull request #252 from paulmandal/task/expose-hoplimit-on-datapacket
Add hopLimit to the DataPacket class
2021-03-02 10:35:49 +08:00
Paul Mandal
a6c80cc203 Add hopLimit to the DataPacket class, update MeshService to use hopLimit when building its MeshPackets 2021-02-27 22:36:06 -07:00
Kevin Hester
850358e103 channel setting is healthier 2021-02-27 14:31:52 +08:00
Kevin Hester
1eaabfc216 fix java paths for protos 2021-02-27 13:43:55 +08:00
Kevin Hester
bd796524b9 channelset wip 2021-02-27 12:04:44 +08:00
Kevin Hester
0743feadc4 wip adding channelset 2021-02-27 11:44:05 +08:00
Kevin Hester
31a106039b impl set owner/set radio 2021-02-27 11:13:30 +08:00
Kevin Hester
85a0ea7286 1.2 wip 2021-02-27 10:18:00 +08:00
Kevin Hester
2f4be7bb23 update libs 2021-02-27 09:49:25 +08:00
Kevin Hester
1c7d1c7ea9 Merge pull request #250 from vfurman-gh/master
Do not use windowSoftInputMode=adjustPan
2021-02-23 09:02:09 +08:00
Vadim Furman
ead36b2fc6 Do not use windowSoftInputMode=adjustPan, as the toolbar hides when input is active. 2021-02-22 15:00:32 -08:00
Kevin Hester
efbc61eaf2 fix mroe lint warnings 2021-02-21 12:27:13 +08:00
Kevin Hester
5bef2fc9cf don't build release builds in CI, because it wants to upload to crashlytics 2021-02-21 12:12:55 +08:00
Kevin Hester
3ec0c5fd32 fix lint warnings 2021-02-21 12:07:53 +08:00
Kevin Hester
64cfa8675a fixing CI by remote control is so tedious! 2021-02-21 11:56:28 +08:00
Kevin Hester
8e1a31f128 this time ci will work I hope! 2021-02-21 11:52:45 +08:00
Kevin Hester
01100e67e1 don't corrupt mbox token xml 2021-02-21 11:51:21 +08:00
Kevin Hester
034484c2d3 fix ci build? 2021-02-21 11:40:19 +08:00
Kevin Hester
9e4b120c24 more lint errors 2021-02-21 11:40:12 +08:00
Kevin Hester
4a90bb2fc0 fix various lint warnings 2021-02-21 11:34:43 +08:00
Kevin Hester
09fb7f220d use latest libs 2021-02-21 11:06:47 +08:00
Kevin Hester
a2d37e0343 fix lint error about tranlsation 2021-02-21 11:00:46 +08:00
Kevin Hester
9d75c6f062 fix missing crashlytics permission 2021-02-21 11:00:11 +08:00
Kevin Hester
3f50cab92d make lint failures non fatal 2021-02-21 10:59:51 +08:00
Kevin Hester
b8f9d70548 Merge remote-tracking branch 'root/master' into dev
# Conflicts:
#	.github/workflows/android.yml
2021-02-21 10:48:23 +08:00
Kevin Hester
0c4be072db make ci build use mapbox download key per #218 (thanks to @hpsaturn) 2021-02-21 10:47:23 +08:00