save current state

Some testing added
Minor: removed some debug output.
2024-09-13 10:42:45 +02:00 · 2024-09-11 12:11:49 +02:00 · 2024-09-11 11:56:06 +02:00 · 2024-09-11 11:55:03 +02:00 · 2024-09-11 11:54:16 +02:00 · 2024-09-11 11:49:31 +02:00
35 changed files with 9698 additions and 774 deletions
--- a/library/include/mobilisis/calculate_price.h
+++ b/library/include/mobilisis/calculate_price.h
@@ -42,18 +42,34 @@ struct CALCULATE_LIBRARY_API price_t {
 };

 struct CALCULATE_LIBRARY_API CalcState {
+    static QString const SUCCESS;
+    static QString const ERROR_PARSING_ZONE_NR;
+    static QString const ERROR_LOADING_TARIFF;
+    static QString const ERROR_PARSING_TARIFF;
+    static QString const NEGATIVE_PARKING_TIME;
+    static QString const INVALID_START_DATE;
+    static QString const WRONG_PARAM_VALUES;
+    static QString const WRONG_ISO_TIME_FORMAT;
+    static QString const ABOVE_MAX_PARKING_TIME;
+    static QString const BELOW_MIN_PARKING_TIME;
+    static QString const BELOW_MIN_PARKING_PRICE;
+    static QString const ABOVE_MAX_PARKING_PRICE;
+    static QString const OVERPAID;
+    static QString const OUTSIDE_ALLOWED_PARKING_TIME;
+
    enum class State : uint8_t {
        SUCCESS,
        ERROR_PARSING_ZONE_NR,
        ERROR_LOADING_TARIFF,
        ERROR_PARSING_TARIFF,
-        NEGATIVE_PARING_TIME,
+        NEGATIVE_PARKING_TIME,
        INVALID_START_DATE,
        WRONG_PARAM_VALUES,
        WRONG_ISO_TIME_FORMAT,
        ABOVE_MAX_PARKING_TIME,
        BELOW_MIN_PARKING_TIME,
        BELOW_MIN_PARKING_PRICE,
+        ABOVE_MAX_PARKING_PRICE,
        OVERPAID,
        OUTSIDE_ALLOWED_PARKING_TIME
    };
@@ -88,96 +104,153 @@ struct CALCULATE_LIBRARY_API CalcState {
        QString s;
        switch (m_status) {
        case State::SUCCESS:
-            s = "SUCCESS";
+            s = CalcState::SUCCESS;
            break;
        case State::ERROR_PARSING_ZONE_NR:
-            s = "ERROR_PARSING_ZONE_NR";
+            s = CalcState::ERROR_PARSING_ZONE_NR;
            break;
        case State::ERROR_LOADING_TARIFF:
-            s = "ERROR_LOADING_TARIFF";
+            s = CalcState::ERROR_LOADING_TARIFF;
            break;
        case State::ERROR_PARSING_TARIFF:
-            s = "ERROR_PARSING_TARIFF";
+            s = CalcState::ERROR_PARSING_TARIFF;
            break;
-        case State::NEGATIVE_PARING_TIME:
-            s = "NEGATIVE_PARKING_TIME";
+        case State::NEGATIVE_PARKING_TIME:
+            s = CalcState::NEGATIVE_PARKING_TIME;
           break;
        case State::ABOVE_MAX_PARKING_TIME:
-            s = "ABOVE_MAX_PARKING_TIME";
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
            break;
        case State::WRONG_PARAM_VALUES:
-            s = "WRONG_PARAM_VALUES";
+            s = CalcState::WRONG_PARAM_VALUES;
            break;
        case State::BELOW_MIN_PARKING_TIME:
-            s = "BELOW_MIN_PARKING_TIME";
+            s = CalcState::BELOW_MIN_PARKING_TIME;
            break;
        case State::BELOW_MIN_PARKING_PRICE:
-            s = "BELOW_MIN_PARKING_PRICE";
+            s = CalcState::BELOW_MIN_PARKING_PRICE;
            break;
        case State::OVERPAID:
-            s = "OVERPAID";
+            s = CalcState::OVERPAID;
            break;
        case State::INVALID_START_DATE:
-            s = "INVALID_START_DATE";
+            s = CalcState::INVALID_START_DATE;
            break;
        case State::WRONG_ISO_TIME_FORMAT:
-            s = "WRONG_ISO_TIME_FORMAT";
+            s = CalcState::WRONG_ISO_TIME_FORMAT;
            break;
        case State::OUTSIDE_ALLOWED_PARKING_TIME:
-            s = "OUTSIDE_ALLOWED_PARKING_TIME";
+            s = CalcState::OUTSIDE_ALLOWED_PARKING_TIME;
+            break;
+        case State::ABOVE_MAX_PARKING_PRICE:
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
+            break;
        }
+        if (m_desc.size() > 0) {
            return s + ":" + m_desc;
        }
+        return s;
+    }

    explicit operator QString () const noexcept {
        QString s;
        switch (m_status) {
        case State::SUCCESS:
-            s = "SUCCESS";
+            s = CalcState::SUCCESS;
            break;
        case State::ERROR_PARSING_ZONE_NR:
-            s = "ERROR_PARSING_ZONE_NR";
+            s = CalcState::ERROR_PARSING_ZONE_NR;
            break;
        case State::ERROR_LOADING_TARIFF:
-            s = "ERROR_LOADING_TARIFF";
+            s = CalcState::ERROR_LOADING_TARIFF;
            break;
        case State::ERROR_PARSING_TARIFF:
-            s = "ERROR_PARSING_TARIFF";
+            s = CalcState::ERROR_PARSING_TARIFF;
            break;
-        case State::NEGATIVE_PARING_TIME:
-            s = "NEGATIVE_PARKING_TIME";
+        case State::NEGATIVE_PARKING_TIME:
+            s = CalcState::NEGATIVE_PARKING_TIME;
           break;
        case State::ABOVE_MAX_PARKING_TIME:
-            s = "ABOVE_MAX_PARKING_TIME";
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
            break;
        case State::WRONG_PARAM_VALUES:
-            s = "WRONG_PARAM_VALUES";
+            s = CalcState::WRONG_PARAM_VALUES;
            break;
        case State::BELOW_MIN_PARKING_TIME:
-            s = "BELOW_MIN_PARKING_TIME";
+            s = CalcState::BELOW_MIN_PARKING_TIME;
            break;
        case State::BELOW_MIN_PARKING_PRICE:
-            s = "BELOW_MIN_PARKING_PRICE";
+            s = CalcState::BELOW_MIN_PARKING_PRICE;
            break;
        case State::OVERPAID:
-            s = "OVERPAID";
+            s = CalcState::OVERPAID;
            break;
        case State::INVALID_START_DATE:
-            s = "INVALID_START_DATE";
+            s = CalcState::INVALID_START_DATE;
            break;
        case State::WRONG_ISO_TIME_FORMAT:
-            s = "WRONG_ISO_TIME_FORMAT";
+            s = CalcState::WRONG_ISO_TIME_FORMAT;
            break;
        case State::OUTSIDE_ALLOWED_PARKING_TIME:
-            s = "OUTSIDE_ALLOWED_PARKING_TIME";
+            s = CalcState::OUTSIDE_ALLOWED_PARKING_TIME;
+            break;
+        case State::ABOVE_MAX_PARKING_PRICE:
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
+            break;
        }
        return s + ":" + m_desc;
    }

    CalcState &set(State s) { m_status = s; return *this; }
    CalcState &setStatus(State s) { return set(s); }
+    CalcState &setStatus(QString const &desc) {
+        if (desc == SUCCESS) {
+            m_status = State::SUCCESS;
+        } else
+        if (desc == ERROR_PARSING_ZONE_NR) {
+            m_status = State::ERROR_PARSING_ZONE_NR;
+        } else
+        if (desc == ERROR_LOADING_TARIFF) {
+            m_status = State::SUCCESS;
+        } else
+        if (desc == ERROR_PARSING_TARIFF) {
+            m_status = State::ERROR_LOADING_TARIFF;
+        } else
+        if (desc == NEGATIVE_PARKING_TIME) {
+            m_status = State::NEGATIVE_PARKING_TIME;
+        } else
+        if (desc == INVALID_START_DATE) {
+            m_status = State::INVALID_START_DATE;
+        } else
+        if (desc == WRONG_PARAM_VALUES) {
+            m_status = State::WRONG_PARAM_VALUES;
+        } else
+        if (desc == WRONG_ISO_TIME_FORMAT) {
+            m_status = State::WRONG_ISO_TIME_FORMAT;
+        } else
+        if (desc == ABOVE_MAX_PARKING_TIME) {
+            m_status = State::ABOVE_MAX_PARKING_TIME;
+        } else
+        if (desc == BELOW_MIN_PARKING_TIME) {
+            m_status = State::BELOW_MIN_PARKING_TIME;
+        } else
+        if (desc == BELOW_MIN_PARKING_PRICE) {
+            m_status = State::BELOW_MIN_PARKING_PRICE;
+        } else
+        if (desc == OVERPAID) {
+            m_status = State::OVERPAID;
+        } else
+        if (desc == OUTSIDE_ALLOWED_PARKING_TIME) {
+            m_status = State::OUTSIDE_ALLOWED_PARKING_TIME;
+        } else
+        if (desc == ABOVE_MAX_PARKING_PRICE) {
+            m_status = State::ABOVE_MAX_PARKING_PRICE;
+        }
+
+        return *this;
+    }
    State getStatus() const { return m_status; }
-    CalcState &setDesc(QString s) { m_desc = s; return *this; }
+    CalcState &setDesc(QString const &s) { m_desc = s; return *this; }

    void setAllowedTimeRange(QTime const &from, QTime const &until) {
        m_allowedTimeRange.setTimeRange(from, until);
@@ -193,7 +266,8 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);

-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
+                                                int UpDown, PermitType const &permitType);

 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);

@@ -224,7 +298,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            time_t end_parking_time,
-                                            struct price_t *price);
+                                            struct price_t *price,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            parking_tariff_t *tariff,
@@ -232,24 +307,28 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            int netto_parking_time,
                                            QDateTime &end_parking_time,    // return value
                                            struct price_t *price,          // return value
+                                            PermitType permitType,
                                            bool prepaid = true);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            double cost,
-                                            QString &duration);
+                                            QString &duration,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
                                            double cost,
-                                            QDateTime &ticketEndTime);      // return value
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);      // return value

 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
-                                            QDateTime &ticketEndTime);
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                            parking_tariff_t *tariff,
--- a/library/include/mobilisis/calculator_functions.h
+++ b/library/include/mobilisis/calculator_functions.h
@@ -3,6 +3,7 @@

 #include <iostream>
 #include <optional>
+#include <utility>

 #include "configuration.h"
 #include "calculate_price.h"
@@ -40,12 +41,12 @@ public:
    }

    void ResetTimeSteps(int paymentOptionIndex) {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            m_timeSteps[paymentOptionIndex].clear();
        }
    }
    QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            return m_timeSteps[paymentOptionIndex];
        }
        return QList<int>();
@@ -70,7 +71,9 @@ public:
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z)</param>
 	/// <param name="price"></param>
 	/// <returns>Returns duration in seconds (data type: double)</returns>
-	std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price, bool nextDay = false, bool prepaid = false);
+    std::pair<std::string, QDateTime>
+        GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+                                    PermitType permitType, bool nextDay = false, bool prepaid = false);

 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -81,7 +84,8 @@ public:
    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
+                               PermitType permitType, bool nextDay = false, bool prepaid = false);

    // Daily ticket
    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
@@ -91,8 +95,10 @@ public:
    // helper function to find time steps for a tariff with PaymentMethod::Steps
    // (e.g. Schoenau/Koenigsee)
    //
-    QList<int> GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
+    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const;
+    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const {
+        return GetTimeSteps(cfg, paymentOptionIndex, start);
+    }

    QList<int> GetPriceSteps(Configuration *cfg) const;

@@ -129,10 +135,10 @@ private:
                              int durationMinutes);

    //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
-    }
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
+    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+    //    return GetPriceForTimeStep(cfg, step, 0);
+    //}
    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
        return GetDurationForPrice(cfg, price);
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -25,6 +25,10 @@
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
 #include "tariff_product.h"
+#include "tariff_interpolation.h"
+#include "tariff_prepaid.h"
+#include "tariff_carryover.h"
+#include "tariff_permit_type.h"

 #include <QVector>
 #include <optional>
@@ -32,6 +36,7 @@
 using namespace std;
 using namespace rapidjson;

+
 class Calculator;
 class Configuration
 {
@@ -41,17 +46,21 @@ public:
    using TimeRangeType = std::multimap<int, ATBTimeRange>;
    using TariffProductType = std::multimap<int, ATBTariffProduct>;
    using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
+    using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
+    using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
+    using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+    using TariffDurationType = std::multimap<int, ATBDuration>;

    ATBProject project;
    ATBCurrency Currency;
    ATBDuration duration;

-	multimap<int, ATBDuration> Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;
 	SpecialDaysType SpecialDays;
-	multimap<int, ATBWeekDays> WeekDays;
+    multimap<Qt::DayOfWeek, ATBWeekDay> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	ATBPaymentOptionType PaymentOption;
@@ -61,6 +70,9 @@ public:
 	multimap<int, ATBTimeBase> TimeBase;
 	multimap<int, ATBCustomer> Customer;
 	TariffProductType TariffProduct;
+	TariffInterpolationType TariffInterpolations;
+	TariffPrepaidType TariffPrepaidOptions;
+	TariffCarryOverType TariffCarryOverOptions;

 	/// <summary>
 	/// Parse JSON string
@@ -82,15 +94,28 @@ public:
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime const &dt) const;
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, int specialDayId) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
+    std::optional<QVector<ATBPaymentOption>> getPaymentOptionsForAllKeys() const;
+    std::optional<ATBPaymentOption> getPaymentOptionForId(int key) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(PERMIT_TYPE permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(int permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(QString const &permitType) const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<ATBInterpolation> getInterpolationType(int type) const;
+    std::optional<QDateTime> getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const;
+    std::optional<ATBPrepaid> getPrepaidType(int type) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
    std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
    std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
+    std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
+
+    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;

 private:
 	/// <summary>
@@ -102,3 +127,15 @@ private:

 	QVector<ATBPaymentOption> currentPaymentOptions;
 };
+
+bool previousDayHoliday(Configuration const &cfg, QDateTime const &t);
+bool isHoliday(Configuration const &cfg, QDateTime const &t);
+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const& dt = QDateTime::currentDateTime());
+
+ATBWeekDay parseWeekDay(Configuration &cfg,
+                        rapidjson::GenericMemberIterator<false,
+                                                         rapidjson::UTF8<char>,
+                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
+                        QString const &innerObjName,
+                        Qt::DayOfWeek weekDay,
+                        QString const &weekDayName);
--- a/library/include/mobilisis/duration.h
+++ b/library/include/mobilisis/duration.h
@@ -1,11 +1,40 @@
 #include <string>

