Merge branch 'master' into zg1/zone1

2024-06-27 12:15:55 +02:00 · 2024-06-27 12:15:55 +02:00 · 120cdc0220
commit 120cdc0220
parent 135d93adf1 a14d391f99
14 changed files with 343 additions and 4 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@ -0,0 +1,18 @@
+{	     
+"title":"DC2C_cash  ",
+"project":"Klaipeda",
+"version":"15.10.2023 14:55 02.00.06",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Klaipeda",
+"version":"15.11.2023 00001",
+"custNum":335,
+"machNum":1000,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"Lebzeltergasse 4-12"
+}
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@ -0,0 +1,30 @@
+{
+"title":"DC2C_device",
+"project":"Klaipeda",
+"Version":"04.12.2023 00103",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":0,
+"modem":1,
+"creditCard":1,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refundPrint":1,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1
+}
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@ -0,0 +1,41 @@
+{
+"title":"DC2C_pri01",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"graf":"logo1",
+"text":"Klaipeda",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 11",
+"vari":"Dynamic01",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@ -0,0 +1,25 @@
+{
+"title":"DC2C_pri02",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri03",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"project":"Klaipeda",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@ -0,0 +1,41 @@
+{
+"title":"DC2C_pri05",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"graf":"logo1",
+"text":"Klaipeda",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 11",
+"vari":"Dynamic01",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@ -0,0 +1,26 @@
+{
+"title":"DC2C_pri06",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri07",
+"project":"Klaipeda",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"Klaipeda",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -5,7 +5,12 @@
 ###############################################################################
 # 
 opkg update
-#opkg install --force-downgrade  https://firmware.ptu5.atb-comm.de/testing/00700/atb-plugin-calculateprice-mobilisis_1.5.0+git0+034adf9096-r1-00700_cortexa9t2hf-neon.ipk
-#opkg install --force-downgrade https://firmware.ptu5.atb-comm.de/testing/00700/libmobilisis-calc2_2.1.99+git0+c7623429d9-r0-00700_cortexa9t2hf-neon.ipk
-
-
+opkg install prepare-update
+#
+#opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
+#opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
+#opkg --cache /var/cache/opkg --download-only upgrade atbqt
+#
+#opkg --cache /var/cache/opkg upgrade atb-dc-libraries
+#opkg --cache /var/cache/opkg upgrade atb-plugin-dc
+#opkg --cache /var/cache/opkg upgrade atbqt