Add files via upload

fixes

.idea/PricehaxBT.iml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

README.md

@@ -11,10 +11,21 @@ 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/david4599/PricehaxBT/releases/latest), pair the dongle and enjoy ;-)
+- Download and install the [Android app](https://github.com/dandri/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**
@@ -77,4 +88,4 @@ Furrtek's videos of this project are archived in this [playlist](https://www.you
 
 #
 
-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.3"
+        versionName "1.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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

@@ -221,20 +221,13 @@ 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 1217:
-            case 1628:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (Support for 1628 296x128) EXPERIMENTAL");
-                MainActivity.this.wi = 296;
-                MainActivity.this.hi = 128;
-                MainActivity.this.ESLType = 2;
-                MainActivity.this.ESLTypeColor = true;
-                break;
             case 1265:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (Continuum E5 HCS)");
                 MainActivity.this.plBitDef = 2;
@@ -287,21 +280,8 @@ public class MainActivity extends Activity {
                 MainActivity.this.hi = 152;
                 MainActivity.this.ESLType = 2;
                 break;
-            case 1339:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD S Red 152x152) EXPERIMENTAL");
-                MainActivity.this.wi = 152;
-                MainActivity.this.hi = 152;
-                MainActivity.this.ESLType = 2;
-                MainActivity.this.ESLTypeColor = true;
-                break;
 
-            case 1639:
-                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD 1639 152x152) EXPERIMENTAL");
-                MainActivity.this.wi = 152;
-                MainActivity.this.hi = 152;
-                MainActivity.this.ESLType = 2;
-                MainActivity.this.ESLTypeColor = true;
-                break;
+
 
             case 1318:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD M 208x112)");
@@ -317,6 +297,7 @@ 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;
@@ -324,6 +305,7 @@ public class MainActivity extends Activity {
                 break;
 
 
+
             case 1315:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L 296x128) EXPERIMENTAL");
                 MainActivity.this.wi = 296;
@@ -339,6 +321,15 @@ 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.wi = 296;
+                MainActivity.this.hi = 128;
+                MainActivity.this.ESLType = 2;
+                MainActivity.this.ESLTypeColor = true;
+                break;
             case 1344:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L Yellow 296x128) EXPERIMENTAL");
                 MainActivity.this.wi = 296;
@@ -377,7 +368,14 @@ public class MainActivity extends Activity {
                 MainActivity.this.ESLType = 2;
                 MainActivity.this.ESLTypeColor = true;
                 break;
-
+            case 1339:
+            case 1639:
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD S Red 152x152) EXPERIMENTAL");
+                MainActivity.this.wi = 152;
+                MainActivity.this.hi = 152;
+                MainActivity.this.ESLType = 2;
+                MainActivity.this.ESLTypeColor = true;
+                break;
 
             case 1351:
                 MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD150 648x480) EXPERIMENTAL");
@@ -388,6 +386,7 @@ 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;
@@ -403,6 +402,7 @@ 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,6 +417,15 @@ 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;