+#include <QDebug>
+
 class ATBDuration
 {
 public:
+    explicit ATBDuration()
+      : pun_id(0)
+      , pun_label("")
+      , pun_duration(0)
+      , pun_duration_saved(0)
+      , pun_duration_min(0)
+      , pun_duration_max(0)
+      , pun_interpolation_id(-1) {
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "              pun_id: " << td.pun_id << "\n"
+            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
+            << "        pun_duration: " << td.pun_duration << "\n"
+            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
+            << "    pun_duration_min: " << td.pun_duration_min << "\n"
+            << "    pun_duration_max: " << td.pun_duration_max << "\n"
+            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
+
+        return debug;
+    }
+
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
+    int pun_duration_saved;
    int pun_duration_min;
    int pun_duration_max;
+    int pun_interpolation_id;
 };
--- a/library/include/mobilisis/member_type.h
+++ b/library/include/mobilisis/member_type.h
@@ -19,7 +19,10 @@ enum MemberType
    TimeBaseType = 0x0C,
    TimeRangeType = 0x0D,
    TimeStepConfigType = 0x0E,
-    ProductType = 0x0F
+    ProductType = 0x0F,
+    InterpolationType = 0x10,
+    PrepaidType = 0x11,
+    CarryOverType = 0x12
 };

 #endif // MEMBER_TYPE_H_INCLUDED
--- a/library/include/mobilisis/payment_opt.h
+++ b/library/include/mobilisis/payment_opt.h
@@ -15,6 +15,8 @@ public:
    void reset() {
        pop_id = 0;
        pop_label = "";
+        pop_product_id = -1;
+        pop_product_name = "";
        pop_payment_method_id = 0;
        pop_day_end_time = "";
        pop_day_night_end_time = "";
@@ -24,6 +26,11 @@ public:
        pop_min_price = 0;
        pop_max_price = 0;
        pop_carry_over = -1;
+        pop_carry_over_option_id = -1;
+        pop_prepaid_option_id = -1;
+        pop_truncate_last_interpolation_step = false;
+        pop_accumulate_prices = false;
+        pop_accumulate_durations = false;
        pop_carry_over_target = false;
        pop_carry_over_time_range_id = -1;
        pop_carry_over_start_time_range = -1;
@@ -31,11 +38,22 @@ public:
        pop_daily_card_price = -1;
        pop_business_hours = -1;
        pop_time_step_config = -1;
+        pop_use_only_upto_datetime = ""; // deprecated
+        pop_use_only_for_duration = 0;   // deprecated
+        pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_plus_steps_saved = 1;
+        pop_minus_steps = 1; // -: jump <x=1> steps backward
+        pop_allow_overpay = false;
+        pop_apply_carry_over_to_ticket_endtime = false;
    }

    int pop_id;
    std::string pop_label;
+    int pop_product_id;
+    QString pop_product_name;
    int pop_payment_method_id;
+    QString pop_use_only_upto_datetime;
+    int pop_use_only_for_duration;
    std::string pop_day_end_time;
    std::string pop_day_night_end_time;
    double pop_price_night;
@@ -44,6 +62,9 @@ public:
    double pop_min_price;
    double pop_max_price;
    int pop_carry_over;
+    int pop_carry_over_option_id;
+    bool pop_truncate_last_interpolation_step;
+    int pop_prepaid_option_id;
    bool pop_carry_over_target;
    int pop_carry_over_time_range_id;
    int pop_carry_over_start_time_range;
@@ -51,6 +72,13 @@ public:
    int pop_daily_card_price;
    uint64_t pop_business_hours;
    int pop_time_step_config;
+    bool pop_accumulate_prices;
+    bool pop_accumulate_durations;
+    int pop_plus_steps;
+    int pop_plus_steps_saved;
+    int pop_minus_steps;
+    bool pop_allow_overpay;
+    bool pop_apply_carry_over_to_ticket_endtime;

    struct ATBMaxDateTime {
        int direction;
--- a/library/include/mobilisis/spec_days_worktime.h
+++ b/library/include/mobilisis/spec_days_worktime.h
@@ -9,4 +9,8 @@ public:
 	std::string pedwt_time_from;
 	std::string pedwt_time_to;
    double pedwt_price;
+    int pedwt_paid; // 00: not paid (i.e. free)
+                    // 01: not paid in winter term, piad in summer term
+                    // 10: paid in winter term, not paid in summer term
+                    // 11: paid in winter and in summer term
 };
--- a/library/include/mobilisis/tariff_business_hours.h
+++ b/library/include/mobilisis/tariff_business_hours.h
@@ -25,6 +25,7 @@
 #define _WITH_RESTRICTED_HOURS_                 (uint64_t)(1ULL << 17)
 #define _ALL_DAYS_WITH_RESTRICTED_HOURS_        ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_))
 #define _WEEKEND_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_))
+#define _WORKING_DAYS_WITH_RESTRICTED_HOURS_    ((_WITH_RESTRICTED_HOURS_|_WORKING_DAYS_))
 #define _FRI_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_FRI_))
 #define _SAT_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_SAT_))
 #define _SUN_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_SUN_))
@@ -62,6 +63,7 @@ enum BusinessHours : std::uint64_t
    ONLY_OPEN_FOR_BUSINESS_DAYS = _ONLY_OPEN_FOR_BUSINESS_DAYS_,
    ALL_DAYS_WITH_RESTRICTED_HOURS = _ALL_DAYS_WITH_RESTRICTED_HOURS_,
    WEEKEND_WITH_RESTRICTED_HOURS = _WEEKEND_WITH_RESTRICTED_HOURS_,
+    WORKING_DAYS_WITH_RESTRICTED_HOURS = _WORKING_DAYS_WITH_RESTRICTED_HOURS_,
    FRI_WITH_RESTRICTED_HOURS = _FRI_WITH_RESTRICTED_HOURS_,
    SAT_WITH_RESTRICTED_HOURS = _SAT_WITH_RESTRICTED_HOURS_,
    SUN_WITH_RESTRICTED_HOURS = _SUN_WITH_RESTRICTED_HOURS_,
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@@ -0,0 +1,89 @@
+#ifndef TARIFF_CARRYOVER_H_INCLUDED
+#define TARIFF_CARRYOVER_H_INCLUDED
+
+#include <QTime>
+
+struct ATBCarryOver {
+    struct week {
+        int day;
+        bool seemless;
+        bool never;
+        QTime static_start;
+        QTime static_end;
+        int duration;
+    } carryover[8];
+
+    int id;
+
+    explicit ATBCarryOver()
+      : id(-1) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            carryover[i].day = -1;
+            carryover[i].seemless = false;
+            carryover[i].never = false;
+            carryover[i].static_start = QTime(23, 59, 59);
+            carryover[i].static_end = QTime(0, 0, 0);
+            carryover[i].duration = -1;
+        }
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id:" << co.id << "\n"
+            << "        **** Monday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Monday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Monday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Monday].never << "\n"
+            << "        **** Tuesday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Tuesday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Tuesday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Tuesday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Tuesday].never << "\n"
+            << "        **** Wednesday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Wednesday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Wednesday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Wednesday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Wednesday].never << "\n"
+            << "        **** Thursday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Thursday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Thursday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Thursday].never << "\n"
+            << "        **** Friday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Friday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Friday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Friday].never << "\n"
+            << "        **** Saturday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Saturday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Saturday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Saturday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Saturday].never << "\n"
+            << "        **** Sunday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Sunday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Sunday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Sunday].never << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_CARRYOVER_H_INCLUDED
--- a/library/include/mobilisis/tariff_carryover_settings.h
+++ b/library/include/mobilisis/tariff_carryover_settings.h
@@ -0,0 +1,69 @@
+#ifndef ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+#include <QDateTime>
+
+#include <functional>
+
+struct ATBTariffCarryOverSettings {
+
+    // parking time limit not violated: return false, otherwise: return true.
+    using ParkingTimeLimitChecker = std::function<bool(ATBTariffCarryOverSettings const&,
+                                                       QDateTime const &startTime,
+                                                       QDateTime const &endTime,
+                                                       int paymentOptionIndex)>;
+
+    int m_duration;
+    QTime m_start;
+    QTime m_end;
+    ParkingTimeLimitChecker m_parkingTimeLimitChecker;
+
+    QTime m_parking_time_limit;
+    QTime m_about_to_exceed_parking_time_limit;
+
+    explicit ATBTariffCarryOverSettings()
+      : m_duration(0)
+      , m_start(QTime())
+      , m_end(QTime())
+      , m_parkingTimeLimitChecker([](ATBTariffCarryOverSettings const&,
+                                  QDateTime const&, QDateTime const&, int) { return false; })
+      , m_parking_time_limit(QTime())
+      , m_about_to_exceed_parking_time_limit(QTime()) {}
+
+    explicit ATBTariffCarryOverSettings(int duration, QTime const &start,
+                                        QTime const &end,
+                                        QTime const &parking_time_limit,
+                                        QTime const &about_to_exceed_parking_time_limit,
+                                        ParkingTimeLimitChecker parkingTimeLimitChecker)
+      : m_duration(duration)
+      , m_start(start)
+      , m_end(end)
+      , m_parkingTimeLimitChecker(std::move(parkingTimeLimitChecker))
+      , m_parking_time_limit(parking_time_limit)
+      , m_about_to_exceed_parking_time_limit(about_to_exceed_parking_time_limit) {
+    }
+
+    bool parkingTimeLimitExceeded(QDateTime const &startTime,
+                                  QDateTime const &endTime,
+                                  int paymentOptionIndex) const {
+        return m_parkingTimeLimitChecker(*this, startTime, endTime, paymentOptionIndex);
+    }
+
+    QTime const &parkingTimeLimit() const { return m_parking_time_limit; }
+    QTime &parkingTimeLimit() { return m_parking_time_limit; }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffCarryOverSettings const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 duration: " << co.m_duration << "\n"
+            << "                    start: " << co.m_start.toString(Qt::ISODate) << "\n"
+            << "                      end: " << co.m_end.toString(Qt::ISODate) << "\n"
+            << "       parking_time_limit: " << co.m_parking_time_limit.toString(Qt::ISODate) << endl;
+
+        return debug;
+    }
+};
+
+#endif // ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
--- a/library/include/mobilisis/tariff_global_defines.h
+++ b/library/include/mobilisis/tariff_global_defines.h
@@ -3,4 +3,18 @@

 #define DBG_HEADER "(" << __func__ << ":" << __LINE__ << ")"

+#define DBG_EMERGENCY   (0) // System is unusable
+#define DBG_ALERT       (1) // Action must be taken immediately
+#define DBG_CRITICAL    (2) // Critical conditions
+#define DBG_ERROR       (3) // Error conditions
+#define DBG_WARNING     (4) // Warning conditions
+#define DBG_NOTICE      (5) // Normal but significant conditions
+                            // Conditions that are not error conditions, but that may require special handling
+#define DBG_INFORMATION (6) // Informational messages
+                            // Confirmation that the program is working as expected
+#define DBG_DEBUG       (7) // Debug-level messages
+                            // Messages that contain information normally of use only when debugging a program
+
+extern int DBG_LEVEL;
+
 #endif // TARIFF_GLOBAL_DEFINES_H_INCLUDED
