mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-02 11:52:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,196 Commits 9 Branches 255 Tags
1.2.13
Commit Graph

1196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hester
b44a104be2 Merge pull request #266 from geeksville/dev1.2 
Dev1.2
1.2.13 		2021-03-24 13:53:05 +08:00
Kevin Hester
8f32c39c5f 1.2.13 2021-03-24 13:52:11 +08:00
Kevin Hester
5f6cb7637c Merge remote-tracking branch 'root/master' into dev1.2 
# Conflicts:
#	app/src/main/java/com/geeksville/mesh/MainActivity.kt
 2021-03-24 13:49:46 +08:00
Kevin Hester
37de9de8a1 fix warning 2021-03-24 13:48:32 +08:00
Kevin Hester
ad7a189c51 add default channel button 2021-03-24 13:48:26 +08:00
Kevin Hester
78bedde4ec Merge pull request #264 from danielnemenyi/url-fix 
Fix expired link
 2021-03-24 13:47:36 +08:00
Kevin Hester
a6fe6b2bbf Merge branch 'master' into url-fix 2021-03-24 13:47:30 +08:00
Kevin Hester
fa17822f93 Merge pull request #265 from vfurman-gh/master 
Show rssi/snr in the user info
 2021-03-24 13:46:33 +08:00
Kevin Hester
12ea70174e fix autobug when changing channels 2021-03-23 13:40:03 +08:00
Kevin Hester
dd9a2b99d7 fix autobug NPE 2021-03-23 13:21:51 +08:00
Kevin Hester
cea7755aa4 ignore BLE errors while closing 2021-03-23 13:17:36 +08:00
Kevin Hester
2327c5e693 fix autobug while shutting down interface 2021-03-23 13:07:32 +08:00
Kevin Hester
518241c3c9 less logspam 2021-03-23 13:05:50 +08:00
Vadim Furman
691c5862cb Updated proto 2021-03-22 21:32:40 -07:00
Vadim Furman
13d63ee52b More rssi 2021-03-22 21:21:58 -07:00
Vadim Furman
0d9f31f7fb Pipe rssi to the view 2021-03-22 21:10:58 -07:00
Daniel Nemenyi
6e545e628b Fix expired link 
The 'Firmware update required' modal contains an expired link to the
Wiki. This commit points the user towards the Firmware Installation
section on Github instead.

* app/src/main/res/values/strings.xml
 2021-03-22 09:14:29 +00:00
Vadim Furman
b5c5cf0153 Fixed formatting 2021-03-21 18:15:54 -07:00
Kevin Hester
278d82e99a cleanly kill job if we get an exception during firmware update 2021-03-20 18:47:12 +08:00
Kevin Hester
c9d18b00a4 don't let user update firmware without setting a region. 2021-03-20 17:47:02 +08:00
Kevin Hester
fb07b1dc83 clean up position sending, also always provide time to the mesh 2021-03-20 11:23:31 +08:00
Vadim Furman
8aa7585fdd Merge remote-tracking branch 'upstream/master' 2021-03-19 16:55:22 -07:00
Vadim Furman
5e4470d25e Use default scope for file save and display snr 2021-03-19 14:33:55 -07:00
Kevin Hester
be7aea1457 update to sdk 30 2021-03-20 01:28:55 +08:00
Kevin Hester
57aff30082 Merge pull request #262 from geeksville/dev1.2 
get ready for next release
1.2.11 		2021-03-20 00:03:01 +08:00
Kevin Hester
0ebb512dca 1.2.11 2021-03-20 00:02:34 +08:00
Kevin Hester
93f110158f preserve even old 1.0 style region names during firmware update 2021-03-19 23:14:46 +08:00
Kevin Hester
54bf0e85c1 make 1.2 firmware update work even for old 1.0 devices 2021-03-19 22:49:51 +08:00
Kevin Hester
bfdf4a661a Merge remote-tracking branch 'root/master' into dev1.2 2021-03-19 21:29:31 +08:00
Kevin Hester
9889fa1da1 add channel url gen test 2021-03-19 21:27:41 +08:00
Kevin Hester
699d5076b5 use unmock to test and fix the channel suffix generation to match device 2021-03-19 17:42:26 +08:00
Kevin Hester
c405cdc200 try to notice when user wants to go back to default settings 2021-03-19 17:09:35 +08:00
Kevin Hester
a35714186d Merge pull request #261 from geeksville/dev1.2 
changes from while on vacation
 2021-03-19 15:16:03 +08:00
Kevin Hester
a18343e30c Merge remote-tracking branch 'root/master' into dev1.2 
# Conflicts:
#	app/src/main/java/com/geeksville/mesh/service/MeshService.kt
#	app/src/main/java/com/geeksville/mesh/service/MockInterface.kt
#	app/src/main/res/values/strings.xml
 2021-03-19 15:09:33 +08:00
Kevin Hester
8a18680d0a Merge pull request #259 from Crotery/master 
Display time ago and coords for users
 2021-03-19 15:01:05 +08:00
Kevin Hester
3ab9ee4afc Merge branch 'master' into master 2021-03-19 15:00:49 +08:00
Kevin Hester
dc96565ff1 Merge pull request #260 from vfurman-gh/master 
Save messages in CSV file
 2021-03-19 14:57:42 +08:00
goga
3e3dc47440 oops, show not only my coords, but neighbour's too 2021-03-18 11:11:37 +05:00
Vadim Furman
78a08898fe Save messages in CSV and fix position broadcast 2021-03-17 21:00:01 -07:00
Kevin Hester
6ed7af3763 fix autobug with getnodenum failing during startup 2021-03-17 16:04:29 +08:00
Kevin Hester
aac5e7cd7e stop fetching channels at first !disabled entry 2021-03-17 15:53:36 +08:00
Kevin Hester
3175d5e2d2 autobug while app shutting down 2021-03-17 15:53:08 +08:00
Kevin Hester
c2f578c971 fix autobug when setting channels on !connected radio 2021-03-17 15:40:09 +08:00
Kevin Hester
98356b9205 fix autobug crash when primary channel is null 2021-03-17 15:37:09 +08:00
goga
6958e3c86a coords position fix 2021-03-16 11:38:42 +05:00
goga
452bf6f6cb show coordinates with geo url to open in other mapping app 2021-03-16 10:04:01 +05:00
goga
53745ca9f5 display timeAgo properly and show coords in users screen 2021-03-16 00:05:28 +05:00
goga
c8107441de display timeAgo properly and show coords in users screen 2021-03-15 23:46:53 +05:00
Kevin Hester
fa17c4efe1 fix new hwmodel based on testing with the simulator 2021-03-15 10:31:44 +08:00
Kevin Hester
483bd878ab untested change to use new hwmodel 2021-03-14 11:42:04 +08:00