Add et/psa_tariff

etc/psa_tariff/tariff04.json

@@ -35,10 +35,11 @@
       "pop_day_night_end_time": "16:30:00",
       "pop_price_night": 0,
       "pop_min_time": 15,
-      "pop_max_time": 600,
+      "pop_max_time": 240,
       "pop_min_price": 0,
       "pop_carry_over": 1,
-      "pop_daily_card_price": 2400
+      "pop_daily_card_price": 2400,
+      "pop_multi_hour_price": 0
     }
   ],
   "PaymentRate": [
@@ -63,6 +64,11 @@
       "pun_id": 4,
       "pun_label": "1 min",
       "pun_duration": 1
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Voller Tag",
+      "pun_duration": 1441
     }
   ],
   "WeekDaysWorktime": [
@@ -166,6 +172,22 @@
       "pye_start_day": 1,
       "pye_end_month": 12,
       "pye_end_day": 31
+    },
+    {
+      "pye_id": 17,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 18,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
     }
   ],
   "SpecialDaysWorktime": [
@@ -462,6 +484,146 @@
       "pedwt_time_from": "00:00:00",
       "pedwt_time_to": "00:00:00",
       "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2271,
+      "pedwt_period_exc_day_id": 2072,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2272,
+      "pedwt_period_exc_day_id": 2073,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2273,
+      "pedwt_period_exc_day_id": 2074,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2274,
+      "pedwt_period_exc_day_id": 2075,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2275,
+      "pedwt_period_exc_day_id": 2076,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2276,
+      "pedwt_period_exc_day_id": 2077,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2277,
+      "pedwt_period_exc_day_id": 2078,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2278,
+      "pedwt_period_exc_day_id": 2079,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2279,
+      "pedwt_period_exc_day_id": 2080,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2280,
+      "pedwt_period_exc_day_id": 2081,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2281,
+      "pedwt_period_exc_day_id": 2082,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2282,
+      "pedwt_period_exc_day_id": 2083,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2283,
+      "pedwt_period_exc_day_id": 2084,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2284,
+      "pedwt_period_exc_day_id": 2085,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2285,
+      "pedwt_period_exc_day_id": 2086,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2286,
+      "pedwt_period_exc_day_id": 2087,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2287,
+      "pedwt_period_exc_day_id": 2088,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2288,
+      "pedwt_period_exc_day_id": 2089,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2289,
+      "pedwt_period_exc_day_id": 2090,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2290,
+      "pedwt_period_exc_day_id": 2091,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
     }
   ],
   "SpecialDays": [
@@ -800,6 +962,168 @@
       "ped_date_end": "2024-05-19",
       "ped_period_special_day_id": 2,
       "ped_year": 2024
+    },
+    {
+      "ped_id": 2072,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2022-12-25",
+      "ped_date_end": "2022-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2073,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2022-12-26",
+      "ped_date_end": "2022-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2074,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2022-10-23",
+      "ped_date_end": "2022-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2075,
+      "ped_label": "Christmas (Sunday)",
+      "ped_date_start": "2022-12-24",
+      "ped_date_end": "2022-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2076,
+      "ped_label": "Holiday (Hungary)",
+      "ped_date_start": "2022-12-31",
+      "ped_date_end": "2022-12-31",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2077,
+      "ped_label": "NewYear",
+      "ped_date_start": "2023-01-01",
+      "ped_date_end": "2023-01-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2078,
+      "ped_label": "Good Friday",
+      "ped_date_start": "2023-04-07",
+      "ped_date_end": "2023-04-07",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2079,
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2023-04-09",
+      "ped_date_end": "2023-04-09",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2080,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2023-04-10",
+      "ped_date_end": "2023-04-10",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2081,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2023-05-28",
+      "ped_date_end": "2023-05-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2082,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2023-05-29",
+      "ped_date_end": "2023-05-29",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2083,
+      "ped_label": "Revolution Day (Hungary)",
+      "ped_date_start": "2023-03-15",
+      "ped_date_end": "2023-03-15",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2084,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2023-05-01",
+      "ped_date_end": "2023-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2085,
+      "ped_label": "Saint Stephens Day (Hungary)",
+      "ped_date_start": "2023-08-20",
+      "ped_date_end": "2023-08-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2086,
+      "ped_label": "All Saints Day",
+      "ped_date_start": "2023-11-01",
+      "ped_date_end": "2023-11-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2087,
+      "ped_label": "Good Friday",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2088,
+      "ped_label": "Easter",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2089,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2090,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2091,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
     }
   ]
 }
+
+

etc/psa_update/opkg_commands

@@ -28,6 +28,7 @@
 # 2023-07-18-14: test
 # 2023-07-19-1: test
 # 2023-07-19-2: test via service-menu
