[-] Minor changes

shtrih-m · Apr 29, 2022 · 03007d9 · 03007d9
1 parent d943d2e
commit 03007d9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 95 deletions.
diff --git a/History.txt b/History.txt
@@ -8,7 +8,7 @@
 ********************************************************************************
 
   29.04.2022
-  deviceServiceVersion = 1013649
+  deviceServiceVersion = 1013650
 
   [-] Fixed error with receipt item discount
 

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/SmFptrConst.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/SmFptrConst.java
@@ -876,10 +876,11 @@ private SmFptrConst() {
     public static final int PORT_TYPE_SOCKET = 2;
     public static final int PORT_TYPE_FROMCLASS = 3;
     public static final int PORT_TYPE_BLUETOOTH_LE = 4;
-    public static final int PORT_TYPE_PPP = 5;
+    public static final int PORT_TYPE_PPP_BT = 5;
+    public static final int PORT_TYPE_PPP_BLE = 6;
 
     public static final int PORT_TYPE_MIN = 0;
-    public static final int PORT_TYPE_MAX = 5;
+    public static final int PORT_TYPE_MAX = 6;
 
     /////////////////////////////////////////////////////////////////////
     // Header mode constants

diff --git a/Source/Core/src/com/shtrih/util/CircularBuffer.java b/Source/Core/src/com/shtrih/util/CircularBuffer.java
diff --git a/Source/FiscalPrinterService/src/com/shtrih/fiscalprinter/port/PrinterPortFactory.java b/Source/FiscalPrinterService/src/com/shtrih/fiscalprinter/port/PrinterPortFactory.java
@@ -33,10 +33,6 @@ public static PrinterPort createInstance(FptrParameters params)
                 result = SocketPort.getInstance(params.portName, params.getByteTimeout());
                 break;
 
-            case SmFptrConst.PORT_TYPE_PPP:
-                result = new PPPPort(params);
-                break;
-
             case SmFptrConst.PORT_TYPE_FROMCLASS:
                 Class portClass = Class.forName(params.portClass);
                 Class[] parameters = new Class[0];

diff --git a/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java b/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java
@@ -1,5 +1,5 @@
 package com.shtrih.util;
 
 public class ServiceVersion {
-    public static final String VERSION = "649";
+    public static final String VERSION = "649-1-gd943d2e";
 }
diff --git a/Source/android/FptrServiceAndroid/src/com/shtrih/fiscalprinter/port/PrinterPortFactory.java b/Source/android/FptrServiceAndroid/src/com/shtrih/fiscalprinter/port/PrinterPortFactory.java
@@ -42,9 +42,12 @@ public static PrinterPort createPort(FptrParameters params) throws Exception
             case SmFptrConst.PORT_TYPE_BLUETOOTH_LE:
                 return new BluetoothLEPort();
 
-            case SmFptrConst.PORT_TYPE_PPP:
+            case SmFptrConst.PORT_TYPE_PPP_BT:
                 return new PPPPort(params, new BluetoothPort());
 
+            case SmFptrConst.PORT_TYPE_PPP_BLE:
+                return new PPPPort(params, new BluetoothLEPort());
+
             case SmFptrConst.PORT_TYPE_FROMCLASS:
                 Class portClass = Class.forName(params.portClass);
                 Class[] parameters = new Class[0];