Panasonic機の機種拡大で一部変更。

diff --git a/app/build.gradle b/app/build.gradle
index 76fdf70..a05d4c8 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation "androidx.core:core-ktx:1.6.0"
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt
index 8d2722c..3f92543 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/status/CameraStatusConvert.kt
@@ -108,7 +108,7 @@ class CameraStatusConvert(private val statusHolder: CameraStatusHolder, remote:
                     34 -> "STAR"
                     105 -> "FAN"
                     60 -> "Movie"
-                    0 -> "($value2)"
+                    0 -> "iA"
                     else -> "$value($value2)"
                 }
             }
@@ -394,11 +394,19 @@ class CameraStatusConvert(private val statusHolder: CameraStatusHolder, remote:
                         9 -> "CINELIKE D"
                         10 -> "CINELIKE V"
                         12 -> "L.MONO"
+                        13 -> "709L"
                         14 -> "CUSTOM1"
                         15 -> "CUSTOM2"
                         16 -> "CUSTOM3"
                         17 -> "CUSTOM4"
                         19 -> "L.MONO D"
+                        20 -> "FLAT"
+                        21 -> "MY1"
+                        22 -> "MY2"
+                        23 -> "MY3"
+                        24 -> "MY4"
+                        37 -> "L.CLAS N"
+                        38 -> "L.MONO S"
                         else -> "($value)"
                     }
                 }
@@ -646,6 +654,6 @@ class CameraStatusConvert(private val statusHolder: CameraStatusHolder, remote:
     companion object
     {
         private val TAG = CameraStatusConvert::class.java.simpleName
-        private const val isDumpData = true
+        private const val isDumpData = false
     }
 }

diff --git a/build.gradle b/build.gradle
index e2aa019..5752b08 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.30"
+    ext.kotlin_version = "1.5.31"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong