add update atb-plugin-calculateprice-mobilisis

Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_714
add update of libmobilisis-calc
2024-11-05 09:54:41 +01:00 · 2024-11-05 09:48:17 +01:00 · 2024-10-10 12:15:06 +02:00 · 2024-10-10 11:50:17 +02:00 · 2024-10-10 11:49:26 +02:00 · 2024-08-12 09:35:48 +02:00
15 changed files with 1441 additions and 711 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@ -4,7 +4,7 @@
 "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,0,1,1,1,1,1,1,1,1,1,0],
+"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],
@ -14,6 +14,5 @@
 "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
@ -3,11 +3,10 @@
 "project":"Korneuburg",
 "version":"15.11.2023 00001",
 "custNum":714,
-"machNum":8,
+"machNum":1000,
 "borough":1,
 "zone":1,
 "alias":0,
-"location":"Hauptplatz 39 Gericht"
+"location":"Lebzeltergasse 4-12"
 }
-#
-#
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@ -10,7 +10,7 @@
 "creditCard":1,
 "escrow":1,
 "RejMotor":0,
-"shutter":2,
+"shutter":1,
 "billRd":0,
 "vaultLock":0,
 "autoAlarm":1,
@ -23,8 +23,8 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":1,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1
 }
-#
-#
-#
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@ -7,6 +7,7 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
+"graf":"logo1",
 "text":"Korneuburg",
 "feed":"nl"
 "feed":"nl"
@ -26,7 +27,6 @@
 "styl":"size 00",
 "feed":"nl"
 }
-#



@ -39,5 +39,3 @@



-#
-#
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@ -1,4 +1,4 @@
-{
+{
 "title":"DC2C_pri02",
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
@ -10,7 +10,16 @@
 "text":"",
 "feed":"nl",
 "styl":"size 00"
-}
-#
-#
-#
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@ -1,4 +1,4 @@
-{
+{
 "title":"DC2C_pri03",
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
@ -18,7 +18,16 @@
 "text":"legen",
 "feed":"nl",
 "feed":"eject"
-}
-#
-#
-#
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@ -3,6 +3,4 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 01.01",
 "text":"";
-}#
-#
-#
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@ -7,6 +7,7 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
+"graf":"logo1",
 "text":"Korneuburg",
 "feed":"nl"
 "feed":"nl"
@ -38,6 +39,3 @@



-#
-#
-#
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@ -24,6 +24,3 @@



-#
-#
-#
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@ -31,6 +31,3 @@



-#
-#
-#
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@ -3,6 +3,4 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 01.01",
 "text":"";
-}#
-#
-#
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@ -19,6 +19,3 @@
 }


-#
-#
-#
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@ -40,6 +40,3 @@
 }


-#
-#
-#
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -6,17 +6,15 @@
 # 
 opkg update
 opkg install prepare-update
