Merge branch 'Development' of https://github.com/fesch/CanZE into Dev…

…elopment
fesch · Mar 6, 2017 · 43b2eb6 · 43b2eb6
2 parents d11224e + bf08b3c
commit 43b2eb6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -62,25 +62,23 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -90,7 +88,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -108,5 +105,6 @@
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="android-android-22" level="project" />
   </component>
 </module>
diff --git a/app/src/main/java/lu/fisch/canze/activities/MainActivity.java b/app/src/main/java/lu/fisch/canze/activities/MainActivity.java
@@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity implements FieldListener /*,
     public static final short CAR_FLUENCE           = 0x001;
     public static final short CAR_ZOE_Q210          = 0x002;
     public static final short CAR_KANGOO            = 0x004;
-    // public static final short CAR_TWIZY          = 0x008;     // you'll never know ;-)
+    public static final short CAR_TWIZY             = 0x008;     // you'll never know ;-)
     public static final short CAR_X10               = 0x010;     // not used
     public static final short CAR_ZOE_R240          = 0x020;
     public static final short CAR_ZOE_Q90           = 0x040;
@@ -310,6 +310,9 @@ public void loadSettings()
                 case "Kangoo":
                     car = CAR_KANGOO;
                     break;
+                case "Twizy":
+                    car = CAR_TWIZY;
+                    break;
                 case "X10":
                     car = CAR_X10;
                     break;
@@ -929,6 +932,10 @@ public static boolean isFluKan () {
         return (car == CAR_FLUENCE || car == CAR_KANGOO);
     }
 
+    public static boolean isTwizy() {
+        return (car == CAR_TWIZY);
+    }
+
 
     public static String getBluetoothDeviceAddress() {
         if("HTTP Gateway".equals(bluetoothDeviceName))

diff --git a/app/src/main/java/lu/fisch/canze/activities/SettingsActivity.java b/app/src/main/java/lu/fisch/canze/activities/SettingsActivity.java
@@ -151,6 +151,7 @@ public void onNothingSelected(AdapterView<?> parent) {
         arrayAdapter.add("ZOE R90");
         arrayAdapter.add("Fluence");
         arrayAdapter.add("Kangoo");
+        arrayAdapter.add("Twizy");
         arrayAdapter.add("X10");
 
         int index = 0;

diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt
@@ -1,3 +1,5 @@
+2017.03.06 [Bob] Enabled Twizy. More to come soon ...
+
 ---< Version 1.24 / 2017.02.21 >---
 2017.02.21 [Bob] Hotfix for issue #441
 2017.02.21 [Bob] Trying to fix #310