Update to 10.10.6.0 (#38)

farafonov-alexey · Jan 1, 2025 · 6341f0b · 6341f0b
1 parent 19d3c7d
commit 6341f0b
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Название
 =========
-Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.5.0` от компании [АТОЛ](https://www.atol.ru/)
+Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.6.0` от компании [АТОЛ](https://www.atol.ru/)
 
 [ Источник ](https://forum.atol.ru/lofiversion/index.php/t34345.html)
 

diff --git a/src/libfptr10.h b/src/libfptr10.h
@@ -1092,6 +1092,10 @@ enum libfptr_tax_type
     LIBFPTR_TAX_VAT20,
     LIBFPTR_TAX_VAT120,
     LIBFPTR_TAX_INVALID,
+    LIBFPTR_TAX_VAT5,
+    LIBFPTR_TAX_VAT105,
+    LIBFPTR_TAX_VAT7,
+    LIBFPTR_TAX_VAT107
 };
 
 enum libfptr_external_device_type

diff --git a/src/linux-arm64/libfptr10.so b/src/linux-arm64/libfptr10.so
diff --git a/src/linux-armhf/libfptr10.so b/src/linux-armhf/libfptr10.so
diff --git a/src/linux-x64/libfptr10.so b/src/linux-x64/libfptr10.so
diff --git a/src/linux-x86/libfptr10.so b/src/linux-x86/libfptr10.so
diff --git a/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10.h b/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10.h
@@ -322,6 +322,7 @@ enum libfptr_error
     LIBFPTR_ERROR_MINIPOS_NO_FILE_ON_USB_STORE,
     LIBFPTR_ERROR_MINIPOS_NO_AGENT_FISCAL_PROPERTY,
     LIBFPTR_ERROR_NO_CONNECTION_WITH_PRINT_SERVICE,
+    LIBFPTR_ERROR_UNIVERSAL_COUNTERS_ARE_DISABLED,
 
     LIBFPTR_ERROR_BASE_MARKING = 400,
     LIBFPTR_ERROR_MARKING_CODE_VALIDATION_IN_PROGRESS,
@@ -770,6 +771,9 @@ enum libfptr_param
     LIBFPTR_PARAM_MARKING_NOT_FORM_REQUEST,
     LIBFPTR_PARAM_PRINT_ENTITY_TYPE,
     LIBFPTR_PARAM_RECEIPT_TAPE_PATH_LENGTH,
+    LIBFPTR_PARAM_LICENSE_INDEX,
+    LIBFPTR_PARAM_IS_LICENSE_VALID,
+    LIBFPTR_PARAM_RECEIPT_PERCENTAGE_SIZE,
 
     // certification
     LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
@@ -1091,6 +1095,10 @@ enum libfptr_tax_type
     LIBFPTR_TAX_NO,
     LIBFPTR_TAX_VAT20,
     LIBFPTR_TAX_VAT120,
+    LIBFPTR_TAX_VAT5,
+    LIBFPTR_TAX_VAT7,
+    LIBFPTR_TAX_VAT105,
+    LIBFPTR_TAX_VAT107,
     LIBFPTR_TAX_INVALID,
 };
 
@@ -1191,6 +1199,7 @@ enum libfptr_fn_data_type
     LIBFPTR_FNDT_MARKING_MODE_STATUS,
     LIBFPTR_FNDT_CHECK_MARK_TIME,
     LIBFPTR_FNDT_RECEIPT_SIZE,
+    LIBFPTR_FNDT_NOTIFICATION_STATUS,
 
     // certification
     LIBFPTR_FNDT_FNM_KEYS_UPDATE_DATE_TIME

diff --git a/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10_objc.h b/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10_objc.h
@@ -65,7 +65,7 @@
 #define LIBFPTR_MODEL_ATOL_42FA 70
 #define LIBFPTR_MODEL_ALLIANCE_20F 50
 #define LIBFPTR_MODEL_ATOL_55V2F 66
-#define LIBFPTR_MODEL_ATOL_STB_6 92
+#define LIBFPTR_MODEL_ATOL_STB_6F 92
 #define LIBFPTR_MODEL_ATOL_35F 97
 #define LIBFPTR_PORT_BR_1200 1200
 #define LIBFPTR_PORT_BR_2400 2400
@@ -578,9 +578,12 @@ enum libfptr_param
     LIBFPTR_PARAM_MARKING_NOT_FORM_REQUEST = 65930,
     LIBFPTR_PARAM_PRINT_ENTITY_TYPE = 65931,
     LIBFPTR_PARAM_RECEIPT_TAPE_PATH_LENGTH = 65932,
-    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 65933,
-    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 65934,
-    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 65935,
+    LIBFPTR_PARAM_LICENSE_INDEX = 65933,
+    LIBFPTR_PARAM_IS_LICENSE_VALID = 65934,
+    LIBFPTR_PARAM_RECEIPT_PERCENTAGE_SIZE = 65935,
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 65936,
+    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 65937,
+    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 65938,
 };
 
 enum libfptr_error
