Merge pull request #4 from dandri/test

Add support for new models

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/PricehaxBT.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/PricehaxBT.iml" filepath="$PROJECT_DIR$/.idea/PricehaxBT.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

README.md

@@ -11,21 +11,10 @@ Furrtek's videos of this project are archived in this [playlist](https://www.you
 - Create the dongle on breadboard following the schematic (or order the pcb and solder the components)
 - Using the AT commands, change the name of the HC-05/HC-06 module to "PRICEHAX TX V3" and its baudrate to 115200bps
 - Program the arduino nano with the included sketch
-- Download and install the [Android app](https://github.com/dandri/PricehaxBT/releases/latest), pair the dongle and enjoy ;-)
+- Download and install the [Android app](https://github.com/david4599/PricehaxBT/releases/latest), pair the dongle and enjoy ;-)
 
 ## Android app changelog
 
-### Version 1.4
-
-Added support for:
-- HD 150
-- HD 200
-- 1624 Freezer
-- 1628 (B407047372716287)
-- 1639 (A406048236716396)
-- 1243 Continuum E4 HCW (F45324224927123434)
-- 1627 (D4611412853816278)
-
 ### Version 1.3 (21)
 
 **Features**
@@ -88,4 +77,4 @@ Added support for:
 
 #
 
-Copyright (c) Furrtek 2014 & david4599 2019 - 2022
+Copyright (c) Furrtek 2014 & david4599 2019 - 2022

app/src/app/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 21
-        versionName "1.4"
+        versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/app/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Thu Apr 20 13:49:00 GMT 2023
-sdk.dir=C\:\\Users\\dandri\\AppData\\Local\\Android\\Sdk

app/src/app/src/main/java/org/furrtek/pricehaxbt/MainActivity.java

@@ -221,11 +221,14 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLType = 1;
                 break;
             case 1242:
-            case 1243:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (Continuum E4 HCN FZ)");
                 MainActivity.this.plBitDef = 0;
                 MainActivity.this.ESLType = 1;
                 break;
+            case 1243:
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (Continuum E4 HCW (18410-00) segments bitmap not done !)");
+                MainActivity.this.ESLType = 1;
+                break;
 
             case 1217:
             case 1265:
@@ -282,7 +285,6 @@ public class MainActivity extends Activity {
                 break;
 
 
-
             case 1318:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD M 208x112)");
                 MainActivity.this.wi = 208;
@@ -297,7 +299,6 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLTypeColor = true;
                 break;
             case 1324:
-            case 1624:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD M FZ 208x112) EXPERIMENTAL");
                 MainActivity.this.wi = 208;
                 MainActivity.this.hi = 112;
@@ -305,9 +306,8 @@ public class MainActivity extends Activity {
                 break;
 
 
-
             case 1315:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L 296x128) EXPERIMENTAL");
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L 296x128)");
                 MainActivity.this.wi = 296;
                 MainActivity.this.hi = 128;
                 MainActivity.this.ESLType = 2;
@@ -321,10 +321,9 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLType = 2;
                 MainActivity.this.ESLTypeColor = true;
                 break;
-
             case 1627:
             case 1628:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L Red 296x128) EXPERIMENTAL");
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L Red 296x128) ");
                 MainActivity.this.wi = 296;
                 MainActivity.this.hi = 128;
                 MainActivity.this.ESLType = 2;
@@ -370,7 +369,7 @@ public class MainActivity extends Activity {
                 break;
             case 1339:
             case 1639:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD S Red 152x152) EXPERIMENTAL");
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD S Red 152x152) ");
                 MainActivity.this.wi = 152;
                 MainActivity.this.hi = 152;
                 MainActivity.this.ESLType = 2;
@@ -386,7 +385,6 @@ public class MainActivity extends Activity {
             case 1371: // 2021 revision of the SmartTag HD150 Red 648x480 - black housing
             case 1353:
             case 1354:
-            case 1334: // Seems to be a new version of HD150
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD150 Red 648x480)");
                 MainActivity.this.wi = 648;
                 MainActivity.this.hi = 480;
@@ -402,7 +400,6 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLType = 2;
                 break;
             case 1340:
-            case 1358: // Seems to be a new version of HD200
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD200 Red 800x480) EXPERIMENTAL");
                 MainActivity.this.wi = 800;
                 MainActivity.this.hi = 480;
@@ -417,15 +414,6 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLTypeColor = true;
                 break;
 
-            case 1603:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L Yellow 296x128) EXPERIMENTAL");
-                MainActivity.this.wi = 296;
-                MainActivity.this.hi = 128;
-                MainActivity.this.ESLType = 2;
-                MainActivity.this.ESLTypeColor = true;
-                break;
-
-
             default:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (incompatible)");
                 MainActivity.this.ESLType = -1;