dimoniche/solarium.vlad
1
0
Fork 0
mirror of https://github.com/dimoniche/solarium.vlad.git synced 2026-01-30 04:53:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Последние ошибки

Browse Source
This commit is contained in:
Dmitriy 2025-06-03 22:20:44 +03:00
parent b59e345abd
commit 5b47acad37
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PROJECT/app/app_vlad.c
View File

@ -1042,7 +1042,18 @@ void AppVladEventProcess(CPU_INT32U event)
if(!write_mifare_card()) if(!write_mifare_card())
{ {
SaveEventRecord(app_state.ch_index, JOURNAL_EVENT_ABONEMENT_REJECTED, 0); TEventRecord record; // 18 + 4 = 22
record.event = JOURNAL_EVENT_ABONEMENT_REJECTED; // +1
record.type_abonement = data->type_abonement; // +1
record.money = 0; // +2
record.bonus = 0; // +2
record.time_before = data->best_before; // +4
record.number_abonement = data->number_abonement; // +4
record.money_sum = data->money; // +2
record.bonus_sum = data->bonus; // +2
SaveEventAbonementRecord(&record);
UserPrintPaymentErrorMenu(); UserPrintPaymentErrorMenu();
RefreshMenu(); RefreshMenu();
app_state.user_menu = USER_MENU_CARD_FAIL; app_state.user_menu = USER_MENU_CARD_FAIL;
@ -1093,7 +1104,18 @@ void AppVladEventProcess(CPU_INT32U event)
} }
else else
{ {
SaveEventRecord(app_state.ch_index, JOURNAL_EVENT_ABONEMENT_REJECTED, 0); TEventRecord record; // 18 + 4 = 22
record.event = JOURNAL_EVENT_ABONEMENT_REJECTED; // +1
record.type_abonement = data->type_abonement; // +1
record.money = 0; // +2
record.bonus = 0; // +2
record.time_before = data->best_before; // +4
record.number_abonement = data->number_abonement; // +4
record.money_sum = data->money; // +2
record.bonus_sum = data->bonus; // +2
SaveEventAbonementRecord(&record);
UserPrintPaymentErrorMenu(); UserPrintPaymentErrorMenu();
RefreshMenu(); RefreshMenu();
app_state.user_menu = USER_MENU_CARD_FAIL; app_state.user_menu = USER_MENU_CARD_FAIL;

6
PROJECT/app/journal.c
View File

@ -221,13 +221,13 @@ void GetEventStr(char* str, char event)
sprintf(str, "ÁÊÇ.îïëàòà "); sprintf(str, "ÁÊÇ.îïëàòà ");
break; break;
case JOURNAL_EVENT_ABONEMENT_REJECTED: case JOURNAL_EVENT_ABONEMENT_REJECTED:
sprintf(str, "БКЗ.оплата "); sprintf(str, "ÁĘÇ.îňęŕç ");
break; break;
case JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED: case JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED:
sprintf(str, "БКЗ.пополнение "); sprintf(str, "ÁĘÇ.ďîďîëí.");
break; break;
case JOURNAL_EVENT_ABONEMENT_PAY_REJECTED: case JOURNAL_EVENT_ABONEMENT_PAY_REJECTED:
sprintf(str, "БКЗ.пополнение "); sprintf(str, "ÁĘÇ.ďîďîëí.");
break; break;
case JOURNAL_EVENT_ABONEMENT_BALANCE: case JOURNAL_EVENT_ABONEMENT_BALANCE:
sprintf(str, "ÁÊÇ.áàëàíñ "); sprintf(str, "ÁÊÇ.áàëàíñ ");

6
PROJECT/data/datadesc.c
View File

@ -6315,7 +6315,7 @@ CPU_INT08U const CounterSolarCardMoneyName[] = "
TDataDescStruct const CounterSolarCardMoneyDesc = { TDataDescStruct const CounterSolarCardMoneyDesc = {
DATA_DESC_VIEW, // òèï äåñêðèïòîðà DATA_DESC_VIEW, // òèï äåñêðèïòîðà
DATA_TYPE_RUB_CENT, // òèï ïàðàìåòðà DATA_TYPE_ULONG, // òèï ïàðàìåòðà
DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà
DATA_IS_ARRAY, // ïðèçíàê ìàññèâà DATA_IS_ARRAY, // ïðèçíàê ìàññèâà
CHANNELS_NUM * SOLAR_MODES_COUNT, // ðàçìåð ìàññèâà CHANNELS_NUM * SOLAR_MODES_COUNT, // ðàçìåð ìàññèâà
@ -6483,7 +6483,7 @@ CPU_INT08U const CounterModeCardMoneyName[] = "
TDataDescStruct const CounterModeCardMoneyDesc = { TDataDescStruct const CounterModeCardMoneyDesc = {
DATA_DESC_VIEW, // òèï äåñêðèïòîðà DATA_DESC_VIEW, // òèï äåñêðèïòîðà
DATA_TYPE_RUB_CENT, // òèï ïàðàìåòðà DATA_TYPE_ULONG, // òèï ïàðàìåòðà
DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà
DATA_IS_ARRAY, // ïðèçíàê ìàññèâà DATA_IS_ARRAY, // ïðèçíàê ìàññèâà
SOLAR_MODES_COUNT, // ðàçìåð ìàññèâà SOLAR_MODES_COUNT, // ðàçìåð ìàññèâà
@ -6892,7 +6892,7 @@ CPU_INT08U const CounterAbonementMoneyName[] = "
TDataDescStruct const CounterAbonementMoneyDesc = { TDataDescStruct const CounterAbonementMoneyDesc = {
DATA_DESC_VIEW, // òèï äåñêðèïòîðà DATA_DESC_VIEW, // òèï äåñêðèïòîðà
DATA_TYPE_RUB_CENT, // òèï ïàðàìåòðà DATA_TYPE_ULONG, // òèï ïàðàìåòðà
DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà
DATA_NO_ARRAY, // ïðèçíàê ìàññèâà DATA_NO_ARRAY, // ïðèçíàê ìàññèâà
0, // ðàçìåð ìàññèâà 0, // ðàçìåð ìàññèâà

8
PROJECT/menu/menudesc.c
View File

@ -2374,16 +2374,16 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED) else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED)
{ {
sprintf(&str_event[strlen(str_event)], " %dð", record->money); sprintf(&str_event[strlen(str_event)], " %dð %d", record->money, record->type_abonement + 1);
char str[32]; char str[32];
PrintDateString(str, record->time_before); PrintDateString(str, record->time_before);
sprintf(str_data, "%x %dð %dÁ %s %d", record->number_abonement, record->money_sum, record->bonus_sum, str, record->type_abonement + 1); sprintf(str_data, "%x %dð %dÁ %s %d", record->number_abonement, record->money_sum, record->bonus_sum, str);
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_REJECTED) else if (record->event == JOURNAL_EVENT_ABONEMENT_REJECTED)
{ {
sprintf(str_data, "Îòêàç %dðóá %dÁ", record->money, record->bonus); sprintf(str_data, "%x %dðóá %dÁ", record->number_abonement, record->money_sum, record->bonus_sum);
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_REJECTED) else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_REJECTED)
{ {
@ -2399,7 +2399,7 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_WRONG) else if (record->event == JOURNAL_EVENT_ABONEMENT_WRONG)
{ {
sprintf(str_data, "id %x. Êîä îøèáêè %ld", record->number_abonement, record->number_abonement); sprintf(str_data, "%x. Êîä îøèáêè %ld", record->number_abonement, record->password);
} }
else if (record->event == JOURNAL_EVENT_CARD_REJECTED) else if (record->event == JOURNAL_EVENT_CARD_REJECTED)
{ {