@@ -863,6 +866,7 @@ enum libfptr_error
     LIBFPTR_ERROR_MINIPOS_NO_FILE_ON_USB_STORE = 275,
     LIBFPTR_ERROR_MINIPOS_NO_AGENT_FISCAL_PROPERTY = 276,
     LIBFPTR_ERROR_NO_CONNECTION_WITH_PRINT_SERVICE = 277,
+    LIBFPTR_ERROR_UNIVERSAL_COUNTERS_ARE_DISABLED = 278,
 };
 
 enum libfptr_marking_error
@@ -1074,7 +1078,11 @@ enum libfptr_tax_type
     LIBFPTR_TAX_NO = 6,
     LIBFPTR_TAX_VAT20 = 7,
     LIBFPTR_TAX_VAT120 = 8,
-    LIBFPTR_TAX_INVALID = 9,
+    LIBFPTR_TAX_VAT5 = 9,
+    LIBFPTR_TAX_VAT7 = 10,
+    LIBFPTR_TAX_VAT105 = 11,
+    LIBFPTR_TAX_VAT107 = 12,
+    LIBFPTR_TAX_INVALID = 13,
 };
 
 enum libfptr_external_device_type
@@ -1173,7 +1181,8 @@ enum libfptr_fn_data_type
     LIBFPTR_FNDT_MARKING_MODE_STATUS = 21,
     LIBFPTR_FNDT_CHECK_MARK_TIME = 22,
     LIBFPTR_FNDT_RECEIPT_SIZE = 23,
-    LIBFPTR_FNDT_FNM_KEYS_UPDATE_DATE_TIME = 24,
+    LIBFPTR_FNDT_NOTIFICATION_STATUS = 24,
+    LIBFPTR_FNDT_FNM_KEYS_UPDATE_DATE_TIME = 25,
 };
 
 enum libfptr_unit_type

diff --git a/src/macos-x86_64/fptr10.framework/Versions/A/Resources/Info.plist b/src/macos-x86_64/fptr10.framework/Versions/A/Resources/Info.plist
@@ -24,10 +24,10 @@
 	<string>FMWK</string>
 
 	<key>CFBundleVersion</key>
-	<string>10.10.5.0</string>
+	<string>10.10.6.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>10.10.5</string>
+	<string>10.10.6</string>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>

diff --git a/src/macos-x86_64/fptr10.framework/Versions/A/fptr10 b/src/macos-x86_64/fptr10.framework/Versions/A/fptr10
diff --git a/src/win-x64/fptr10.dll b/src/win-x64/fptr10.dll
diff --git a/src/win-x64/fptr10.lib b/src/win-x64/fptr10.lib
diff --git a/src/win-x86/fptr10.dll b/src/win-x86/fptr10.dll
diff --git a/src/win-x86/fptr10.lib b/src/win-x86/fptr10.lib