-opkg install atbupdatetool
-opkg install mxt-touch-reset
-opkg install atb-dc-libraries
-opkg install ptu5-systemcontroller
-opkg install atb-modemtools
-# opkg remove atb-accountingtool
-# opkg install atb-accountingtool
-#opkg --cache /var/cache/opkg --download-only upgrade
-#opkg --cache /var/cache/opkg upgrade
-# opkg remove apism
-# opkg install apism
-opkg info apism
-opkg info atbqt
-opkg info atbupdatetool
+#
+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 atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
+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 atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc
+opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Siegfried Siegert	f1c5c5fcd7	add update atb-plugin-calculateprice-mobilisis	2024-11-05 09:54:41 +01:00
Siegfried Siegert	53a7f2d259	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_714	2024-11-05 09:48:17 +01:00
Gerhard Hoffmann	b021214580	add update of libmobilisis-calc	2024-10-10 12:15:06 +02:00
Gerhard Hoffmann	e6dff1e58e	tariff-file for new tariff-calculator	2024-10-10 11:50:17 +02:00
Gerhard Hoffmann	ae9d8b4e74	Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_714	2024-10-10 11:49:26 +02:00
Siegfried Siegert	1a5b644fab	Tariff: fix holiday	2024-08-12 09:35:48 +02:00
Gerhard Hoffmann	f58ab23517	resolve merge conflict	2024-06-26 10:54:07 +02:00
Siegfried Siegert	cb78c4eada	DC_device: add paramter "housing" ... ... this is for enabling door switches on 1256 DC	2024-06-24 15:13:33 +02:00
Siegfried Siegert	daaa1cd8b8	DC_device: add paramter "housing" ... ... this is for enabling door switches on 1256 DC	2024-06-24 15:11:43 +02:00
Siegfried Siegert	2c8fd8a43d	opkg install release 2024-06-18	2024-06-18 11:23:38 +02:00
Siegfried Siegert	699d844897	Revert "opkg: install release 20240517-1" This reverts commit `b102e3a26d`.	2024-05-21 17:30:05 +02:00
Siegfried Siegert	b102e3a26d	opkg: install release 20240517-1	2024-05-21 09:11:58 +02:00
Gerhard Hoffmann	0fa2116748	Sync with branch zg1/zone1.	2024-04-24 15:37:06 +02:00
Gerhard Hoffmann	50f9d9b320	Check in files as created by Thomas.	2024-04-24 15:35:29 +02:00
Gerhard Hoffmann	305482d0c7	Removed any holiday not in 2024	2024-04-24 12:51:06 +02:00
Gerhard Hoffmann	85713e2bb5	Removed any holiday not in 2024	2024-04-24 12:49:35 +02:00
Gerhard Hoffmann	862e07cea3	Only keep "opkg update"	2024-04-23 13:48:10 +02:00
Gerhard Hoffmann	ef4ae8bb00	Use new device file: settings changed: shutter: 1	2024-04-23 13:44:26 +02:00
Gerhard Hoffmann	38dd230c8b	Added: opkg upgrade ptu5-systemcontroller	2024-04-09 16:23:52 +02:00
Gerhard Hoffmann	71f1479db9	Added: opkg upgrade ptu5-systemcontroller	2024-04-09 16:21:54 +02:00
Gerhard Hoffmann	3a8494bf0a	Updated (Thomas)	2024-04-03 14:01:08 +02:00
Gerhard Hoffmann	925bbd85b1	Updated (Thomas)	2024-04-03 14:00:00 +02:00
Gerhard Hoffmann	aecbb68a58	Updated to use logo	2024-04-02 15:50:57 +02:00
Gerhard Hoffmann	35606c6919	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_714 into zg1/zone1	2024-04-02 15:49:54 +02:00
Gerhard Hoffmann	7651213dfe	Updated to use logo	2024-04-02 15:49:30 +02:00
Gerhard Hoffmann	7f5d8fd0e0	Turn off 5-cent coin	2024-03-13 10:25:27 +01:00
Gerhard Hoffmann	f525653241	Add price per hour (to be compatible with Kirchdorf)	2024-03-07 08:14:42 +01:00
Gerhard Hoffmann	8bb8d9a66b	machNum=8, location: Hauptplatz 39 Gericht	2024-01-17 17:44:11 +01:00
Gerhard Hoffmann	30b5de36e3	Change dc-json-files for testing	2024-01-17 17:25:36 +01:00
Gerhard Hoffmann	a3a31e4925	base jsonfiles for korneuburg (added line for git)	2024-01-16 08:53:41 +01:00
Gerhard Hoffmann	34b9a7589c	Added installation of mxt-touch-reset	2024-01-16 08:32:50 +01:00
Gerhard Hoffmann	70f229e826	Fix: 2024-01-04 -> 2024-04-01 (1.April) Add: Ostersonntag (2x): 2024-03-31 + 2025-04-20.	2024-01-04 17:00:38 +01:00