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-04-17 22:49:57 +03:00
parent c84a60d9fb
commit 8dee5e0086
4 changed files with 1828 additions and 1817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROJECT/app/app_serv.h
View File

@ -86,8 +86,9 @@ typedef struct
CPU_INT08U ch_index; CPU_INT08U ch_index;
CPU_INT08U mode_index; CPU_INT08U mode_index;
CPU_INT08U pay_index; CPU_INT08U pay_index;
#define PAY_TYPE_CASH 0 #define PAY_TYPE_CARD_ABONEMENT 0
#define PAY_TYPE_CARD 1 #define PAY_TYPE_CARD 1
#define PAY_TYPE_CASH 2
CPU_INT08U solar_state[CHANNELS_NUM]; CPU_INT08U solar_state[CHANNELS_NUM];
#define SOLAR_STATE_FREE 0 #define SOLAR_STATE_FREE 0

22
PROJECT/app/app_vlad.c
View File

@ -51,7 +51,7 @@ void PrintInsertBankCardMenu(void);
void PrintInsertBonusCardMenu(void); void PrintInsertBonusCardMenu(void);
void PrintFinishPayMenu(void); void PrintFinishPayMenu(void);
void PrintAnotherCardMenu(void); void PrintAnotherCardMenu(void);
void PrintSelectMethodPayCardMenu(CPU_INT08U blink);
void PrintWarning1Menu(void); void PrintWarning1Menu(void);
void PrintWarning2Menu(void); void PrintWarning2Menu(void);
void PrintSelectChMenu(CPU_INT08U blink); void PrintSelectChMenu(CPU_INT08U blink);
@ -1179,7 +1179,7 @@ void AppVladEventProcess(CPU_INT32U event)
app_state.user_menu = USER_MENU_SILVER_BONUS + app_state.current_abonement; app_state.user_menu = USER_MENU_SILVER_BONUS + app_state.current_abonement;
// ïîëó÷èì ñóììó îïëàòû // ïîëó÷èì ñóììó îïëàòû
// app_state.abonementtopay = GetData(&AbonementMoneyDesc, &app_state.abonementtopay, app_state.current_abonement, DATA_FLAG_DIRECT_INDEX);
// âûáðàëè àáîíåìåíò // âûáðàëè àáîíåìåíò
if(app_state.current_abonement == SILVER_ABONEMENT) { if(app_state.current_abonement == SILVER_ABONEMENT) {
@ -1378,6 +1378,16 @@ void AppVladEventProcess(CPU_INT32U event)
RefreshMenu(); RefreshMenu();
PlayMusicFile(9 + app_state.mode_index); PlayMusicFile(9 + app_state.mode_index);
} }
else if (app_state.pay_index == PAY_TYPE_CARD_ABONEMENT)
{
GetData(&SolarMinimumTimeMinutesDesc, &app_state.timetopay, app_state.ch_index, DATA_FLAG_DIRECT_INDEX);
app_state.timetopay *= 60;
app_state.user_menu = USER_MENU_CARD_PAYING;
app_state.blink_ctr = 0;
PrintCardPayingMenu(0);
RefreshMenu();
PlayMusicFile(12 + app_state.mode_index);
}
else if (app_state.pay_index == PAY_TYPE_CARD) else if (app_state.pay_index == PAY_TYPE_CARD)
{ {
GetData(&SolarMinimumTimeMinutesDesc, &app_state.timetopay, app_state.ch_index, DATA_FLAG_DIRECT_INDEX); GetData(&SolarMinimumTimeMinutesDesc, &app_state.timetopay, app_state.ch_index, DATA_FLAG_DIRECT_INDEX);
@ -2639,7 +2649,7 @@ void PrintSelectPayTypeMenu(CPU_INT08U blink)
{ {
PrintUserMenuStrUnalign(" Âûáåðèòå ñïîñîá", 0); PrintUserMenuStrUnalign(" Âûáåðèòå ñïîñîá", 0);
PrintUserMenuStrUnalign(" îïëàòû", 1); PrintUserMenuStrUnalign(" îïëàòû", 1);
if (app_state.pay_index == PAY_TYPE_CASH) if (app_state.pay_index == PAY_TYPE_CARD_ABONEMENT)
{ {
if (blink) if (blink)
{ {
@ -2648,7 +2658,7 @@ void PrintSelectPayTypeMenu(CPU_INT08U blink)
} }
else else
{ {
PrintUserMenuStrUnalign("1. Íàëè÷íûìè", 2); PrintUserMenuStrUnalign("1. Êàðòîé çàãàðà", 2);
PrintUserMenuStrUnalign("2. Áàíêîâñêîé êàðòîé", 3); PrintUserMenuStrUnalign("2. Áàíêîâñêîé êàðòîé", 3);
} }
} }
@ -2656,12 +2666,12 @@ void PrintSelectPayTypeMenu(CPU_INT08U blink)
{ {
if (blink) if (blink)
{ {
PrintUserMenuStrUnalign("1. Íàëè÷íûìè", 2); PrintUserMenuStrUnalign("1. Êàðòîé çàãàðà", 2);
PrintUserMenuStrUnalign(" ", 3); PrintUserMenuStrUnalign(" ", 3);
} }
else else
{ {
PrintUserMenuStrUnalign("1. Íàëè÷íûìè", 2); PrintUserMenuStrUnalign("1. Êàðòîé çàãàðà", 2);
PrintUserMenuStrUnalign("2. Áàíêîâñêîé êàðòîé", 3); PrintUserMenuStrUnalign("2. Áàíêîâñêîé êàðòîé", 3);
} }
} }

40
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

3578
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff