ズームの処理を少し見直す。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenZoomLensControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenZoomLensControl.java
index bcc04a1..31b12df 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenZoomLensControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenZoomLensControl.java
@@ -4,7 +4,10 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import net.osdn.gokigen.a01d.camera.IFocusingControl;
 import net.osdn.gokigen.a01d.camera.IZoomLensControl;
+import net.osdn.gokigen.a01d.camera.olympuspen.IOlympusPenInterfaceProvider;
+import net.osdn.gokigen.a01d.camera.olympuspen.operation.OlympusPenAutoFocusControl;
 import net.osdn.gokigen.a01d.camera.olympuspen.wrapper.hardware.OlympusPenHardwareStatus;
 import net.osdn.gokigen.a01d.camera.panasonic.wrapper.IPanasonicCamera;
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
index f3ab933..75a4926 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
@@ -138,10 +138,14 @@ public class OlympusPenCameraStatusWatcher implements ICameraStatusWatcher, ICam
         int status = (buffer[position + 7] & 0xff);
         if (status != focusingStatus)
         {
-            boolean focus = (status == 1);
-            boolean isError = (status == 2);
-            //Log.v(TAG, "FOCUS : " + focus + "(" + isError + ") " + status);
-            notifier.updateFocusedStatus(focus, isError);
+            // ドライブ停止時には、マーカの色は消さない
+            if (status > 0)
+            {
+                boolean focus = (status == 1);
+                boolean isError = (status == 2);
+                //Log.v(TAG, "FOCUS : " + focus + "(" + isError + ") " + status);
+                notifier.updateFocusedStatus(focus, isError);
+            }
             focusingStatus = status;
         }
     }