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:
dimoniche 2025-05-21 00:18:21 +03:00
parent e59c6054b6
commit 26b17106ae
8 changed files with 1833 additions and 1858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
PROJECT/app/app_vlad.c
View File

@ -1533,7 +1533,7 @@ void AppVladEventProcess(CPU_INT32U event)
{ {
app_state.user_menu = USER_MENU_ABONENT_PROCESSING; app_state.user_menu = USER_MENU_ABONENT_PROCESSING;
PrintAnotherCardMenu(); PrintInsertBonusCardMenu();
RefreshMenu(); RefreshMenu();
} }
} }
@ -1609,38 +1609,11 @@ void AppVladEventProcess(CPU_INT32U event)
break; break;
case EVENT_FINISH_PAYMENT_ABONEMENT: case EVENT_FINISH_PAYMENT_ABONEMENT:
{ {
//CPU_INT32U price, accmoney;
//CPU_INT32U min_time;
if (app_state.user_menu != USER_MENU_INSERT_BONUS_CARD) if (app_state.user_menu != USER_MENU_INSERT_BONUS_CARD)
{ {
break; break;
} }
// íàïå÷àòàåì ÷åê
/*if (IsFiscalConnected())
{
CPU_INT32U format;
char service_name[48];
GetData(&BillFormatDesc, &format, 0, DATA_FLAG_SYSTEM_INDEX);
GetDataStr(&ServiceNameDesc, (CPU_INT08U*)service_name, 0, DATA_FLAG_SYSTEM_INDEX);
sprintf(&service_name[strlen(service_name)], ". Àáîíåìåíò %d", app_state.current_abonement + 1);
if (format == 0)
{
strcat(service_name, ", ðóá.");
}
if (PrintFiscalBill(accmoney, ChannelsPayedTime[app_state.ch_index], app_state.user_menu == USER_MENU_CARD_OK, service_name, price) == 0)
{
SaveEventRecord(app_state.ch_index, JOURNAL_EVENT_PRINT_BILL, GetTimeSec());
}
else
{
// îøèáêà ïå÷àòè ÷åêà
}
}*/
// ïîïîëíåíèå êàðòû çàêîí÷èëè - ñîîáùèì îá ýòîì // ïîïîëíåíèå êàðòû çàêîí÷èëè - ñîîáùèì îá ýòîì
PrintInsertBonusCardMenu(); PrintInsertBonusCardMenu();
RefreshMenu(); RefreshMenu();
@ -2477,86 +2450,86 @@ void PrintMenuAllPrice(CPU_INT08U blink)
{ {
if(blink) { if(blink) {
PrintUserMenuStr(" ", 0); PrintUserMenuStr(" ", 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} else { } else {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} }
} }
else if(app_state.current_abonement == GOLD_ABONEMENT) else if(app_state.current_abonement == GOLD_ABONEMENT)
{ {
if(blink) { if(blink) {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
PrintUserMenuStr(" ", 1); PrintUserMenuStr(" ", 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} else { } else {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} }
} }
else if(app_state.current_abonement == PLATINUM_ABONEMENT) else if(app_state.current_abonement == PLATINUM_ABONEMENT)
{ {
if(blink) { if(blink) {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
PrintUserMenuStr(" ", 2); PrintUserMenuStr(" ", 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} else { } else {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} }
} }
else if(app_state.current_abonement == DIAMOND_ABONEMENT) else if(app_state.current_abonement == DIAMOND_ABONEMENT)
{ {
if(blink) { if(blink) {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
PrintUserMenuStr(" ", 3); PrintUserMenuStr(" ", 3);
} else { } else {
sprintf(str, "ÑÅÐÅÁ-%d ð %d áîí", pay_silver, bonus_silver); sprintf(str, "ÑÅÐÅÁ-%5dð %5d Á", pay_silver, bonus_silver);
PrintUserMenuStr(str, 0); PrintUserMenuStr(str, 0);
sprintf(str, "ÇÎËÎÒ-%d ð %d áîí", pay_gold, bonus_gold); sprintf(str, "ÇÎËÎÒ-%5dð %5d Á", pay_gold, bonus_gold);
PrintUserMenuStr(str, 1); PrintUserMenuStr(str, 1);
sprintf(str, "ÏËÀÒ.-%d ð %d áîí", pay_plat, bonus_plat); sprintf(str, "ÏËÀÒ.-%5dð %5d Á", pay_plat, bonus_plat);
PrintUserMenuStr(str, 2); PrintUserMenuStr(str, 2);
sprintf(str, "ÀËÌÀÇ-%d ð %d áîí", pay_diamond, bonus_diamond); sprintf(str, "ÀËÌÀÇ-%5dð %5d Á", pay_diamond, bonus_diamond);
PrintUserMenuStr(str, 3); PrintUserMenuStr(str, 3);
} }
} }

4
PROJECT/data/datadesc.c
View File

@ -467,7 +467,7 @@ TDataDescStruct const EnableValidatorDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк) DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableValidatorList, // указатель на список строк для индексного параметра EnableValidatorList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE, DATA_INIT_DISABLE,
1 // значение по умолчанию 0 // значение по умолчанию
}; };
/************************************* /*************************************
@ -818,7 +818,7 @@ TDataDescStruct const EnableFiscalDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк) DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableFiscalList, // указатель на список строк для индексного параметра EnableFiscalList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE, DATA_INIT_DISABLE,
1 0
}; };
/************************************* /*************************************

6
PROJECT/menu/menudesc.c
View File

@ -1294,7 +1294,7 @@ const TMenuLine line_DeviceMenu_8 = {
}; };
#endif #endif
const TMenuLineArray arr_DeviceMenuArray[] = {&line_DeviceMenu_0, &line_DeviceMenu_1, &line_DeviceMenu_2, &line_DeviceMenu_3, const TMenuLineArray arr_DeviceMenuArray[] = {&line_DeviceMenu_0, /*&line_DeviceMenu_1, &line_DeviceMenu_2, &line_DeviceMenu_3,*/
#if defined(CONFIG_MODEM_ENABLE) #if defined(CONFIG_MODEM_ENABLE)
&line_DeviceMenu_4, &line_DeviceMenu_4,
#endif #endif
@ -1311,7 +1311,7 @@ const TMenuLineArray arr_DeviceMenuArray[] = {&line_DeviceMenu_0, &line_DeviceMe
#endif #endif
NULL}; NULL};
const TMenuPanel DeviceMenuPanel[] = {arr_DeviceMenuArray, NULL, const TMenuPanel DeviceMenuPanel[] = {arr_DeviceMenuArray, NULL,
5 2
#if defined(CONFIG_MUSIC_ENABLE) #if defined(CONFIG_MUSIC_ENABLE)
+ 1 + 1
#endif #endif
@ -3365,7 +3365,7 @@ void OnEnterAbonementCountersMenu(void)
} }
const TMenuLineArray arr_AbonementCountersArray[] = {&line_AbonementsCountersMenu_0, &line_AbonementsCountersMenu_1, &line_AbonementsCountersMenu_2, &line_AbonementsCountersMenu_3, NULL}; const TMenuLineArray arr_AbonementCountersArray[] = {&line_AbonementsCountersMenu_0, &line_AbonementsCountersMenu_1, &line_AbonementsCountersMenu_2, &line_AbonementsCountersMenu_3, NULL};
const TMenuPanel AbonementCountersPanel[] = {arr_AbonementCountersArray, OnEnterAbonementCountersMenu, 5, MENU_PANEL_STANDARD}; const TMenuPanel AbonementCountersPanel[] = {arr_AbonementCountersArray, OnEnterAbonementCountersMenu, 4, MENU_PANEL_STANDARD};
/*********************************** /***********************************
ÌÅÍÞ Ñ×ÅÒ×ÈÊΠÏÎ ÂÐÅÌÅÍÈ ÍÀÐÀÁÎÒÊÈ ËÀÌÏ ÌÅÍÞ Ñ×ÅÒ×ÈÊΠÏÎ ÂÐÅÌÅÍÈ ÍÀÐÀÁÎÒÊÈ ËÀÌÏ

4
settings/sk-mlpc2368.Solarium_Vlad.cspy.bat
View File

@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
@echo on @echo on
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
@echo off @echo off
goto end goto end
@ -34,7 +34,7 @@ goto end
@echo on @echo on
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
@echo off @echo off
:end :end

4
settings/sk-mlpc2368.Solarium_Vlad.cspy.ps1
View File

@ -23,9 +23,9 @@
if ($debugfile -eq "") if ($debugfile -eq "")
{ {
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" & "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
} }
else else
{ {
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" & "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
} }

2
settings/sk-mlpc2368.Solarium_Vlad.general.xcl
View File

@ -2,7 +2,7 @@
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll"
"C:\git_work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out" "C:\work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out"
--plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll" --plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll"

40
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

3546
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff