support for 1367

uh huh
Update MainActivity.java
2026-03-30 17:45:38 +00:00 · 2024-10-15 18:45:53 +00:00 · 2024-10-15 18:02:39 +00:00 · 2024-09-16 12:13:53 +00:00 · 2024-09-16 11:39:33 +00:00 · 2024-09-16 11:21:28 +00:00
12 changed files with 420 additions and 53 deletions
--- a/.idea/PricehaxBT.iml
+++ b/.idea/PricehaxBT.iml
@@ -1,14 +0,0 @@
-<?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="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceStreaming">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.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>
--- a/PricehaxBT.apk
+++ b/PricehaxBT.apk
--- a/README.md
+++ b/README.md
@@ -11,10 +11,22 @@ 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 1603 Yellow
+- HD 150
+- HD 200
+- 1624 Freezer
+- 1628 (B407047372716287)
+- 1639 (A406048236716396)
+- 1243 Continuum E4 HCW (F45324224927123434)
+- 1627 (D4611412853816278)
+
 ### Version 1.3 (21)

 **Features**
@@ -77,4 +89,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
--- a/app/src/app/build.gradle
+++ b/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 {
@@ -16,6 +16,7 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
+    namespace 'org.furrtek.pricehaxbt'
 }

 dependencies {
--- a/app/src/app/src/main/AndroidManifest.xml
+++ b/app/src/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.furrtek.pricehaxbt" platformBuildVersionCode="23" platformBuildVersionName="6.0-2438415">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    platformBuildVersionCode="23" platformBuildVersionName="6.0-2438415">
    <uses-permission android:name="android.permission.CAMERA"/>
    <uses-permission android:name="android.permission.BLUETOOTH"/>
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
--- a/app/src/app/src/main/java/org/furrtek/pricehaxbt/MainActivity.java
+++ b/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,13 +280,7 @@ 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 1318:
@@ -310,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;
@@ -317,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;
@@ -332,6 +321,17 @@ 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 1603:
            case 1344:
                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD L Yellow 296x128) EXPERIMENTAL");
                MainActivity.this.wi = 296;
@@ -370,7 +370,21 @@ public class MainActivity extends Activity {
                MainActivity.this.ESLType = 2;
                MainActivity.this.ESLTypeColor = true;
                break;
-
+            case 1381:
+                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (SmartTag HD110 Yellow 400x300) EXPERIMENTAL");
+                MainActivity.this.wi = 400;
+                MainActivity.this.hi = 300;
+                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");
@@ -381,6 +395,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;
@@ -396,6 +411,8 @@ public class MainActivity extends Activity {
                MainActivity.this.ESLType = 2;
                break;
            case 1340:
+            case 1367:
+            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;
@@ -410,6 +427,9 @@ public class MainActivity extends Activity {
                MainActivity.this.ESLTypeColor = true;
                break;

+
+
+
            default:
                MainActivity.this.scaneitype.setText("Type: " + MainActivity.this.PLType + " (incompatible)");
                MainActivity.this.ESLType = -1;
--- a/app/src/build.gradle
+++ b/app/src/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:8.7.1'
    }
 }

--- a/app/src/gradle.properties
+++ b/app/src/gradle.properties
@@ -6,6 +6,9 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
--- a/app/src/gradle/wrapper/gradle-wrapper.properties
+++ b/app/src/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 08 15:05:08 CEST 2019
+#Mon Sep 16 10:50:38 GMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
--- a/dongle/v3.2.0/PricehaxBT_IRDongle_prog/PricehaxBT_IRDongle_prog.ino
+++ b/dongle/v3.2.0/PricehaxBT_IRDongle_prog/PricehaxBT_IRDongle_prog.ino
@@ -1,16 +1,39 @@
 /* 
- *  Pricehax BT IR dongle (for Pricehax Version 1.3 BT (21))
+ *  Pricehax BT IR dongle (for Pricehax Version 1.3+ BT (21+))
 *  furrtek 2014
- *  david4599 2019 - 2022
+ *  david4599 2019 - 2024
 */


 #define F_CPU 16000000UL
 #define NOP __asm__ __volatile__ ("nop")

+
+// Arduino Mega (digital pin 2 = physical pin PE4)
+#if (defined(ARDUINO_AVR_MEGA) || \
+    defined(ARDUINO_AVR_MEGA1280) || \
+    defined(ARDUINO_AVR_MEGA2560) || \
+    defined(__AVR_ATmega1280__) || \
+    defined(__AVR_ATmega1281__) || \
+    defined(__AVR_ATmega2560__) || \
+    defined(__AVR_ATmega2561__))
+
+#define SET_PORT_OUTPUT() (DDRE = 1 << 4)
+#define SET_LED_LOW() (PORTE &= ~(1 << 4))
+#define LED_TOGGLE() (PORTE ^= (1 << 4))
+
+// Arduino Uno, Nano and some others (digital pin 2 = physical pin PD2)
+#else
+
+#define SET_PORT_OUTPUT() (DDRD = 1 << 2)
+#define SET_LED_LOW() (PORTD &= ~(1 << 2))
+#define LED_TOGGLE() (PORTD ^= (1 << 2))
+
+#endif
+
+
 #define BT_RX_PIN 10
 #define BT_TX_PIN 12
-#define LED_PIN 2

 #define PULSES_PP4C 50
 #define PULSES_PP16 26
@@ -199,10 +222,10 @@ boolean getFrame() {
 // If the function is changed, the timings will need to be adjusted by adding or removing NOPs
 void sendPPMBurst(uint8_t pulses) {
    for(uint8_t i = 0; i < pulses; i++){
-        PORTD ^= (1 << LED_PIN);
+        LED_TOGGLE();
        NOP;
        NOP;
-        PORTD ^= (1 << LED_PIN);
+        LED_TOGGLE();
        NOP;
    }
 }
@@ -340,8 +363,8 @@ void sendPP16Frame() {


 void setup() {
-    DDRD |= (1 << LED_PIN); // Define led pin as output
-    PORTD &= (0 << LED_PIN); // Set led pin to low state
+    SET_PORT_OUTPUT();
+    SET_LED_LOW();
    
    cli(); // Stop all interrupts
    // Set bit TOIE0 in the TIMSK0 register to zero to disable timer0 interrupt
@@ -391,4 +414,4 @@ void loop() {

        gDataLengthTemp = 0;
    }
-}
+}
Author	SHA1	Message	Date
dandri	81bd43b7fa	support for 1367	2024-10-15 18:45:53 +00:00
dandri	4ce363f37d	uh huh	2024-10-15 18:02:39 +00:00
dandri	4d24d1d79d	Update MainActivity.java	2024-09-16 12:13:53 +00:00
dandri	e52be8e9c8	update	2024-09-16 11:39:33 +00:00
dandri	094d4f05c8	Update gradle-wrapper.properties	2024-09-16 11:21:28 +00:00
dandri	a352e61592	Support for Smarttag HD110 Yellow	2024-09-16 10:51:32 +00:00
dandri	ec66a1bd55	del	2024-04-30 23:29:07 +00:00
dandri	ccc542dd26	Update PricehaxBT_IRDongle_prog.ino	2024-04-30 23:27:23 +00:00
dandri	7be40a0bf4	Update README.md	2024-04-27 10:59:41 +00:00
dandri	40f0aa3c6f	Add files via upload	2024-04-26 18:32:46 +00:00
dandri	581184a691	add support for 1603 Yellow	2024-04-26 17:54:34 +00:00
dandri	10f5abd1c6	Update README.md	2023-05-26 14:23:37 +00:00
dandri	02770aa909	Support for 1624 HD M FZ	2023-05-20 20:03:01 +00:00
dandri	330a66d5b0	remove HD300 and add support for new HD 150 and HD 200	2023-05-05 23:09:55 +00:00
dandri	ee57c80db8	fix resolution for HD 300	2023-05-05 18:30:12 +00:00
dandri	e34eb7278f	Add support for HD 300	2023-05-05 18:13:39 +00:00
dandri	ee38b97de8	Update README.md	2023-05-04 21:45:44 +00:00
dandri	4ee9a9451a	Delete PricehaxBT.apk	2023-05-04 21:42:23 +00:00
dandri	3fccdd32a0	Delete .idea directory	2023-05-04 13:15:33 +00:00
dandri	0c95e04c94	Update version	2023-05-02 12:52:56 +00:00
dandri	0f28b9c155	fix dup	2023-04-30 17:33:04 +00:00
dandri	50be98fe86	Merge branch 'test'	2023-04-30 17:29:52 +00:00
dandri	20a1f0bcee	Update MainActivity fixes	2023-04-30 17:23:13 +00:00
dandri	9e02ac3953	fix fix Mainactivity	2023-04-30 16:55:03 +00:00
dandri	29f1c6f202	Update README.md	2023-04-30 13:12:03 +00:00
dandri	85e16b72e4	Update README.md	2023-04-30 13:11:26 +00:00
dandri	d787599873	Update README.md	2023-04-29 12:59:08 +00:00
dandri	b7fce4bfbf	Update README.md	2023-04-29 11:44:09 +00:00
dandri	a618faaffe	Merge branch 'master' of https://github.com/dandri/PricehaxBT	2023-04-28 18:58:27 +00:00
dandri	33d79571b6	Support for 1627	2023-04-28 18:58:23 +00:00
dandri	c856a39c8e	Add support for 1243 Continuum HCN Add support for 1243 Continuum HCN	2023-04-27 19:09:51 +00:00
dandri	0a110abb02	Add support for 1243 Continuum HCN	2023-04-27 19:08:16 +00:00
dandri	c808e0ed4e	Delete .github/workflows directory	2023-04-26 21:03:51 +00:00
dandri	d1b40b377e	Create gradle.yml	2023-04-26 17:05:50 +00:00
dandri	4499bfbf9f	Update MainActivity.java	2023-04-21 14:25:47 +00:00