+# 2023-07-26-1: test
 # opkg info ptu5-gitinstaller
 # opkg info atbqt
 opkg update

etc/psa_webinterface/menu_config.json

@@ -0,0 +1,32 @@
+{
+    "File-Menue": [
+        {
+            "Name": "Tarif Zone 1",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone1"
+        },
+        {
+            "Name": "Tarif Zone 2",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone2"
+        },
+        {
+            "Name": "Tarif Zone 3",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone3"
+        },
+        {
+            "Name": "Tarif Zone 4",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone4"
+        },
+        {
+            "Name": "Tarif Zone 5",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone5"
+        },
+        {
+            "Name": "Tarif Zone 6",
+            "File-ID": "customer_999/etc/psa_tariff:zg1/zone6"
+        },
+        {
+            "Name": "Basic Configuration",
+            "File-ID": "customer_999/etc/psa_tariff:master"
+        }
+    ]
+}

opt/app/ATBAPP/ATBQT.ini

@@ -1,110 +1,90 @@
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2
+
 [COMMON]
-com_port_name=/dev/ttyS1
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useProduct=[128+][64+][32+][16+][8]
+%23useVehicle=[128+][64+][32+][16+][8]
+CharacterSet=ISO 8859-2
+alternativeLogoFile=
 com_baud_rate=9600
+com_port_name=/dev/ttyS1
+defaultLanguage=1
+feature_DBusDisplayControl=on
+feature_DBusDisplayDimLow=off
+feature_DBusSuspendControl=on
+feature_DisplayControl=off
+feature_Log=off
+feature_ShowParkingTime=off
+feature_StartButton=on
+feature_SystemSuspend=off
+feature_TouchFeedback=off
+feature_selfOOO=off
 lang1=hu_HU
 lang2=en_GB
 lang3=de_DE
 lang4=sr
 lang5=ro_RO
-
-defaultLanguage=1
-
-showInfoButton=false
-showHelpButton=false
-
-CharacterSet="ISO 8859-2"
-
-#useLanguage=[128+][64+][32+][16]
-useLanguage=248
-#usePayment=[128+][64+][32+][16]
-usePayment=96
-#useVehicle=[128+][64+][32+][16+][8]
-useVehicle=240
-#useProduct=[128+][64+][32+][16+][8]
-useProduct=240
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
 logfile=/var/log/atbqt.log
-alternativeLogoFile=
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_DisplayControl=off
-feature_SystemSuspend=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_DBusDisplayControl=on
-feature_DBusSuspendControl=on
-feature_ShowParkingTime=off
-
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
+sellTimeout_time=60
+showHelpButton=false
+showInfoButton=false
+statefile=/opt/app/ATBAPP/states/APP_States.xml
 suspend_methode=sysfs
 suspend_program=
 suspend_time=8
-
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
 touch_feedback_gpio=121
-touch_feedback_on_value=1
 touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=60
-
-showInfoButton=false
-showHelpButton=false
-
+touch_feedback_on_value=1
 useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
+useLanguage=240
+usePayment=96
+useProduct=240
+useVehicle=240
 
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,1"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
+[IngenicoISelf_CCPlugin]
+Currency=HUF
+PortName=/dev/ttymxc0
+ZVT=DE
+debug=1
+sleep=1
+sleepExtended=1
 
+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=CoinsOnly
+currencyISOCode=HUF
+currencySymbol=Ft
+paymentPointInTime=poa
+useHonestPayment=on
 
 [PLUGINS]
 CCPlugin=IngenicoISelf_CCPlugin
 CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
 DeviceControllerPlugin=ATBDeviceControllerPlugin
 
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_35="0,0,0"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,1"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
 
 [TCP_CONTROL]
 enable=1
 
-
-[PAYMENT]
-currencySymbol=Ft
-currencyISOCode=HUF
-cashVariant=CoinsOnly
-paymentPointInTime=poa
-
-
-[MOBILISIS_CalculatePricePlugin]
-useDebug=1
-tariffFileName=/etc/psa_tariff/tariff01.json
-
-[ATBDeviceControllerPlugin]
-serialPort=ttymxc2
-
-# Thu Jul 20 01:26:27 PM CEST 2023
-# Thu Jul 20 01:30:54 PM CEST 2023
-# Thu Jul 20 01:48:33 PM CEST 2023
-# Thu Jul 20 02:02:54 PM CEST 2023
-# Fri Jul 21 10:50:01 AM CEST 2023
-# Fri Jul 21 11:08:00 AM CEST 2023
-# Fri Jul 21 11:27:50 AM CEST 2023
-# Fri Jul 21 11:46:53 AM CEST 2023
+###