diff --git a/library/src/calculate_price.cpp b/library/src/calculate_price.cpp index 58363a6..e8f0731 100644 --- a/library/src/calculate_price.cpp +++ b/library/src/calculate_price.cpp @@ -59,13 +59,13 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons QString json = fname.readAll(); if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) { - calcState.m_status = CalcState::State::ERROR_PARSING_TARIFF; + return calcState.set(CalcState::State::ERROR_PARSING_TARIFF); } } else { - calcState.m_status = CalcState::State::ERROR_LOADING_TARIFF; + return calcState.set(CalcState::State::ERROR_LOADING_TARIFF); } - qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!"; + qCritical() << "init_tariff: Parsing tariff config (" << confFile << ")"; return calcState; } diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 97e0b2e..7aec757 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -509,6 +509,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio double ret_val = total_cost; total_cost = 0.0f; - // return ceil(ret_val); - return floor(ret_val); + return ceil(ret_val); + // return floor(ret_val); } diff --git a/main/main.cpp b/main/main.cpp index 97e5a15..c4ed0f5 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -80,7 +80,8 @@ int main() { memset(&now, 0, sizeof(now)); strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now); now.tm_hour -= 1; // for ctime - for (int i=0; i<6*24; ++i) { + // for (int i=0; i<6*24; ++i) { + for (int i=0; i<1; ++i) { int const duration = 120; time_t t = mktime(&now); start_parking_time = t / 60;