Bluetooth GPS は VSD 接続が全部完了してから接続する #14

yoshinrt · Jun 27, 2019 · 736339e · 736339e
1 parent e1b7532
commit 736339e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/vsdroid/vsdroid/src/main/AndroidManifest.xml b/vsdroid/vsdroid/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="jp.dds.vsdroid"
-	android:versionCode="978"
-	android:versionName="r978" >
+	android:versionCode="979"
+	android:versionName="r979" >
 
 	<uses-sdk
         android:targetSdkVersion="10" />

diff --git a/vsdroid/vsdroid/src/main/java/jp/dds/vsdroid/VsdInterface.java b/vsdroid/vsdroid/src/main/java/jp/dds/vsdroid/VsdInterface.java
@@ -646,6 +646,9 @@ private void LoadCtrlLine(){
 
 	public void Open() throws UnrecoverableException, IOException {
 		OpenVsdIf();
+		LoadFirmware();
+		SetupMode();
+
 		if( Pref.getBoolean( "key_use_btgps", true )){
 			Gps = new GpsInterface( GpsMsgHandler, Pref );
 			Gps.Start();
@@ -724,7 +727,7 @@ public void LoadFirmware() throws IOException {
 			MsgHandler.sendEmptyMessage( R.string.statmsg_loadfw_sending );
 			while(( iReadSize = fsFirm.read( Buf, 0, iBufSize )) > 0 ){
 				OutStream.write( Buf, 0, iReadSize );
-				Sleep( iFwSendWait );
+				if( iFwSendWait > 0 ) Sleep( iFwSendWait );
 			}
 
 			MsgHandler.sendEmptyMessage( R.string.statmsg_loadfw_wait );
@@ -860,8 +863,6 @@ public void run(){
 			try{
 				Close(); // 開いていたら一旦 close
 				Open();
-				LoadFirmware();
-				SetupMode();
 
 				// Read WDT 発動
 				uReadWdt = 0;

diff --git a/vsdroid/vsdroid/src/main/java/jp/dds/vsdroid/Vsdroid.java b/vsdroid/vsdroid/src/main/java/jp/dds/vsdroid/Vsdroid.java
@@ -748,7 +748,7 @@ public void Config(){
 			ed.putString( "key_bt_devices_vsd",	"VSD / 00:12:02:10:01:76" );
 			ed.putString( "key_ip_addr",		"192.168.0.13" );
 			ed.putString( "key_connection_mode","1" );
-			ed.putString( "key_fw_send_wait",	"100" );
+			ed.putString( "key_fw_send_wait",	"0" );
 			ed.putBoolean( "key_use_btgps",		true );
 		}
 		ed.commit();