--- a/library/include/mobilisis/tariff_interpolation.h
+++ b/library/include/mobilisis/tariff_interpolation.h
@@ -0,0 +1,95 @@
+#ifndef TARIFF_INTERPOLATION_H_INCLUDED
+#define TARIFF_INTERPOLATION_H_INCLUDED
+
+#include <QTime>
+#include <QString>
+
+struct ATBInterpolation {
+
+    enum Type {
+        NO_INTERPOLATION = 1,
+        STATIC_WALLCLOCK_TIME_VALUES = 2,
+        STATIC_TIMEPOINT_AND_DURATION = 3,
+        DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
+    };
+
+    static QString name(int i) {
+        switch(i) {
+        case (int)(NO_INTERPOLATION):
+            return QString("%1: NO_INTERPOLATION").arg(i);
+        case (int)(STATIC_WALLCLOCK_TIME_VALUES):
+            return QString("%1: STATIC_WALLCLOCK_TIME_VALUES").arg(i);
+        case (int)(STATIC_TIMEPOINT_AND_DURATION):
+            return QString("%1: STATIC_TIMEPOINT_AND_DURATION").arg(i);
+        case (int)(DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
+            return QString("%1: DYNAMIC_TIMEPOINT_AND_STATIC_DURATION").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME").arg(i);
+        default:;
+        }
+        return "ERROR";
+    }
+
+    explicit ATBInterpolation()
+      : id(0)
+      , static_start(QTime())
+      , static_end(QTime())
+      , static_start_str(QString())
+      , static_end_str(QString())
+      , static_duration(0)
+      , dynamic_start(QTime())
+      , dynamic_end(QTime())
+      , dynamic_start_str(QString())
+      , dynamic_end_str(QString())
+      , dynamic_duration(0)
+      , dynamic_until_price(0)
+      , seemless(false)
+      , never(false) {
+    }
+
+    int id;
+    QTime static_start;
+    QTime static_end;
+    QString static_start_str;
+    QString static_end_str;
+    int static_duration;
+    QTime dynamic_start;
+    QTime dynamic_end;
+    QString dynamic_start_str;
+    QString dynamic_end_str;
+    int dynamic_duration;
+    int dynamic_until_price;
+    bool seemless;
+    bool never;
+
+    friend QDebug operator<<(QDebug debug, ATBInterpolation const &i) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id: " << name(i.id) << "\n"
+            << "       static_start: " << i.static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << i.static_end.toString(Qt::ISODate) << "\n"
+            << "   static_start_str: " << i.static_start_str << "\n"
+            << "     static_end_str: " << i.static_end_str << "\n"
+            << "    static_duration: " << i.static_duration << "\n"
+            << "      dynamic_start: " << i.dynamic_start.toString(Qt::ISODate) << "\n"
+            << "        dynamic_end: " << i.dynamic_end.toString(Qt::ISODate) << "\n"
+            << "  dynamic_start_str: " << i.dynamic_start_str << "\n"
+            << "    dynamic_end_str: " << i.dynamic_end_str << "\n"
+            << "   dynamic_duration: " << i.dynamic_duration << "\n"
+            << "dynamic_until_price: " << i.dynamic_until_price << "\n"
+            << "           seemless: " << i.seemless << "\n"
+            << "              never: " << i.never << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_INTERPOLATION_H_INCLUDED
--- a/library/include/mobilisis/tariff_log.h
+++ b/library/include/mobilisis/tariff_log.h
@@ -14,6 +14,8 @@
 void setDebugLevel(int level);
 int getDebugLevel();

+#if 0
+
 static void print() {
    std::cerr << "\n";
    if (getDebugLevel() == DBG_LEVEL_FATAL) {
@@ -75,4 +77,6 @@ static void LOG_FATAL(const Arg1& arg1, const Args&&... args) {
    }
 }

+#endif
+
 #endif //  TARIFF_LOG_INCLUDED_H
--- a/library/include/mobilisis/tariff_permit_type.h
+++ b/library/include/mobilisis/tariff_permit_type.h
@@ -13,7 +13,13 @@ enum class PERMIT_TYPE : quint8 {
    DAY_TICKET_CHILD=6,
    INVALID=7,
    FOOD_STAMP=8,
-    TWENTY_FOUR_HOURS_TICKET=9
+    TWENTY_FOUR_HOURS_TICKET=9,
+    SHORT_TERM_PARKING_PKW=10,
+    SHORT_TERM_PARKING_BUS=11,
+    SHORT_TERM_PARKING_CAMPER=12,
+    DAY_TICKET_PKW=13,
+    DAY_TICKET_BUS=14,
+    DAY_TICKET_CAMPER=15
 };

 struct PermitType {
@@ -43,12 +49,30 @@ struct PermitType {
        case 6:
            m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
            break;
-        case 7:
+        case 8:
            m_permitType = PERMIT_TYPE::FOOD_STAMP;
            break;
-        case 8:
+        case 9:
            m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
            break;
+        case 10:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
+            break;
+        case 11:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
+            break;
+        case 12:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
+            break;
+        case 13:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_PKW;
+            break;
+        case 14:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_BUS;
+            break;
+        case 15:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
+            break;
        default:
            m_permitType = PERMIT_TYPE::INVALID;
        }
@@ -77,14 +101,78 @@ struct PermitType {
        case PERMIT_TYPE::DAY_TICKET_TEEN:
            return 6;
        case PERMIT_TYPE::FOOD_STAMP:
-            return 7;
-        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return 8;
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return 9;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return 10;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return 11;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return 12;
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return 13;
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return 14;
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return 15;
        default:
            break;
        }
        return 7;
+    }

+    static PERMIT_TYPE toPermitType(QString const permitTypeStr) {
+        if (permitTypeStr == "DAY_TICKET") {
+            return PERMIT_TYPE::DAY_TICKET;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CHILD") {
+            return PERMIT_TYPE::DAY_TICKET_CHILD;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_TEEN") {
+            return PERMIT_TYPE::DAY_TICKET_TEEN;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING;
+        } else
+        if (permitTypeStr == "SZEGED_START") {
+            return PERMIT_TYPE::SZEGED_START;
+        } else
+        if (permitTypeStr == "SZEGED_STOP") {
+            return PERMIT_TYPE::SZEGED_STOP;
+        } else
+        if (permitTypeStr == "FOOD_STAMP") {
+            return PERMIT_TYPE::FOOD_STAMP;
+        } else
+        if (permitTypeStr == "TWENTY_FOUR_HOURS_TICKET") {
+            return PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_PKW") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_BUS") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_CAMPER") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
+        } else
+        if (permitTypeStr == "DAY_TICKET_PKW") {
+            return PERMIT_TYPE::DAY_TICKET_PKW;
+        } else
+        if (permitTypeStr == "DAY_TICKET_BUS") {
+            return PERMIT_TYPE::DAY_TICKET_BUS;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CAMPER") {
+            return PERMIT_TYPE::DAY_TICKET_CAMPER;
+        }
+
+        return PERMIT_TYPE::INVALID;
    }

    QString toString() {
@@ -107,6 +195,18 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return QString("SHORT_TERM_PARKING_PKW");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return QString("SHORT_TERM_PARKING_BUS");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return QString("SHORT_TERM_PARKING_CAMPER");
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return QString("DAY_TICKET_PKW");
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return QString("DAY_TICKET_BUS");
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
@@ -133,6 +233,18 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return QString("SHORT_TERM_PARKING_PKW");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return QString("SHORT_TERM_PARKING_BUS");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return QString("SHORT_TERM_PARKING_CAMPER");
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return QString("DAY_TICKET_PKW");
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return QString("DAY_TICKET_BUS");
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@@ -0,0 +1,84 @@
+#ifndef TARIFF_PREPAID_H_INCLUDED
+#define TARIFF_PREPAID_H_INCLUDED
+
+#include <QTime>
+#include <QString>
+
+struct ATBPrepaid {
+    int id;
+    bool anytime;
+    bool never;
+    QTime static_start;
+    QTime static_end;
+
+    struct week {
+        int day;
+        QTime static_start;
+        QTime static_end;
+        int duration;
+    } prepaid[8];
+
+    explicit ATBPrepaid()
+      : id(-1)
+      , anytime(false)
+      , never(false)
+      , static_start(QTime(23, 59, 59))
+      , static_end(QTime(0, 0, 0)) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            prepaid[i].day = -1;
+            prepaid[i].static_start = QTime(23, 59, 59);
+            prepaid[i].static_end = QTime(0, 0, 0);
+            prepaid[i].duration = -1;
+        }
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id: " << pp.id << "\n"
+            << "       static_start: " << pp.static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.static_end.toString(Qt::ISODate) << "\n"
+            << "            anytime: " << pp.anytime << "\n"
+            << "              never: " << pp.never << "\n"
+            << "        **** Monday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Monday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Monday].duration << "\n"
+            << "        **** Tuesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Tuesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Tuesday].duration << "\n"
+            << "        **** Wednesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Wednesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Wednesday].duration << "\n"
+            << "        **** Thursday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Thursday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Thursday].duration << "\n"
+            << "        **** Friday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Friday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
+            << "        **** Saturday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Saturday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Saturday].duration << "\n"
+            << "        **** Sunday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Sunday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Sunday].duration << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_PREPAID_H_INCLUDED
--- a/library/include/mobilisis/tariff_settings.h
+++ b/library/include/mobilisis/tariff_settings.h
@@ -0,0 +1,40 @@
+#ifndef ATB_TARIFF_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+
+struct ATBTariffSettings {
+    int m_max_price;
+    int m_min_price;
+    int m_max_time;
+    int m_min_time;
+
+    explicit ATBTariffSettings()
+      : m_max_price(0)
+      , m_min_price(0)
+      , m_max_time(0)
+      , m_min_time(0) {
+    }
+
+    explicit ATBTariffSettings(int max_price, int min_price, int max_time, int min_time)
+      : m_max_price(max_price)
+      , m_min_price(min_price)
+      , m_max_time(max_time)
+      , m_min_time(min_time) {
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffSettings const &ts) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                max_price: " << ts.m_max_price << "\n"
+            << "                min_price: " << ts.m_min_price << "\n"
+            << "                 max_time: " << ts.m_max_time << "\n"
+            << "                 min_time: " << ts.m_min_time << endl;
+
+        return debug;
+    }
+};
+
+
+#endif // ATB_TARIFF_SETTINGS_H_INCLUDED
--- a/library/include/mobilisis/utilities.h
+++ b/library/include/mobilisis/utilities.h
@@ -3,6 +3,7 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
+#include <optional>

 #include "day_of_week.h"
 #include "configuration.h"
@@ -62,6 +63,7 @@ namespace Utilities {
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
+    std::optional<ATBPeriodYear> GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);

 	/// <summary>
 	/// Check permissions
@@ -79,12 +81,12 @@ namespace Utilities {
 	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);

    QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it);
+    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
    QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it);
-    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
+    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
+    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
    // PaymentRate GetPaymentRate(Configuration const *cfg, );
    bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
    bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
@@ -100,4 +102,5 @@ namespace Utilities {
    uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
    double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
    QStringList dumpBusinessHours(uint64_t businessHours);
+    uint32_t getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId);
 }
--- a/library/include/mobilisis/weekdays.h
+++ b/library/include/mobilisis/weekdays.h
@@ -1,10 +1,57 @@
-#pragma once
-#include <string>
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"

-class ATBWeekDays
-{
-public:
-	int pdiw_id;
-	std::string pdiw_label;
-	int pdiw_index;
+#include <QString>
+#include <Qt>
+#include <QDate>
+
+struct ATBWeekDay {
+    enum WeekDayType {USUAL_WEEKDAY=0, HOLIDAY=1};
+
+    Qt::DayOfWeek m_id;
+    QString m_name;
+    QDate m_date;
+    WeekDayType m_type;
+    ATBTariffSettings m_tariffSettings;
+    ATBTariffCarryOverSettings m_tariffCarryOverSettings;
+
+    explicit ATBWeekDay()
+        : m_id(Qt::Monday)
+        , m_name("")
+        , m_date(QDate())
+        , m_type(USUAL_WEEKDAY)
+        , m_tariffSettings()
+        , m_tariffCarryOverSettings() {}
+
+    explicit ATBWeekDay(Qt::DayOfWeek id, QString const &name, WeekDayType type,
+                        QDate const &date,
+                        ATBTariffSettings const &tariffSettings,
+                        ATBTariffCarryOverSettings const &tariffCarryOverSettings)
+        : m_id(id)
+        , m_name(name)
+        , m_date(date)
+        , m_type(type)
+        , m_tariffSettings(tariffSettings)
+        , m_tariffCarryOverSettings(tariffCarryOverSettings) {}
+
+    ATBTariffCarryOverSettings &getTariffCarryOverSettings() { return m_tariffCarryOverSettings; }
+    ATBTariffCarryOverSettings const &getTariffCarryOverSettings() const { return m_tariffCarryOverSettings; }
+
+    ATBTariffSettings &getTariffSettings() { return m_tariffSettings; }
+    ATBTariffSettings const &getTariffSettings() const { return m_tariffSettings; }
+
+    friend QDebug operator<<(QDebug debug, ATBWeekDay const &wd) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                       id: " << (int)wd.m_id << "\n"
+            << "                     name: " << wd.m_name << "\n"
+            << "                     type: " << (int)wd.m_type << "\n\n"
+            << "          tariff settings: " << "\n"
+                                             << wd.m_tariffSettings << "\n"
+            << "tariff carryover settings: " << "\n"
+                                             << wd.m_tariffCarryOverSettings << endl;
+
+        return debug;
+    }
 };
--- a/library/include/mobilisis/weekdays_worktime.h
+++ b/library/include/mobilisis/weekdays_worktime.h
@@ -5,6 +5,8 @@ class ATBWeekDaysWorktime
 {
 public:
    int pwd_id;
+    int pwd_pop_id;
+    int pwd_next_id;
    int pwd_period_week_day_id;
 	int pwd_period_day_in_week_id;
 	std::string pwd_time_from;
--- a/library/library.pro
+++ b/library/library.pro
@@ -12,6 +12,10 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
 #Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
 #VERSION=1.0.0

+# 04.06.2024: Fix for Szeged: read price for daily ticket directly from entry
+#             PaymentOptions in tariff-file if it is not given as part of a
+#             Json-Product-Array in tariff-file.
+
 CONFIG(debug, debug|release) {
    win32 {
        QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
@@ -30,7 +34,8 @@ SOURCES += \
    src/configuration.cpp \
    src/tariff_log.cpp \
    src/calculate_price.cpp \
-    src/ticket.cpp
+    src/ticket.cpp \
+    src/tariff_global_defines.cpp

 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -80,6 +85,10 @@ HEADERS += \
    include/mobilisis/tariff_timestep_config.h \
    include/mobilisis/tariff_product.h \
    include/mobilisis/tariff_permit_type.h \
+    include/mobilisis/tariff_global_defines.h \
+    include/mobilisis/tariff_interpolation.h \
+    include/mobilisis/tariff_prepaid.h \
+    include/mobilisis/tariff_carryover.h \
    include/mobilisis/tariff_global_defines.h

 OTHER_FILES += src/main.cpp \
--- a/library/src/calculate_price.cpp
+++ b/library/src/calculate_price.cpp
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
--- a/library/src/calculator_functions.cpp.kirchdorf
+++ b/library/src/calculator_functions.cpp.kirchdorf
@@ -115,8 +115,8 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                            uint8_t payment_option,
-                                            char const* start_datetime, // given in local time
-                                            double price,
+                                            char const *startDatetimePassed, // given in local time
+                                            double cost,
                                            bool nextDay,
                                            bool prepaid)
 {
@@ -124,14 +124,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    Q_UNUSED(nextDay);

    // Get input date
-    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);

    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
            // use tariff with structure as for instance Schoenau, Koenigsee:
            // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
+            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
            return inputDate.toString(Qt::ISODate).toStdString();
        } else {
            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
@@ -147,9 +147,226 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                return "";
            }
        }
+    } else
+    if (paymentMethodId == PaymentMethod::Progressive) {
+        // started with Neuhauser, Kirchdorf: merge into main algo. later
+        // for now try out some ideas
+
+        // started with Neuhauser, Kirchdorf: merge into main algo. later
+        // for now try out some ideas
+
+        static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
+        static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
+        static const uint maxParkingPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+
+        if (cost < minParkingPrice) {
+            qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
+            return QDateTime().toString(Qt::ISODate).toStdString();
        }

-    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
+        if (cost > maxParkingPrice) {
+            qCritical() << QString("WARN: COST > MAX_PARKING_PRICE (%1 > %2)").arg(cost).arg(maxParkingPrice);
+            cost = maxParkingPrice;
+        }
+
+        Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
+        Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
+
+        QDateTime start_datetime = QDateTime::fromString(QString(startDatetimePassed), Qt::ISODate);
+        QDateTime start = start_datetime;
+        QDateTime end_datetime = QDateTime();
+
+        int weekdayId = -1;
+        int weekdayIdLast = -1;
+        int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
+        int durationMinutesBrutto = 0;
+
+        QDateTime current = start;
+
+        int days = 7;
+        while (--days > 0) {
+            weekdayId = current.date().dayOfWeek();
+            weekdayIdLast = weekdayId; // TODO: some end condition in json-file
+
+            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
+                current = current.addDays(1);
+                weekdayId = current.date().dayOfWeek();
+                if (weekdayId == weekdayIdLast) {
+                    qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
+                    return QDateTime().toString(Qt::ISODate).toStdString();
+                }
+            }
+
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+            QTime to = QTime(0, 0, 0);
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);
+
+                if (to < t) {
+                    to = t;
+                }
+            }
+
+            if (current.time() >= to) {
+                if (carryOverNotSet) {
+                    return end_datetime.toString(Qt::ISODate).toStdString();
+                } else {
+                    QDateTime const dt = start;
+                    start = start.addDays(1);
+                    start.setTime(QTime(0, 0, 0));
+
+                    durationMinutesBrutto += dt.secsTo(start) / 60;
+                    current = start;
+                }
+            } else {
+                break;
+            }
+        }
+
+        int durationMinutesNetto = 0;
+        uint price = 0;
+
+        if (carryOverNotSet) {
+            int range = 0;
+            int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
+            QDateTime lastCurrent = QDateTime();
+
+            auto timeRangeIt = cfg->TimeRange.cbegin();
+            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+                for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                    ++range;
+
+                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+
+                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+
+                    if (current.time() >= to) {
+                        continue; // try to use next available work-time
+                    } else
+                    if (current.time() <= from) {
+                        if (prepaid) {
+                            lastCurrent = current;
+                            current.setTime(from); // move current forward (range==1),
+                                                   // as prepaid is set
+                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+                            durationMinutesBrutto += minutesMoved;
+
+                            if (range == 1) {
+                                start_datetime = current;
+                            }
+                        }
+                    }
+
+                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                        ATBTimeRange timeRange = timeRangeIt->second;
+
+                        timeRange.computeQTimes(current.time());
+
+                        int duration = timeRange.time_range_to_in_minutes_from_start -
+                                       timeRange.time_range_from_in_minutes_from_start;
+
+                        if (minsUsed > 0) {
+                            duration -= minsUsed;
+                            minsUsed = 0;
+                        }
+
+                        if (current.addSecs(duration * 60).time() <= to) {
+                            if (minsToCarryOver > 0) {  // the price for this time range
+                                                        // has been is paid already
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
+                            } else {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                        price += (uint)rate.pra_price;
+
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
+                                        durationMinutes -= duration;
+                                        durationMinutesNetto += duration;
+                                        durationMinutesBrutto += duration;
+
+                                        current = current.addSecs(duration * 60);
+
+                                        if (price >= cost) {
+                                            end_datetime = current;
+                                            return end_datetime.toString(Qt::ISODate).toStdString();
+                                        }
+
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if (durationMinutes <= 0) {
+                                end_datetime = current;
+                                return end_datetime.toString(Qt::ISODate).toStdString();
+                            }
+
+                            ++timeRangeIt;
+
+                        } else {
+
+                            lastCurrent = current;
+                            current.setTime(to);
+                            minsUsed = lastCurrent.secsTo(current) / 60;
+
+                            // mod duration: possibly discard some minutes in
+                            // the next time-range
+                            if (durationMinutes >= minsUsed) {
+                                minsToCarryOver = durationMinutes - minsUsed;
+                            }
+
+                            durationMinutes -= minsUsed;
+                            durationMinutesNetto += minsUsed;
+                            durationMinutesBrutto += minsUsed;
+
+                            if (minsUsed > 0) {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                        price += (uint)rate.pra_price;
+
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
+                                        if (price >= cost) {
+                                            end_datetime = current;
+                                            // return end_datetime.toString(Qt::ISODate).toStdString();
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                end_datetime = start.addSecs(durationMinutesBrutto * 60);
+                return end_datetime.toString(Qt::ISODate).toStdString();
+            }
+        }
+
+        end_datetime = QDateTime();
+        return end_datetime.toString(Qt::ISODate).toStdString();
+    }
+
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);

    // qCritical().noquote() << t;

@@ -279,9 +496,11 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                        end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                        return cost;
                    }
+                } else {
+                    // it might be that in such a case even prepaid ("vorkauf")
+                    // is not allowed at any moment
                }
-
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
                end_datetime = QDateTime();
                return 0;
            }
@@ -299,34 +518,18 @@ double Calculator::GetCostFromDuration(Configuration* cfg,

        QDateTime start = start_datetime;

-#define DEBUG 0
-#if DEBUG==1
-        qCritical() << "start" << start.toString(Qt::ISODate) << durationMinutes;
-#endif
        int weekdayId = -1;
        int weekdayIdLast = -1;
-        int timeRanges = 0;
        int durationMinutesBrutto = 0;

        QDateTime current = start;

-        //if ((durationMinutes % 5) != 0) {
-        //    qCritical() << "ERROR DURATION (" << durationMinutes
-        //                << ") NOT A MULTIPLE Of 5";
-        //}
-
        int days = 7;
        while (--days > 0) {
-
-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "start" << start.toString(Qt::ISODate)
-                    << "current" << current.toString(Qt::ISODate);
-#endif
            weekdayId = current.date().dayOfWeek();
            weekdayIdLast = weekdayId; // TODO: some end condition in json-file

-            while ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
+            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
                current = current.addDays(1);
                weekdayId = current.date().dayOfWeek();
                if (weekdayId == weekdayIdLast) {
@@ -335,11 +538,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                }
            }

-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "current" << current.toString(Qt::ISODate);
-#endif
-
            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

@@ -347,56 +545,37 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
            for (WTIterator itr = p.first; itr != p.second; ++itr) {
                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);

-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "current" << current.time().toString(Qt::ISODate)
-                            << "t" << t.toString(Qt::ISODate)
-                            << "to" << to.toString(Qt::ISODate);
-#endif
-
                if (to < t) {
                    to = t;
                }
            }

-
            if (current.time() >= to) {
+                if (carryOverNotSet) {
+                    end_datetime = start;
+                    return 0;
+                } else {
                    QDateTime const dt = start;
                    start = start.addDays(1);
                    start.setTime(QTime(0, 0, 0));

                    durationMinutesBrutto += dt.secsTo(start) / 60;
                    current = start;
+                }
            } else {
-
-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "current" << current.toString(Qt::ISODate)
-                            << "durationMinutesBrutto" << durationMinutesBrutto;
-#endif
-
                break;
            }
        }

-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "timeRanges" << timeRanges << weekdayId
-                    << "durationMinutesBrutto" << durationMinutesBrutto
-                    << "start" << start.toString(Qt::ISODate)
-                    << "current" << current.toString(Qt::ISODate);
-#endif
-
        int durationMinutesNetto = 0;
        uint price = 0;

        if (carryOverNotSet) {
            int range = 0;
            int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
            QDateTime lastCurrent = QDateTime();

-            auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

@@ -408,14 +587,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,

                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");

-
                if (current.time() >= to) {
-#if DEBUG==1
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    << "current" << current.toString(Qt::ISODate)
-                                    << "from" << from.toString(Qt::ISODate)
-                                    << "to" << to.toString(Qt::ISODate);
-#endif
                    continue; // try to use next available work-time
                } else
                if (current.time() <= from) {
@@ -424,13 +596,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                        current.setTime(from); // move current forward (range==1),
                                               // as prepaid is set
                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-#if DEBUG==1
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "current" << current.toString(Qt::ISODate)
-                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
-                                        << "minutesMoved" << minutesMoved
-                                        << "durationMinutes" << durationMinutes;
-#endif
                        durationMinutesBrutto += minutesMoved;

                        if (range == 1) {
@@ -439,15 +604,8 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                    }
                }

-#if DEBUG==1
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                << "from" << from.toString(Qt::ISODate)
-                                << "to" << to.toString(Qt::ISODate)
-                                << "current" << current.toString(Qt::ISODate)
-                                << "durationMinutes" << durationMinutes;
-#endif
+                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {

-                    while (timeRangeIt != cfg->TimeRange.cend()) {
                    ATBTimeRange timeRange = timeRangeIt->second;

                    timeRange.computeQTimes(current.time());
@@ -455,127 +613,101 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                    int duration = timeRange.time_range_to_in_minutes_from_start -
                                   timeRange.time_range_from_in_minutes_from_start;

-#if DEBUG==1
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    << "duration" << duration << timeRange.time_range_id
+                    qCritical() << __func__ << ":" << __LINE__
                                << "current" << current.toString(Qt::ISODate)
-                                    << "minsToCarryOver" <<  minsToCarryOver
-                                    << "durationMinutes" << durationMinutes;
-#endif
+                                << "duration" << duration
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver;
+
+
+                    //if (minsUsed > 0) {
+                    //    duration -= minsUsed;
+                    //    minsUsed = 0;
+                    //}

                    if (current.addSecs(duration * 60).time() <= to) {
-
+                        if (minsToCarryOver > 0) {  // the price for this time range
+                                                    // has been is paid already
+                            if (minsUsed == 0) {
                                for(const auto &x: cfg->PaymentRate) {
                                    ATBPaymentRate const rate = x.second;
                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    if (minsToCarryOver > 0) {
-                                        durationMinutes -= minsToCarryOver;
-                                        durationMinutesNetto += minsToCarryOver;
-                                        durationMinutesBrutto += minsToCarryOver;
-                                        current = current.addSecs(minsToCarryOver*60);
-                                        minsToCarryOver = 0;
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto
-                                                    << "current" << current.toString(Qt::ISODate);
-#endif
-                                    } else {
                                        price += (uint)rate.pra_price;

                                        durationMinutes -= duration;
                                        durationMinutesNetto += duration;
                                        durationMinutesBrutto += duration;

-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "duration" << duration
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto;
-#endif
-
                                        current = current.addSecs(duration * 60);

-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "current" << current.toString(Qt::ISODate)
-                                                    << "price" << price;
-#endif
+                                        if (durationMinutes <= 0) {
+                                            end_datetime = current;
+                                            return price;
                                        }

                                        break;
                                    }
                                }
+                            } else {
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
+                            }
+                        } else {
+                            for(const auto &x: cfg->PaymentRate) {
+                                ATBPaymentRate const rate = x.second;
+                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                    price += (uint)rate.pra_price;
+
+                                    durationMinutes -= duration;
+                                    durationMinutesNetto += duration;
+                                    durationMinutesBrutto += duration;
+
+                                    current = current.addSecs(duration * 60);
+                                    break;
+                                }
+                            }
+                        }

                        if (durationMinutes <= 0) {
                            end_datetime = current;
-#if DEBUG==1
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                            << "duration" << durationMinutesNetto << ", price" << price
-                                            << current.toString(Qt::ISODate)
-                                            << end_datetime.toString(Qt::ISODate);
-#endif
                            return price;
                        }

-                            ++timeRangeIt;
+                        //++timeRangeIt;

                    } else {

                        lastCurrent = current;
                        current.setTime(to);
-                            int const minsLeft = lastCurrent.secsTo(current) / 60;
+                        minsUsed = lastCurrent.secsTo(current) / 60;

                        // mod duration: possibly discard some minutes in
                        // the next time-range
-                            minsToCarryOver = (durationMinutes - minsLeft) % duration;
+                        if (durationMinutes >= minsUsed) {
+                            minsToCarryOver = durationMinutes - minsUsed;
+                        }

-                            durationMinutes -= minsLeft;
-                            durationMinutesNetto += minsLeft;
-                            durationMinutesBrutto += minsLeft;
+                        durationMinutes -= minsUsed;
+                        durationMinutesNetto += minsUsed;
+                        durationMinutesBrutto += minsUsed;

-#if DEBUG==1
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
-                                        << "current" << current.toString(Qt::ISODate)
-                                        << "minsLeft" << minsLeft;
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "duration" << duration
-                                        << "durationMinutes" << durationMinutes
-                                        << "durationMinutesNetto" << durationMinutesNetto
-                                        << "durationMinutesBrutto" << durationMinutesBrutto
-                                        << "minsToCarryOver" << minsToCarryOver;
-#endif
-
-                            if (minsLeft > 0) {
+                        if (minsUsed > 0) {
                            for(const auto &x: cfg->PaymentRate) {
                                ATBPaymentRate const rate = x.second;
                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
                                    price += (uint)rate.pra_price;
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "price" << price;
-#endif
                                    break;
                                }
                            }
                        }
-
-                            break;
-                        }
-                    }
+                        // break;
                    }
+                } // for (WTIterator itr = p.first; itr != p.second; ++itr) {

                end_datetime = start.addSecs(durationMinutesBrutto * 60);
-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "duration" << durationMinutesNetto
-                            << ", price" << std::max(price, minParkingPrice)
-                            << start.toString(Qt::ISODate)
-                            << end_datetime.toString(Qt::ISODate);
-#endif
                return std::max(price, minParkingPrice);
            }
        }
@@ -1072,6 +1204,8 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
    int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
    int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;

+    static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
    qCritical() << __func__ << ":" << __LINE__ << "       start parking time:" << start.toString(Qt::ISODate);
    qCritical() << __func__ << ":" << __LINE__ << "        payment option id:" << pop_id;
    qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
@@ -1079,6 +1213,13 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
    if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
        //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";

+        if (paymentMethodId == PaymentMethod::Progressive) { // e.g. neuhauser kirchdorf (743)
+            std::size_t const s = cfg->TimeRange.size();
+            for (std::size_t id = 1; id <= s; ++id) {
+                int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
+                m_timeSteps.append(step);
+            }
+        } else {
            uint16_t timeStepCompensation = 0;

            if (pop_carry_over) {
@@ -1137,6 +1278,7 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
            } else { // if (pop_carry_over) {
                // TODO
            }
+        }
    } else {
        qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";

@@ -1308,6 +1450,18 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                case PERMIT_TYPE::INVALID:
                    break;
            }
+        } else {
+            // for projects which have not defined a daily ticket in their
+            // tariff-files (e.g. szeged)
+            price.netto = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+            qCritical() << "                  start:" << startDatetime.toString(Qt::ISODate);
+            qCritical() << "          workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
+            qCritical() << "            workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
+            qCritical() << "daily_ticket_card_price:" << price.netto;
+
+            value = value.value_or(price);
        }
    }

--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
--- a/library/src/tariff_global_defines.cpp
+++ b/library/src/tariff_global_defines.cpp
@@ -0,0 +1,5 @@
+#include "tariff_global_defines.h"
+
+int DBG_LEVEL = DBG_NOTICE;
+// int DBG_LEVEL = DBG_INFORMATION;
+// int DBG_LEVEL = DBG_DEBUG;
--- a/library/src/utilities.cpp
+++ b/library/src/utilities.cpp
@@ -207,7 +207,13 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
                              dt.date().day());
                QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
                QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
+                //qCritical() << __func__ << __LINE__ << "    d" << d.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "start" << s.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "  end" << e.toString(Qt::ISODate);
+                if (s <= e) {
                    return (d >= s && d <= e);
+                }
+                return (d >= s || d <= e);
            })) {
        qCritical() << "NO VALID YEAR PERIOD";
        return false;
@@ -215,6 +221,43 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
    return true;
 }

+std::optional<ATBPeriodYear>
+Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
+
+    ATBPeriodYear period;
+    std::optional<ATBPeriodYear> value;
+
+    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
+         it != cfg->YearPeriod.cend();
+         ++it) {
+        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
+        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
+
+        QDateTime start(currentDateTime);
+        QDateTime end(currentDateTime);
+
+        start.setDate(s);
+        end.setDate(e);
+
+        if (start.date().dayOfYear() < end.date().dayOfYear()) {
+            // start and end in the same year
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        } else {
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        }
+    }
+
+    return value;
+}
+
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
@@ -334,11 +377,11 @@ QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDa
    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_from.c_str(), Qt::ISODate);
 }

-QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
    return QTime::fromString(it->second.pedwt_time_from.c_str(), Qt::ISODate);
 }

-QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
    return QTime::fromString(it->second.pedwt_time_to.c_str(), Qt::ISODate);
 }

@@ -346,15 +389,15 @@ QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialD
    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
 }

-QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
    return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
 }

-QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
    return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
 }

-int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
    return itr->second.pwd_period_day_in_week_id;
 }

@@ -406,6 +449,10 @@ uint32_t Utilities::getMaximalParkingPrice(Configuration const *cfg, PaymentMeth
    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_price, 0);
 }

