From 9a32a765cdccd909da6ecef3a21138bb18a06220 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 24 Jan 2023 10:05:18 +0100 Subject: [PATCH] Added version, tariff_features, waiting_period, parking_time_min and parking_time_max. Removed max_parking_time. --- .../calculate_parking_tickets_tariff.h | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/calculate_parking_tickets/calculate_parking_tickets_tariff.h b/calculate_parking_tickets/calculate_parking_tickets_tariff.h index 003a87d..459d13e 100644 --- a/calculate_parking_tickets/calculate_parking_tickets_tariff.h +++ b/calculate_parking_tickets/calculate_parking_tickets_tariff.h @@ -9,6 +9,12 @@ #include #include +#define FAHRZEUG_AUSWAHL_PKW (uint64_t)(0x0000000000000001) +#define FAHRZEUG_AUSWAHL_BUS (uint64_t)(0x0000000000000002) +#define FAHRZEUG_AUSWAHL_LKW (uint64_t)(0x0000000000000004) +#define VERANSTALTUNG_AUSWAHL_SPORT (uint64_t)(0x0000000000000008) +#define VERANSTALTUNG_AUSWAHL_KULTUR (uint64_t)(0x0000000000000010) + struct parking_tariff_t { // parking_tariff_t(); static parking_tariff_t *parseTariff(const char *confFile); @@ -38,18 +44,13 @@ struct parking_tariff_t { /// /// \brief waiting_period /// @note Also called "Karenzzeit". Allowed values: [0, 3] - // minute_t waiting_period; + minute_t waiting_period; /// /// \brief free_of_charge /// minute_t free_of_charge; - /// - /// \brief max_parking_time - /// - minute_t max_parking_time = -1; - /// /// \brief max_parking_price_units /// @@ -60,6 +61,31 @@ struct parking_tariff_t { /// uint32_t max_price_for_24_hours; // 24h limit (default -1) + /// + /// \brief tariff_version + /// + char tariff_version[64]; + + /// + /// \brief tariff_features + /// + uint64_t tariff_features; + + /// + /// \brief _tariff_features + /// + uint64_t _tariff_features[64]; + + /// + /// \brief parking_time_min + /// + minute_t parking_time_min; + + /// + /// \brief parking_time_max + /// + minute_t parking_time_max; + #if 0 /// Minimal amount of money for buying a ticket. ///