+uint32_t Utilities::getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_daily_card_price, 0);
+}
+
 uint32_t Utilities::getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId) {
    if (methodId == PaymentMethod::Progressive) {
        Configuration::TimeRangeType::const_iterator it = cfg->TimeRange.find(step);
--- a/main/MessageHelper.cpp
+++ b/main/MessageHelper.cpp
@@ -0,0 +1,882 @@
+#include "MessageHelper.h"
+#include "terminal_utils.h"
+#include "aes128.h"
+
+#include <QDateTime>
+#include <QDebug>
+
+#define IUC_ASYNCHPOS_COINCOIDE_H               0x09
+#define IUC_ASYNCHPOS_COINCOIDE_L               0x78
+#define IUC_ASYNCHPOS_MAX_ARRAY_SIZE	        1024
+#define IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE	    300
+#define IUC_ASYNCHPOS_MAX_RX_PACKET_SIZE	    10000   // 17000
+#define IUC_ASYNCHPOS_MIN_PACKET_SIZE	        16
+#define IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE        32
+#define IUC_ASYNCHPOS_MIN_BASE_BYTE_DATA_SIZE   16
+#define IUC_ASYNCHPOS_POLYNOME	                0xedb88320	// 0x04C11DB7
+#define IUC_ASYNCHPOS_POLYNOME_INITIAL	        0		    // 0xFFFFFFFF
+#define IUC_ASYNCHPOS_PRINTTIMOUT               1000
+
+#define PACKET_ID_SIZE      8
+#define MAX_POSID_LENGTH    255
+
+#define STX     ((char)0x01)
+#define ETX1    ((char)0x02)
+#define ETX2    ((char)0x03)
+#define EOT     ((char)0x04)
+#define ENQ     ((char)0x05)
+#define ACK1    ((char)0x06)
+#define ACK2    ((char)0x07)
+#define DLE     ((char)0x10)
+#define NAK     ((char)0x15)
+
+
+#define DBG_HEADER "(" << __func__ << ":" << __LINE__ << ")"
+
+#define DBG_EMERGENCY   (0) // System is unusable
+#define DBG_ALERT       (1) // Action must be taken immediately
+#define DBG_CRITICAL    (2) // Critical conditions
+#define DBG_ERROR       (3) // Error conditions
+#define DBG_WARNING     (4) // Warning conditions
+#define DBG_NOTICE      (5) // Normal but significant conditions
+                            // Conditions that are not error conditions, but that may require special handling
+#define DBG_INFORMATION (6) // Informational messages
+                            // Confirmation that the program is working as expected
+#define DBG_DEBUG       (7) // Debug-level messages
+                            // Messages that contain information normally of use only when debugging a program
+
+static int DBG_LEVEL = DBG_INFORMATION;
+//static int DBG_LEVEL = DBG_DEBUG;
+
+struct MessageHeader {
+    uint8_t packetType;
+    uint8_t packetID[PACKET_ID_SIZE];
+    uint8_t POSIDLength;
+    uint8_t POSID[MAX_POSID_LENGTH];
+};
+
+
+MessageHelper::AsynchBillData MessageHelper::m_asyncBillData;
+MessageHelper::AuthorizationResult MessageHelper::m_authorizationResult;
+
+MessageHelper::MessageHelper(QString const &posID, QString const &apak)
+  : m_posID(posID.toUtf8().constData())
+  , m_posIDLength(m_posID.size())
+  , m_messageHeaderPrefix(1 + PACKET_ID_SIZE + 1, 0x00)
+  , m_rawPacket(IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE, 0x00) {
+    m_messageHeaderPrefix[9] = (uint8_t)m_posID.size();
+
+    for (int p = 0; p < apak.size(); p+=2) {
+        uint8_t n = strtoul(apak.mid(p, 2).toStdString().c_str(), nullptr, 16);
+        m_apak.push_back(n);
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << apak << m_apak.toHex(':');
+        qCritical() << DBG_HEADER << m_posID.toHex(':');
+        qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+    }
+}
+
+MessageHelper::MessageHelper(QByteArray const &posID, QString const &apak)
+  : m_posID(posID)
+  , m_posIDLength(m_posID.size())
+  , m_messageHeaderPrefix(1 + PACKET_ID_SIZE + 1, 0x00)
+  , m_rawPacket(IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE, 0x00) {
+    m_messageHeaderPrefix[9] = (uint8_t)m_posID.size();
+
+    for (int p = 0; p < apak.size(); p+=2) {
+        uint8_t n = strtoul(apak.mid(p, 2).toStdString().c_str(), nullptr, 16);
+        m_apak.push_back(n);
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << apak << m_apak.toHex(':');
+        qCritical() << DBG_HEADER << m_posID.toHex(':');
+        qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+    }
+}
+
+MessageHelper::~MessageHelper() {
+
+}
+
+void MessageHelper::handleMessage(char const *pData) {
+
+#if 0
+    //unsigned char marker = pData[0];
+//	unsigned int tagNameLength = pData[1];
+    unsigned char tagName[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+//	unsigned int curElementLength = 0;
+    //unsigned char curElement[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+    //unsigned char receiptData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1];
+    unsigned char rxBuf[20];
+//	unsigned char flags[129];
+//	unsigned char docNr[32];
+    //unsigned char messageType = pData[1];
+
+    unsigned int uitmp = 0;
+    unsigned int uitmp2 = 0;
+
+    iuc_asynchpos_sub_initArray(tagName, IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE);
+    //iuc_asynchpos_sub_initArray(curElement, IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE);
+
+    uitmp = biox_FindStrInBufferInt("LoginResult",pData) | biox_FindStrInBuffer("LOGINRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x02;	//eingeloggt
+        /*rxBuf[0] = 0x45;
+        rxBuf[1] = 0x00;
+        rxBuf[2] = 0x00;
+        vmc_SendWithBuffer(rxBuf,40,0x69,0);*/
+    }
+
+    uitmp = biox_FindStrInBufferInt("AuthorizationStarted",pData) | biox_FindStrInBuffer("AUTHORIZATIONSTARTED",pData);
+    if (uitmp) {
+        iuc_asynchpos_sub_initArray(rxBuf,5);
+        rxBuf[0] = 0x53;
+        rxBuf[1] = 0x00;
+        rxBuf[2] = 0x00;
+        vmc_SendWithBuffer(rxBuf,5,0x69,0);
+    }
+
+    uitmp = biox_FindStrInBufferInt("AuthorizationResult",pData) | biox_FindStrInBuffer("AUTHORIZATIONRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x03; //successfully authorized
+        iuc_asynchpos_sub_clear_message(0x00);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.id, 0, pData[uitmp + 1]);
+        uitmp = biox_FindStrInBufferInt("DocNr",pData) | biox_FindStrInBuffer("DOCNR",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.docNr, 0, pData[uitmp + 1]);
+        //uitmp = biox_FindStrInBuffer("Result",pData) | biox_FindStrInBuffer("RESULT",pData);
+        //biox_CopyBlock(pData, uitmp + 2, asynchBill.result, 0, pData[uitmp + 1]);
+
+        brd_SendDiagStr("->IUC ASYNCHPOS message ID: ",0);
+        brd_SendDiagBlock(asynchBill.id,1,36);
+
+        /*if (iuc_asynch_PrintControl) {
+            brd_SendDiagStr("->IUC ASYNCHPOS print data send AUTH: ",1);
+            vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+            iuc_asynch_PrintControl = 0x00;
+            //biox_delay_ms(750);
+        }   else {
+            brd_SendDiagStr("->IUC ASYNCHPOS sending authorization: ",1);
+            iuc_asynch_PrintControl = 0x01;
+        }*/
+
+        uitmp = biox_FindStrInBufferInt("ERROR",pData);
+        if (!uitmp/*biox_FindStrInBuffer("OK",pData) | biox_FindStrInBuffer("Approved",pData) | biox_FindStrInBuffer("APPROVED",asynchBill.result)*/) {
+            iuc_asynch_PrintControl |= 0xF0;
+            /*uitmp = biox_FindStrInBufferInt("Amount",pData) | biox_FindStrInBufferInt("AMOUNT",pData);
+            //if (pData[uitmp + 1] <= 10) {
+                biox_CopyBlock(pData, uitmp + 2, asynchBill.amount, 0, pData[uitmp + 1]);
+            //} else {
+                //biox_CopyBlock(pData, uitmp + 2, asynchBill.amount, 0, 10);
+            //}*/
+
+            //uitmp = biox_FindStrInBuffer("Token",pData);
+            //biox_CopyBlock(pData, uitmp + 2, asynchBill.token, 0, pData[uitmp + 1]);
+            /*uitmp = biox_FindStrInBufferInt("Authcode",pData) | biox_FindStrInBufferInt("AUTHCODE",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.authCode, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("RRN",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.rrn, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("STAN",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.stan, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("CardType",pData) | biox_FindStrInBufferInt("CARDTYPE",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.cardtype, 0, pData[uitmp + 1]);*/
+            asynchState = 0x04;
+
+            brd_SendDiagStr("->IUC ASYNCHPOS authorization confirmed.",1);
+
+            /*iuc_asynchpos_sub_initArray(rxBuf,20);
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x00;
+            rxBuf[2] = 0x00;
+            vmc_SendWithBuffer(rxBuf,20,0x69,0);*/
+
+            //iuc_asynchpos_resetBuffers(0x01);
+            //iuc_asynchpos_command_close_Document();
+        } else {
+            iuc_asynch_PrintControl |= 0xF0;
+            //uitmp = biox_FindStrInBufferInt("ErrCode",pData) | biox_FindStrInBufferInt("ERRCODE",pData);
+            //biox_CopyBlock(pData, uitmp + 2, asynchBill.errCode, 0, pData[uitmp + 1]);
+
+            brd_SendDiagStr("->IUC ASYNCHPOS authorization failed.",1);
+
+            /*iuc_asynchpos_sub_initArray(rxBuf,20);
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0xFF;
+            biox_CopyBlock(pData, uitmp + 2, rxBuf, 2, pData[uitmp + 1]);
+            vmc_SendWithBuffer(rxBuf,20,0x69,0);*/
+            iuc_asynch_keepAlive = 0x00;
+            //VendRequest=0;
+        }
+    }
+
+    uitmp = biox_FindStrInBufferInt("PrintReceipt",pData) | biox_FindStrInBufferInt("PRINTRECEIPT",pData);
+    if (uitmp) {
+        asynchState = 0x03; //Customer receipt recieved
+        //iuc_asynchpos_sub_initArray(flags,129);
+        //uitmp = biox_FindStrInBufferInt("Flag",pData) | biox_FindStrInBufferInt("FLAG",pData) | biox_FindStrInBufferInt("Flags",pData) | biox_FindStrInBufferInt("FLAGS",pData);
+        /*if (uitmp) {
+            biox_CopyBlock(pData, uitmp + 2, flags, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("CD",flags) | biox_FindStrInBufferInt("LR",flags);
+        }*/
+
+        /*iuc_asynchpos_sub_clear_message(0x00);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.id, 0, pData[uitmp + 1]);
+        uitmp = biox_FindStrInBufferInt("DocNr",pData) | biox_FindStrInBuffer("DOCNR",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.docNr, 0, pData[uitmp + 1]);*/
+        iuc_asynchpos_sub_initArray(asynchBill.printId,129);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.printId, 0, pData[uitmp + 1]);
+
+        //if(asynchState == 0x02/* && uitmp biox_FindStrInBufferInt("CD",flags) || biox_FindStrInBufferInt("LR",flags)*/) {
+        if((!iuc_asynch_PRNrecieved) && (biox_FindStrInBufferInt("CD",pData) || biox_FindStrInBufferInt("LR",pData)) )	{
+            iuc_asynch_PRNrecieved = 0x01;
+            iuc_asynchpos_sub_initArray(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1);
+            uitmp = /*biox_FindStrInBuffer("ReceiptText",pData) | */biox_FindStrInBufferInt("RECEIPTTEXT",pData);
+            uitmp2 = (pData[uitmp] * 256) + pData[uitmp + 1];
+
+            //if (uitmp2 <= IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+            if (uitmp2 > IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+                uitmp2 = IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ERROR. Receipt too large! Cutting off.",1);
+                /*receiptData[0] = 0x50;
+                biox_CopyBlock(pData, uitmp + 2, receiptData, 1, uitmp2/*IUC_ASYNCHPOS_MAX_ARRAY_SIZE*);
+                //uitmp += IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+                //uitmp2 -= IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ",0);
+                brd_SendDiagBlock(receiptData,1,IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+                iuc_asynch_PrintControl |= 0x0F;*/
+
+                /*if (iuc_asynch_PrintControl) {
+                    brd_SendDiagStr("->IUC ASYNCHPOS print data send: ",1);
+                    vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+                    iuc_asynch_PrintControl = 0x00;
+                } else {
+                    brd_SendDiagStr("->IUC ASYNCHPOS print data stored: ",1);
+                    iuc_asynch_PrintControl = 0x01;
+                }*/
+                //biox_delay_ms(750);
+
+                //iuc_asynchpos_resetBuffers(0x01);
+                //iuc_asynchpos_command_close_Document();
+
+                //iuc_asynchpos_resetBuffers(0x02);
+                //iuc_asynchpos_command_print_Result(0x01);
+            }
+
+            receiptData[0] = 0x50;
+            biox_CopyBlock(pData, uitmp + 2, receiptData, 1, uitmp2/*IUC_ASYNCHPOS_MAX_ARRAY_SIZE*/);
+
+            brd_SendDiagStr("->IUC ASYNCHPOS receipt: ",0);
+            brd_SendDiagBlock(receiptData,1,IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+            iuc_asynch_PrintControl |= 0x0F;
+
+            /* else {
+                //receiptData[0] = 0x50;
+                //iuc_asynchpos_sub_initZero(receiptData,1);
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ERROR. Receipt too large!",1);
+                iuc_asynch_PrintControl |= 0x0E;
+            } */
+            /* else {
+                //iuc_asynchpos_resetBuffers(0x02);
+                iuc_asynchpos_command_print_Result(0x00);
+            }*/
+        }
+
+        //++iuc_print_counter;
+
+        //if(asynchState == 0x04 && iuc_asynch_PrintControl == 0) {
+            //iuc_asynchpos_resetBuffers(0x01);
+            //iuc_asynchpos_resetBuffers(0x00);
+            //iuc_asynchpos_command_print_Result(0x01);
+        /*} /else {
+            //iuc_asynchpos_resetBuffers(0x02);
+            iuc_asynchpos_command_print_Result(0x01);
+        }*/
+            //iuc_asynchpos_command_print_Result(0x01);
+
+        /*while (uitmp2 > IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+            biox_CopyBlock(pData, uitmp + 2, receiptData, 0, IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+            uitmp += IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+            uitmp2 -= IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+            vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+        }
+
+        //Rest des Packets
+        biox_CopyBlock(pData, uitmp + 2, receiptData, 0, uitmp2);
+        vmc_SendWithBuffer(receiptData,uitmp2,0x69,0);
+
+        //iuc_asynchpos_resetBuffers(0x02);
+        iuc_asynchpos_command_print_Result(0x01);*/
+    }
+
+    uitmp = biox_FindStrInBufferInt("VoidResult",pData) | biox_FindStrInBufferInt("VOIDRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x01; //There was a cancel. Relogin and try again.
+        uitmp = biox_FindStrInBufferInt("ERROR",pData);
+        if (uitmp) {
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x56;
+            rxBuf[2] = 0x45;
+            vmc_SendWithBuffer(rxBuf,3,0x69,0);
+        }
+
+        uitmp = biox_FindStrInBufferInt("REFUND",pData);
+        if (uitmp) {
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x56;
+            rxBuf[2] = 0x52;
+            vmc_SendWithBuffer(rxBuf,3,0x69,0);
+            //TODO refund bill here. Should not trigger, but it might.
+        }
+    }
+
+    uitmp = biox_FindStrInBufferInt("DocClosed",pData);
+    if (uitmp) {
+        asynchState = 0x01; //Transaction successful
+
+        //if (VendRequest)
+            GWstate.VendRequest=0;
+    }
+#endif
+}
+
+void MessageHelper::handleCommand(AsyncPosCommand command, char status) {
+    //r - registration, a - authorization, c - cancel, s - storno, k - kassenschnitt
+
+#if 0
+    UCHAR	tempBuf[3];
+    UCHAR	rxBuf[8];
+//	UINT	uitemp = 0;
+UINT uitmp= 700;
+
+    tempBuf[0] = 0x00;
+    tempBuf[1] = 0x00;
+    tempBuf[2] = 0x00;
+
+    timeHoldISMAS = GWglobTime.SecOfDay;
+
+    iuc_asynchpos_sub_initArray(rxBuf,8);
+    //iuc_asynchpos_resetBuffers(0x00);
+
+    switch (command) {
+        case 0x72:	//registration
+                    //iuc_asynchpos_init();
+                    asynchState = 0x01;
+                    iuc_asynchpos_command_Login();
+                    GWstate.VendRequest=1;
+                    break;
+        case 0x61:	//authorisation
+                    iuc_asynch_keepAlive = 0x01;
+                    iuc_asynch_PrintControl = 0;
+                    iuc_asynchpos_sub_clear_message(0x01);
+                    //VendRequest=1;
+                    iuc_asynchpos_resetBuffers(0x00);
+                    ///#ifdef IUC_ASYCHNPOS_TESTMODE
+                    //iuc_asynchpos_command_authorize(uitmp);
+                    //#else
+                    iuc_asynchpos_command_authorize(Vend.Amount);
+                    //#endif
+                    break;
+        case 0x63:	//cancel
+        case 0x73:	//storno
+                    /*if (asynchState <= 0x02 != 0) {	//Authorization result recieved?
+                        iuc_asynchpos_command_cancel_authorize();
+                    } else {*/
+                        iuc_asynchpos_command_close_Document(0x01);
+                    //}
+                    iuc_asynch_keepAlive = 0x00;
+                    //VendRequest=0;
+                    break;
+        case 0x6B:	//kassenschnitt
+                    iuc_asynchpos_command_Logout();
+                    break;
+        case 0x62:	//get last bill
+                    //iuc_zvt_getLastBill(tempBuf);
+                    break;
+        case 0x01:	iuc_asynchpos_command_close_Document(0x00);
+                    iuc_asynch_keepAlive = 0x00;
+                    //VendRequest=0;
+                    break;
+        case 0x70:	iuc_asynchpos_command_ping_terminal();
+                    break;
+        default:
+            break;
+    }
+#endif
+}
+
+void MessageHelper::createRawPacket(PacketType packetType,
+                                    QByteArray const &encryptedPacketID,
+                                    QByteArray const &message) {
+    if (createMessageHeaderPrefix(packetType, encryptedPacketID)) {
+        QByteArray ba(m_messageHeaderPrefix);
+        ba = ba.append(m_posID);
+        ba = ba.append(message);
+
+        uint16_t const size = ba.size();
+
+        ba.push_front((char)size);
+        ba.push_front((char)(size >> 8));
+
+        m_rawPacket = ba;
+    }
+}
+
+bool MessageHelper::setMessageHeaderPacketType(PacketType packetType) {
+
+    switch (packetType) {
+    case PacketType::POS_ECR:
+    case PacketType::MESSAGE_RECEIVED_POSITIVE_ACK:
+    case PacketType::MESSAGE_RECEIVED_NEGATIVE_ACK:
+        m_messageHeaderPrefix[0] = (uint8_t)packetType;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
+bool MessageHelper::createMessageHeaderPrefix(PacketType packetType, QByteArray const &encryptedPacketID) {
+    if (encryptedPacketID.size() == PACKET_ID_SIZE) {
+        if (setMessageHeaderPacketType(packetType)) {
+            for (int i = 1; i <= 8; ++i) {
+                m_messageHeaderPrefix[i] = (uint8_t)encryptedPacketID[i-1];
+            }
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+
+QByteArray const &MessageHelper::generateUniqueTransactionID(QString const &machineNr,
+                                                             QString const &customerNr) {
+
+    // TODO: wieder entfernen
+    QDateTime dt(QDateTime::fromString("2024-06-18T12:00:00", Qt::ISODate));
+
+    uint64_t const transID = MessageHelper::secsSinceJan2017(dt);
+
+    m_uniqueTransactionID.clear();
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(std::to_string(transID).c_str(), 9).rightJustified(10, '0'));
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(machineNr.toStdString().c_str()).rightJustified(5, '0'));
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(customerNr.toStdString().c_str()).rightJustified(4, '0'));
+
+    return m_uniqueTransactionID;
+}
+
+// actual payment. amount to pay is known.
+void MessageHelper::createAuthorizeMessage() {
+    m_authorizeMessage.clear();
+
+    m_authorizeMessage.push_back((char)0x89); // 9 in 0x89 is the size
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Authorize"));
+
+    QString const &price= m_price.setNum(1000);
+
+    m_authorizeMessage.push_back((char)0x06);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Amount"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)price.size());
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray(price.toStdString().c_str()));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Cash"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x01);
+    m_authorizeMessage.push_back((char)0x30);
+
+    m_authorizeMessage.push_back((char)0x08);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Currency"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x03);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("978"));
+
+    m_authorizeMessage.push_back((char)0x05);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("DocNr"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x13);
+    m_authorizeMessage = m_authorizeMessage.append(generateUniqueTransactionID("1000", "100"));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Time"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray(time));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Lang"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x02);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("lt"));
+
+    m_authorizeMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createCancelAuthorizeMessage() {
+    m_cancelAuthorizeMessage.clear();
+
+    m_cancelAuthorizeMessage.push_back((char)0x96); // 0x80 + 0x16
+    m_cancelAuthorizeMessage = m_cancelAuthorizeMessage.append(QByteArray("AuthorizationCancelled"));
+
+    m_cancelAuthorizeMessage.push_back((char)0x02);
+    m_cancelAuthorizeMessage = m_authorizeMessage.append(QByteArray("ID"));
+
+    m_cancelAuthorizeMessage.push_back((char)0x00);
+    m_cancelAuthorizeMessage.push_back((char)QByteArray(m_asyncBillData.id).size());
+    m_cancelAuthorizeMessage = m_cancelAuthorizeMessage.append(QByteArray(m_asyncBillData.id));
+
+    m_cancelAuthorizeMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createPingMessage() {
+    m_pingMessage.clear();
+
+    m_pingMessage.push_back((char)0x84); // 4 in 0x84 is the size
+    m_pingMessage = m_pingMessage.append(QByteArray("Ping"));
+
+    m_pingMessage.push_back((char)0x04);
+    m_pingMessage = m_authorizeMessage.append(QByteArray("Time"));
+    m_pingMessage.push_back((char)0x00);
+    m_pingMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_pingMessage = m_pingMessage.append(QByteArray(time));
+
+    m_pingMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createCloseDocumentMessage(bool storno) {
+    m_closeDocumentMessage.clear();
+
+    m_closeDocumentMessage.push_back((char)0x89); // 9 in 0x89 is the size
+    m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("DocClosed"));
+
+    m_closeDocumentMessage.push_back((char)0x05);
+    m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("DocNr"));
+
+    uint16_t const docNrSize = m_uniqueTransactionID.size();
+
+    m_closeDocumentMessage.push_back((char)(docNrSize >> 8));
+    m_closeDocumentMessage.push_back((char)(docNrSize));
+    m_closeDocumentMessage = m_closeDocumentMessage.append(m_uniqueTransactionID);
+
+    if (!storno) {
+        m_closeDocumentMessage.push_back((char)0x06);
+        m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("AuthID"));
+
+        QByteArray ba(m_authorizationResult.m_id.toStdString().c_str());
+        uint16_t const authIdSize = ba.size();
+
+        m_closeDocumentMessage.push_back((char)(authIdSize >> 8));
+        m_closeDocumentMessage.push_back((char)(authIdSize));
+
+        m_closeDocumentMessage = m_closeDocumentMessage.append(ba);
+    }
+
+    m_closeDocumentMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createPrintResultMessage() {
+    m_printResultMessage.clear();
+}
+
+uint32_t MessageHelper::secsSinceJan2017(QDateTime const &dt) {
+    return QDateTime(QDateTime::fromString("2017-01-01T00:00:00", Qt::ISODate)).secsTo(dt);
+}
+
+void MessageHelper::createLoginMessage() {
+    m_loginMessage.clear();
+
+    m_loginMessage.push_back((char)0x85); // 5 in 0x85 is the size
+    m_loginMessage = m_loginMessage.append(QByteArray("Login"));
+
+    m_loginMessage.push_back((char)0x04);
+    m_loginMessage = m_loginMessage.append(QByteArray("Time"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_loginMessage = m_loginMessage.append(time);
+
+    m_loginMessage.push_back((char)0x05);
+    m_loginMessage = m_loginMessage.append(QByteArray("Flags"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x06);
+    m_loginMessage = m_loginMessage.append(QByteArray("AP3|LR"));
+
+    m_loginMessage.push_back((char)0x00);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "loginMessage" << m_loginMessage.toHex(':');
+    }
+}
+
+void MessageHelper::createLogoutMessage() {
+    m_logoutMessage.clear();
+
+    m_logoutMessage.push_back((char)0x86); // 6 in 0x86 is the size
+    m_logoutMessage = m_loginMessage.append(QByteArray("Logout"));
+
+    m_loginMessage.push_back((char)0x04);
+    m_loginMessage = m_loginMessage.append(QByteArray("Time"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_logoutMessage = m_logoutMessage.append(time);
+
+    m_loginMessage.push_back((char)0x00);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "loginMessage" << m_logoutMessage.toHex(':');
+    }
+}
+
+QByteArrayList const &MessageHelper::createMessageChunksToSend(AsyncPosCommand cmd, char etx) {
+    QByteArray encryptedPacketID(QByteArray("\x01\x02\x03\x04\x05\x06\x07\x08"));
+
+    m_messageChunkList.clear();
+
+    switch (cmd) {
+    case (int)MessageHelper::AsyncPosCommand::LOGIN:
+        createLoginMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_loginMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::LOGOUT:
+        createLogoutMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_logoutMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::AUTHORIZE:
+        createAuthorizeMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_authorizeMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::CLOSE_DOCUMENT:
+        createCloseDocumentMessage(); // actung: hier default parameter
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_closeDocumentMessage);
+        break;
+    default:;
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << m_rawPacket.toHex(':');
+    }
+
+    QByteArray const &ba = m_rawPacket.mid(11);
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << ba.toHex(':');
+    }
+
+    // calculate crc32 on message starting from (including) POSID length
+    uint32_t crc = TU::crc32(ba);
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "crc32" << hex << crc;
+    }
+
+    unsigned char cipherText[256];
+    memset(cipherText, 0, sizeof(cipherText));
+
+    // XOR crc32-value (4 bytes) with APAK starting from left
+    // (rest of APAK untouched)
+    QByteArray clearText(m_apak);
+    clearText[0] = clearText[0] ^ ((uint8_t)(crc >> 24));
+    clearText[1] = clearText[1] ^ ((uint8_t)(crc >> 16));
+    clearText[2] = clearText[2] ^ ((uint8_t)(crc >>  8));
+    clearText[3] = clearText[3] ^ ((uint8_t)(crc >>  0));
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "clearText" << clearText.toHex();
+    }
+
+    // encrypt XOR result with APAK using AES129, ECB mode
+    aes_encrypt((uint8_t *)clearText.data(),
+                (uint8_t *)cipherText,
+                (uint8_t *)m_apak.toStdString().c_str());
+
+    // 8 left bytes of encryption result is signature (Packet ID)
+    encryptedPacketID = QByteArray((const char *)cipherText, 8);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "cipherText (new PacketID)" << encryptedPacketID.toHex(':');
+    }
+
+    // insert PacketID in packet
+    if (insertEncryptedPacketID(encryptedPacketID)) {
+
+        // build chunks to be sent over serial line
+
+        int const chunks = m_rawPacket.size() / IUC_ASYNCHPOS_MIN_PACKET_SIZE;
+
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << DBG_HEADER << "nr of chunks" << chunks;
+        }
+
+        int i = 0;
+        for (; i < chunks; ++i) {
+            QByteArray messageChunk = m_rawPacket.mid(IUC_ASYNCHPOS_MIN_PACKET_SIZE*i,
+                                                      IUC_ASYNCHPOS_MIN_PACKET_SIZE);
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "unmasked" << messageChunk.toHex(':');
+            }
+
+            messageChunk = MessageHelper::mask(messageChunk);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "  masked" << messageChunk.toHex(':');
+            }
+
+            messageChunk.push_back(etx == ACK1 ? ETX2 : ETX1); // etx must be ACK1 or ACK2
+
+            char const lrc = TU::lrc(messageChunk);
+            messageChunk.push_back(lrc);
+            messageChunk.push_front(STX);
+
+            if (DBG_LEVEL >= DBG_INFORMATION) {
+                qCritical() << DBG_HEADER << "chunk to send" << messageChunk.toHex(':');
+            }
+
+            m_messageChunkList += messageChunk;
+        }
+
+        int const rest = m_rawPacket.size() % IUC_ASYNCHPOS_MIN_PACKET_SIZE;
+        if (rest) {
+            QByteArray messageChunk = m_rawPacket.mid(IUC_ASYNCHPOS_MIN_PACKET_SIZE*chunks, rest);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "unmasked" << messageChunk.toHex(':');
+            }
+
+            messageChunk = mask(messageChunk);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "  masked" << messageChunk.toHex(':');
+            }
+
+            messageChunk.push_back(etx == ACK1 ? ETX2 : ETX1); // etx must be ACK1 or ACK2
+
+            char const lrc = TU::lrc(messageChunk);
+            messageChunk.push_back(lrc);
+            messageChunk.push_front(STX);
+
+
+            if (DBG_LEVEL >= DBG_INFORMATION) {
+                qCritical() << DBG_HEADER << "chunk to send" << messageChunk.toHex(':');
+            }
+
+            m_messageChunkList += messageChunk;
+        }
+    }
+
+    return m_messageChunkList;
+}
+
+QByteArrayList MessageHelper::createLoginMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::LOGIN, etx);
+}
+
+QByteArrayList MessageHelper::createLogoutMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::LOGOUT, etx);
+}
+
+QByteArrayList MessageHelper::createAuthorizeMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::AUTHORIZE, etx);
+}
+
+QByteArrayList MessageHelper::createCloseDocumentMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::CLOSE_DOCUMENT, etx);
+}
+
+bool MessageHelper::insertEncryptedPacketID(QByteArray const &encryptedPacketID) {
+    if (encryptedPacketID.size() == PACKET_ID_SIZE) {
+        // m_rawPacket has already full length
+        for (int i = 0; i < PACKET_ID_SIZE; ++i) {
+            m_messageHeaderPrefix[i+1] = encryptedPacketID[i];
+            m_rawPacket[i+3] = encryptedPacketID[i];
+        }
+
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+            qCritical() << DBG_HEADER << m_rawPacket.toHex(':');
+        }
+
+        return true;
+    }
+    return false;
+}
+
+QByteArray const &MessageHelper::mask(QByteArray &messageChunk) {
+    QByteArray ba;
+    for (int i = 0; i < messageChunk.size(); ++i) {
+        char const c = messageChunk[i];
+        switch(c) {
+        case STX:   __attribute__((fallthrough));
+        case ETX1:  __attribute__((fallthrough));
+        case ETX2:  __attribute__((fallthrough));
+        case EOT:   __attribute__((fallthrough));
+        case ENQ:   __attribute__((fallthrough));
+        case ACK1:  __attribute__((fallthrough));
+        case ACK2:  __attribute__((fallthrough));
+        case DLE:   __attribute__((fallthrough));
+        case NAK:
+            ba.push_back(char(DLE));
+            ba.push_back(c + 0x30);
+        break;
+        default:
+            ba.push_back(c);
+        }
+    }
+
+    messageChunk = ba;
+    return messageChunk;
+}
+
+QByteArray const &MessageHelper::unMask(QByteArray &messageChunk) {
+    QByteArray ba;
+    for (int i = 0; i < messageChunk.size(); ++i) {
+        char c = messageChunk[i];
+        if (c == (char)0x10) /* DEL */ {
+            if ((i+1) < messageChunk.size()) {
+                c = messageChunk[i+1] - (char)0x30;
+            }
+        }
+        ba.push_back(c);
+    }
+    messageChunk = ba;
+    return messageChunk;
+}
--- a/main/MessageHelper.h
+++ b/main/MessageHelper.h
@@ -0,0 +1,112 @@
+#ifndef MESSAGE_HELPER_H_INCLUDED
+#define MESSAGE_HELPER_H_INCLUDED
+
+#include <cinttypes>
+#include <QByteArray>
+#include <QByteArrayList>
+#include <QString>
+#include <QDateTime>
+
+class MessageHelper {
+public:
+    enum PacketType : std::uint8_t {
+        POS_ECR = 0,
+        // POS_EXT = 1,
+        MESSAGE_RECEIVED_POSITIVE_ACK = 0x0A,
+        MESSAGE_RECEIVED_NEGATIVE_ACK = 0x0F
+        // POS_HOST_FORMAT_1_ENCRYPTED   = 0x11,
+        // POS_HOST_FORMAT_1_UNENCRYPTED = 0x21
+    };
+
+    enum AsyncPosCommand : std::uint8_t {
+        LOGIN  = 0,
+        LOGOUT = 1,
+        AUTHORIZE = 2,
+        CLOSE_DOCUMENT = 3
+    };
+
+    explicit MessageHelper(QString const &posID = "T-TPS-SELF2002in",
+                           QString const &apak = "8AC304380E0E476BA2558B75DB9E2516");
+    explicit MessageHelper(QByteArray const &posID, QString const &apak);
+    ~MessageHelper();
+
+
+    void createRawPacket(PacketType PacketType,
+                         QByteArray const &encryptedPacketId,
+                         QByteArray const &message);
+
+    bool insertEncryptedPacketID(QByteArray const &encryptedPacketID);
+
+    QByteArrayList createLoginMessageChunksToSend(char etx);
+    QByteArrayList createLogoutMessageChunksToSend(char etx);
+    QByteArrayList createAuthorizeMessageChunksToSend(char etx);
+    QByteArrayList createCloseDocumentMessageChunksToSend(char etx);
+    QByteArrayList const &createMessageChunksToSend(AsyncPosCommand cmd, char etx);
+
+// private:
+
+    QByteArray m_posID;
+    QByteArray m_apak;
+    uint8_t m_posIDLength;
+    QByteArray m_messageHeaderPrefix;
+    QByteArray m_rawPacket; // without leading STX and trailing [ETX(1/2), LRC]
+    QByteArray m_loginMessage;
+    QByteArray m_logoutMessage;
+    QByteArray m_authorizeMessage;
+    QByteArray m_cancelAuthorizeMessage;
+    QByteArray m_pingMessage;
+    QByteArray m_printResultMessage;
+    QByteArray m_closeDocumentMessage;
+    QByteArray m_uniqueTransactionID;
+    QString m_price;
+    QByteArrayList m_messageChunkList;
+
+    bool setMessageHeaderPacketType(PacketType packetType);
+
+    bool createMessageHeaderPrefix(PacketType packetType, QByteArray const &encryptedPacketID);
+    void createLoginMessage();
+    void createLogoutMessage();
+    void createAuthorizeMessage();
+    void createCancelAuthorizeMessage();
+    void createPingMessage();
+    void createCloseDocumentMessage(bool storno = false);
+    void createPrintResultMessage();
+
+    void handleCommand(AsyncPosCommand command, char status);
+    //r - registration, a - authorization, c - cancel, s - storno, k - kassenschnitt
+
+    void handleMessage(char const *pData);
+
+    QByteArray const &generateUniqueTransactionID(QString const &machineNr, QString const &customerNumer);
+
+    static QByteArray const &mask(QByteArray &messageChunk);
+    static QByteArray const &unMask(QByteArray &messageChunk);
+    static uint32_t secsSinceJan2017(QDateTime const &dt = QDateTime::currentDateTime());
+
+    struct AsynchBillData {
+        char time[20];
+        char id[37];
+        char printId[129];
+        char docNr[33];
+        //unsigned char amount[10];
+        //unsigned char token[25];
+        //unsigned char result[8];
+        //unsigned char authCode[7];
+        //unsigned char rrn[13];
+        //unsigned char stan[7];
+        //unsigned char cardtype[33];
+        char errCode[17];
+        //unsigned char receiptData[IUC_ASYNCHPOS_RECEIPT_LENGTH];
+    };
+
+    struct AuthorizationResult {
+        QString m_id;       // max. 36
+        QString m_docNr;    // max. 32
+        QString m_result;   // "OK" or "ERROR"
+    };
+
+    static AsynchBillData m_asyncBillData;
+    static AuthorizationResult m_authorizationResult;
+};
+
+#endif // MESSAGE_HELPER_H_INCLUDED
--- a/main/aes128.cpp
+++ b/main/aes128.cpp
@@ -0,0 +1,625 @@
+/*
+ * aes128.c
+ *
+ * Created: 27.11.2017 13:33:29
+ *  Author: Matthias
+ */ 
+
+#include <aes128.h>
+
+/* the expanded keySize */
+#define EXPANDED_KEY_SIZE 176
+//int expandedKeySize;
+
+/* the expanded key */
+//unsigned char expandedKey[EXPANDED_KEY_SIZE];
+
+/* the cipher key */
+//unsigned char key[16];
+
+/* the cipher key size */
+
+enum keySize{
+	SIZE_16 = 16,
+	SIZE_24 = 24,
+	SIZE_32 = 32
+};
+
+//enum keySize size;
+
+unsigned char sbox[256] =   {
+	//0     1    2      3     4    5     6     7      8    9     A      B    C     D     E     F
+	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, //0
+	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, //1
+	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, //2
+	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, //3
+	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, //4
+	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, //5
+	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, //6
+	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, //7
+	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, //8
+	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, //9
+	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, //A
+	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, //B
+	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, //C
+	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, //D
+	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, //E
+0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 }; //F
+
+unsigned char rsbox[256] =
+{ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb
+	, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb
+	, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e
+	, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25
+	, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92
+	, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84
+	, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06
+	, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b
+	, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73
+	, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e
+	, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b
+	, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4
+	, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f
+	, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
+	, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
+, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
+
+unsigned char Rcon[256] = {
+
+	0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8,
+	0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3,
+	0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+	0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d,
+	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab,
+	0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+	0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25,
+	0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01,
+	0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+	0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa,
+	0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a,
+	0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+	0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
+	0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef,
+	0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+	0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04,
+	0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f,
+	0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+	0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33,
+0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d};
+
+void aes_init() {
+	//UINT uitemp = 0;
+	/* the expanded keySize */
+	//expandedKeySize = EXPANDED_KEY_SIZE;
+
+	/* the cipher key */
+	//for (uitemp = 0; uitemp < 16; ++uitemp)
+		//key[uitemp] = 0x00;
+
+	/* the cipher key size */
+	//size = SIZE_16;
+}
+
+unsigned char getSBoxValue(unsigned char num)
+{
+	return sbox[num];
+}
+
+unsigned char getSBoxInvert(unsigned char num)
+{
+	return rsbox[num];
+}
+
+//Key generation
+
+/* Rijndael's key schedule rotate operation
+ * rotate the word eight bits to the left
+ *
+ * rotate(1d2c3a4f) = 2c3a4f1d
+ *
+ * word is an char array of size 4 (32 bit)
+ */
+void rotate(unsigned char *word)
+{
+    unsigned char c;
+    int i;
+
+    c = word[0];
+    for (i = 0; i < 3; i++)
+        word[i] = word[i+1];
+    word[3] = c;
+}
+
+unsigned char getRconValue(unsigned char num)
+{
+	return Rcon[num];
+}
+
+void core(unsigned char *word, int iteration)
+{
+	int i;
+
+	/* rotate the 32-bit word 8 bits to the left */
+	rotate(word);
+
+	/* apply S-Box substitution on all 4 parts of the 32-bit word */
+	for (i = 0; i < 4; ++i)
+	{
+		word[i] = getSBoxValue(word[i]);
+	}
+
+	/* XOR the output of the rcon operation with i to the first part (leftmost) only */
+	word[0] = word[0]^getRconValue(((unsigned char) iteration));
+}
+
+/* Rijndael's key expansion
+ * expands an 128,192,256 key into an 176,208,240 bytes key
+ *
+ * expandedKey is a pointer to an char array of large enough size
+ * key is a pointer to a non-expanded key
+ */
+
+void expandKey(unsigned char *expandedKey,
+               unsigned char *key,
+               enum keySize size,
+               /*size_t*/ unsigned int expandedKeySize)
+{
+    /* current expanded keySize, in bytes */
+    int currentSize = 0;
+    int rconIteration = 1;
+    int i;
+    unsigned char t[4] = {0,0,0,0};   // temporary 4-byte variable
+
+    /* set the 16,24,32 bytes of the expanded key to the input key */
+    for (i = 0; i < size; i++)
+        expandedKey[i] = key[i];
+    currentSize += size;
+
+    while (currentSize < expandedKeySize)
+    {
+        /* assign the previous 4 bytes to the temporary value t */
+        for (i = 0; i < 4; i++)
+        {
+            t[i] = expandedKey[(currentSize - 4) + i];
+        }
+
+        /* every 16,24,32 bytes we apply the core schedule to t
+         * and increment rconIteration afterwards
+         */
+        if(currentSize % size == 0)
+        {
+            core(t, rconIteration++);
+        }
+
+        /* For 256-bit keys, we add an extra sbox to the calculation */
+        if(size == SIZE_32 && ((currentSize % size) == 16)) {
+            for(i = 0; i < 4; i++)
+                t[i] = getSBoxValue(t[i]);
+        }
+
+        /* We XOR t with the four-byte block 16,24,32 bytes before the new expanded key.
+         * This becomes the next four bytes in the expanded key.
+         */
+        for(i = 0; i < 4; i++) {
+            expandedKey[currentSize] = expandedKey[currentSize - size] ^ t[i];
+            currentSize++;
+        }
+    }
+}
+
+//Encrypt
+
+void subBytes(unsigned char *state)
+{
+    int i;
+    /* substitute all the values from the state with the value in the SBox
+     * using the state value as index for the SBox
+     */
+    for (i = 0; i < 16; i++)
+        state[i] = getSBoxValue(state[i]);
+}
+
+void shiftRow(unsigned char *state, unsigned char nbr)
+{
+	int i, j;
+	unsigned char tmp;
+	/* each iteration shifts the row to the left by 1 */
+	for (i = 0; i < nbr; i++)
+	{
+		tmp = state[0];
+		for (j = 0; j < 3; j++)
+		state[j] = state[j+1];
+		state[3] = tmp;
+	}
+}
+
+void shiftRows(unsigned char *state)
+{
+	int i;
+	/* iterate over the 4 rows and call shiftRow() with that row */
+	for (i = 0; i < 4; i++)
+	shiftRow(state+i*4, i);
+}
+
+void addRoundKey(unsigned char *state, unsigned char *roundKey)
+{
+	int i;
+	for (i = 0; i < 16; i++)
+	state[i] = state[i] ^ roundKey[i] ;
+}
+
+unsigned char galois_multiplication(unsigned char a, unsigned char b)
+{
+	unsigned char p = 0;
+	unsigned char counter;
+	unsigned char hi_bit_set;
+	for(counter = 0; counter < 8; counter++) {
+		if((b & 1) == 1)
+			p ^= a;
+		hi_bit_set = (a & 0x80);
+		a <<= 1;
+		if(hi_bit_set == 0x80)
+			a ^= 0x1b;
+		b >>= 1;
+	}
+	return p;
+}
+
+void mixColumn(unsigned char *column)
+{
+	unsigned char cpy[4];
+	int i;
+	for(i = 0; i < 4; i++)
+	{
+		cpy[i] = column[i];
+	}
+	column[0] = galois_multiplication(cpy[0],2) ^
+	galois_multiplication(cpy[3],1) ^
+	galois_multiplication(cpy[2],1) ^
+	galois_multiplication(cpy[1],3);
+
+	column[1] = galois_multiplication(cpy[1],2) ^
+	galois_multiplication(cpy[0],1) ^
+	galois_multiplication(cpy[3],1) ^
+	galois_multiplication(cpy[2],3);
+
+	column[2] = galois_multiplication(cpy[2],2) ^
+	galois_multiplication(cpy[1],1) ^
+	galois_multiplication(cpy[0],1) ^
+	galois_multiplication(cpy[3],3);
+
+	column[3] = galois_multiplication(cpy[3],2) ^
+	galois_multiplication(cpy[2],1) ^
+	galois_multiplication(cpy[1],1) ^
+	galois_multiplication(cpy[0],3);
+}
+
+void mixColumns(unsigned char *state)
+{
+	int i, j;
+	unsigned char column[4];
+
+	/* iterate over the 4 columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* construct one column by iterating over the 4 rows */
+		for (j = 0; j < 4; j++)
+		{
+			column[j] = state[(j*4)+i];
+		}
+
+		/* apply the mixColumn on one column */
+		mixColumn(column);
+
+		/* put the values back into the state */
+		for (j = 0; j < 4; j++)
+		{
+			state[(j*4)+i] = column[j];
+		}
+	}
+}
+
+void aes_round(unsigned char *state, unsigned char *roundKey)
+{
+	subBytes(state);
+	shiftRows(state);
+	mixColumns(state);
+	addRoundKey(state, roundKey);
+}
+
+void createRoundKey(unsigned char *expandedKey, unsigned char *roundKey)
+{
+	int i,j;
+	/* iterate over the columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* iterate over the rows */
+		for (j = 0; j < 4; j++)
+		roundKey[(i+(j*4))] = expandedKey[(i*4)+j];
+	}
+}
+
+void aes_main(unsigned char *state, unsigned char *expandedKey, int nbrRounds)
+{
+	int i = 0;
+
+	unsigned char roundKey[16];
+
+	createRoundKey(expandedKey, roundKey);
+	addRoundKey(state, roundKey);
+
+	for (i = 1; i < nbrRounds; i++) {
+		createRoundKey(expandedKey + 16*i, roundKey);
+		aes_round(state, roundKey);
+	}
+
+	createRoundKey(expandedKey + 16*nbrRounds, roundKey);
+	subBytes(state);
+	shiftRows(state);
+	addRoundKey(state, roundKey);
+}
+
+char aes_encrypt(unsigned char *input,
+                 unsigned char *output,
+                 unsigned char *key
+                 /*, enum keySize size*/)
+{
+	enum keySize size = SIZE_16;
+    /* the expanded keySize */
+    int expandedKeySize;
+
+    /* the number of rounds */
+    int nbrRounds = 10;	//NOTE: modded
+
+    /* the expanded key */
+    //NOTE: modded: unsigned char *expandedKey = 0x00;
+	//unsigned char expandedKey[(16*(nbrRounds+1))];
+	unsigned char expandedKey[176];
+
+    /* the 128 bit block to encode */
+    unsigned char block[16];
+
+    int i,j;
+
+    /* set the number of rounds */
+    /*switch (size)
+    {
+        case SIZE_16:
+            nbrRounds = 10;
+            break;
+        case SIZE_24:
+            nbrRounds = 12;
+            break;
+        case SIZE_32:
+            nbrRounds = 14;
+            break;
+        default:
+            return 1; //UNKNOWN_KEYSIZE;
+            break;
+    }*/ //NOTE: modded
+
+    expandedKeySize = (16*(nbrRounds+1));
+    /*if ((expandedKey = malloc(expandedKeySize * sizeof(char))) == NULL)
+    {
+        return MEMORY_ALLOCATION_PROBLEM;
+    }*/
+
+    /* Set the block values, for the block:
+     * a0,0 a0,1 a0,2 a0,3
+     * a1,0 a1,1 a1,2 a1,3
+     * a2,0 a2,1 a2,2 a2,3
+     * a3,0 a3,1 a3,2 a3,3
+     * the mapping order is a0,0 a1,0 a2,0 a3,0 a0,1 a1,1 ... a2,3 a3,3
+     */
+
+    /* iterate over the columns */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            block[(i+(j*4))] = input[(i*4)+j];
+    }
+
+    /* expand the key into an 176, 208, 240 bytes key */
+    expandKey(expandedKey, key, size, expandedKeySize);
+
+    /* encrypt the block using the expandedKey */
+    aes_main(block, expandedKey, nbrRounds);
+
+    /* unmap the block again into the output */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            output[(i*4)+j] = block[(i+(j*4))];
+    }
+    return 0;
+}
+
+//Decrypt
+void invSubBytes(unsigned char *state)
+{
+    int i;
+    /* substitute all the values from the state with the value in the SBox
+     * using the state value as index for the SBox
+     */
+    for (i = 0; i < 16; i++)
+        state[i] = getSBoxInvert(state[i]);
+}
+
+void invShiftRow(unsigned char *state, unsigned char nbr)
+{
+	int i, j;
+	unsigned char tmp;
+	/* each iteration shifts the row to the right by 1 */
+	for (i = 0; i < nbr; i++)
+	{
+		tmp = state[3];
+		for (j = 3; j > 0; j--)
+		state[j] = state[j-1];
+		state[0] = tmp;
+	}
+}
+
+void invShiftRows(unsigned char *state)
+{
+    int i;
+    /* iterate over the 4 rows and call invShiftRow() with that row */
+    for (i = 0; i < 4; i++)
+        invShiftRow(state+i*4, i);
+}
+
+void invMixColumn(unsigned char *column)
+{
+	unsigned char cpy[4];
+	int i;
+	for(i = 0; i < 4; i++)
+	{
+		cpy[i] = column[i];
+	}
+	column[0] = galois_multiplication(cpy[0],14) ^
+	galois_multiplication(cpy[3],9) ^
+	galois_multiplication(cpy[2],13) ^
+	galois_multiplication(cpy[1],11);
+	column[1] = galois_multiplication(cpy[1],14) ^
+	galois_multiplication(cpy[0],9) ^
+	galois_multiplication(cpy[3],13) ^
+	galois_multiplication(cpy[2],11);
+	column[2] = galois_multiplication(cpy[2],14) ^
+	galois_multiplication(cpy[1],9) ^
+	galois_multiplication(cpy[0],13) ^
+	galois_multiplication(cpy[3],11);
+	column[3] = galois_multiplication(cpy[3],14) ^
+	galois_multiplication(cpy[2],9) ^
+	galois_multiplication(cpy[1],13) ^
+	galois_multiplication(cpy[0],11);
+}
+
+void invMixColumns(unsigned char *state)
+{
+	int i, j;
+	unsigned char column[4];
+
+	/* iterate over the 4 columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* construct one column by iterating over the 4 rows */
+		for (j = 0; j < 4; j++)
+		{
+			column[j] = state[(j*4)+i];
+		}
+
+		/* apply the invMixColumn on one column */
+		invMixColumn(column);
+
+		/* put the values back into the state */
+		for (j = 0; j < 4; j++)
+		{
+			state[(j*4)+i] = column[j];
+		}
+	}
+}
+
+void aes_invRound(unsigned char *state, unsigned char *roundKey)
+{
+
+	invShiftRows(state);
+	invSubBytes(state);
+	addRoundKey(state, roundKey);
+	invMixColumns(state);
+}
+
+void aes_invMain(unsigned char *state, unsigned char *expandedKey, int nbrRounds)
+{
+	int i = 0;
+
+	unsigned char roundKey[16];
+
+	createRoundKey(expandedKey + 16*nbrRounds, roundKey);
+	addRoundKey(state, roundKey);
+
+	for (i = nbrRounds-1; i > 0; i--) {
+		createRoundKey(expandedKey + 16*i, roundKey);
+		aes_invRound(state, roundKey);
+	}
+
+	createRoundKey(expandedKey, roundKey);
+	invShiftRows(state);
+	invSubBytes(state);
+	addRoundKey(state, roundKey);
+}
+
+char aes_decrypt(unsigned char *input,
+                 unsigned char *output,
+                 unsigned char *key
+                 /*´, enum keySize size*/)
+{
+	enum keySize size = SIZE_16;
+    /* the expanded keySize */
+    int expandedKeySize;
+
+    /* the number of rounds */
+    int nbrRounds;
+
+    /* the expanded key */
+    unsigned char *expandedKey = 0x00;
+
+    /* the 128 bit block to decode */
+    unsigned char block[16];
+
+    int i,j;
+
+    /* set the number of rounds */
+    switch (size)
+    {
+        case SIZE_16:
+            nbrRounds = 10;
+            break;
+        case SIZE_24:
+            nbrRounds = 12;
+            break;
+        case SIZE_32:
+            nbrRounds = 14;
+            break;
+        default:
+            return 1; //UNKNOWN_KEYSIZE;
+            break;
+    }
+
+    expandedKeySize = (16*(nbrRounds+1));
+    /*if ((expandedKey = malloc(expandedKeySize * sizeof(char))) == NULL)
+    {
+        return MEMORY_ALLOCATION_PROBLEM;
+    }*/
+
+    /* Set the block values, for the block:
+     * a0,0 a0,1 a0,2 a0,3
+     * a1,0 a1,1 a1,2 a1,3
+     * a2,0 a2,1 a2,2 a2,3
+     * a3,0 a3,1 a3,2 a3,3
+     * the mapping order is a0,0 a1,0 a2,0 a3,0 a0,1 a1,1 ... a2,3 a3,3
+     */
+
+    /* iterate over the columns */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            block[(i+(j*4))] = input[(i*4)+j];
+    }
+
+    /* expand the key into an 176, 208, 240 bytes key */
+    expandKey(expandedKey, key, size, expandedKeySize);
+
+    /* decrypt the block using the expandedKey */
+    aes_invMain(block, expandedKey, nbrRounds);
+
+    /* unmap the block again into the output */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            output[(i*4)+j] = block[(i+(j*4))];
+    }
+    return 0;
+}
--- a/main/aes128.h
+++ b/main/aes128.h
@@ -0,0 +1,8 @@
+#ifndef AES128_H
+#define AES128_H
+
+void aes_init();
+char aes_encrypt(unsigned char *input,unsigned char *output,unsigned char *key);
+char aes_decrypt(unsigned char *input,unsigned char *output,unsigned char *key);
+
+#endif
--- a/main/cc_iuc_asynchpos.cpp
+++ b/main/cc_iuc_asynchpos.cpp
--- a/main/main.cpp
+++ b/main/main.cpp
--- a/main/main.pro
+++ b/main/main.pro
@@ -27,11 +27,14 @@ CONFIG(debug, debug|release) {

 SOURCES += main.cpp

+# HEADERS +=

-# HEADERS += \
-
-# OTHER_FILES += \
-
+OTHER_FILES += \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json



--- a/main/terminal_utils.cpp
+++ b/main/terminal_utils.cpp
@@ -0,0 +1,96 @@
+#include "terminal_utils.h"
+
+#include <atomic>
+#include <cstring>
+#include <endian.h>
+#include <QString>
+#include <QByteArray>
+#include <QDebug>
+
+namespace TU {
+    char const *terminalStatus(uint8_t status) {
+        switch (status) {
+        case TERMINAL_CB2_KEYS_NOT_PRESENT:
+            return "CB2 KEYS NOT PRESENT";
+        case TERMINAL_NO_BANKING_PARAMETERS_PRESENT:
+            return "NO BANKING PARAMETERS PRESENT";
+        case TERMINAL_IS_BLOCKED:
+            return "TERMINAL IS BLOCKED";
+        case TERMINAL_NOT_OPERATIVE:
+            return "TERMINAL NOT OPERATIVE";
+        case TERMINAL_IS_READY_AND_ACTIVE:
+            return "TERMINAL IS READY AND ACTIVE";
+        case TERMINAL_IS_READY_AND_NOT_ACTIVE:
+            return "TERMINAL IS READY AND *NOT* ACTIVE";
+        case TERMINAL_LOG_FULL:
+            return "TERMINAL LOG IS FULL";
+        default:
+            return "";
+        }
+    }
+
+    QByteArray int2Hex(int i) {
+        return QByteArray::fromHex(
+                QString().setNum(i, 16).toLocal8Bit().constData()).toHex();
+    }
+
+    uint16_t getNextTransactionId() {
+        static std::atomic<int> i{0};
+        int j = 0;
+
+        while ((j = (++i % 100)) == 0); // 1 <= j <= 99
+
+        return htobe16(((j / 10) + 0x30) << 8) | ((j % 10) + 0x30);
+    }
+
+    uint32_t crc32(uint32_t crc, unsigned char* pData, size_t len) {
+
+        qCritical() << "updateCRC" << QByteArray((char *)pData, len).toHex();
+
+        int i = 0;
+        int j = 0;
+        unsigned char ucCarry = 0x00;
+
+        crc = ~crc;
+        while (len > 0) {
+            uint32_t const c = pData[i];
+            crc ^= c;
+            ++i;
+
+            for (j = 0; j < 8; ++j) {
+                ucCarry = crc & 1;
+                crc >>= 1;
+
+                if (ucCarry) {
+                    crc ^= 0xedb88320;
+                }
+            }
+            --len;
+        }
+
+        return ~crc;
+
+    }
+
+    uint32_t crc32(QByteArray const &ba) {
+        uint32_t crc = 0;
+        return crc32(crc, (uint8_t *)ba.data(), ba.size());
+    }
+
+    char lrc(QByteArray const &ba) {
+        char crc = 0;
+        for (int i = 0; i < ba.size(); ++i) {
+            crc ^= ba[i];
+        }
+        return crc;
+    }
+
+    bool isBigEndian() {
+        union {
+            uint32_t i;
+            char c[4];
+        } bint = {0x01020304};
+
+        return bint.c[0] == 1;
+    }
+}
--- a/main/terminal_utils.h
+++ b/main/terminal_utils.h
@@ -0,0 +1,31 @@
+#ifndef TERMINAL_UTILS_H_INCLUDED
+#define TERMINAL_UTILS_H_INCLUDED
+
+#include <cinttypes>
+#include <QByteArray>
+
+namespace TU {
+
+    enum STATUS : uint8_t {
+        TERMINAL_CB2_KEYS_NOT_PRESENT = 0x30,
+        TERMINAL_NO_BANKING_PARAMETERS_PRESENT = 0x31,
+        TERMINAL_IS_BLOCKED = 0x32,
+        TERMINAL_NOT_OPERATIVE = 0x33,
+        TERMINAL_IS_READY_AND_ACTIVE = 0x34,
+        TERMINAL_IS_READY_AND_NOT_ACTIVE = 0x35,
+        TERMINAL_LOG_FULL = 0x36
+    };
+
+    char const *terminalStatus(uint8_t status);
+    QByteArray int2Hex(int i);
+    uint16_t getNextTransactionId();
+
+    //uint32_t crc32(const char *s, size_t n);
+    //uint32_t crc32(QByteArray const &ba);
+    uint32_t crc32(QByteArray const &ba);
+    uint32_t crc32(uint32_t crc, unsigned char* pData, size_t len);
+
+    char lrc(QByteArray const &ba);
+    bool isBigEndian();
+}
+#endif // TERMINAL_UTILS_H_INCLUDED