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-05-15 01:25:23 +03:00
parent ad91ee31fe
commit fb903130dc
6 changed files with 58 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PROJECT/app/app_vlad.c
View File

@ -812,13 +812,11 @@ void AppVladEventProcess(CPU_INT32U event)
RefreshMenu(); RefreshMenu();
PlayMusicFile(41); PlayMusicFile(41);
} }
stop_card_working();
} else { } else {
app_state.user_menu = USER_MENU_IDLE; app_state.user_menu = USER_MENU_IDLE;
break;
} }
stop_card_working();
} }
if(app_state.user_menu == USER_MENU_INSERT_BONUS_CARD) if(app_state.user_menu == USER_MENU_INSERT_BONUS_CARD)
@ -929,7 +927,7 @@ void AppVladEventProcess(CPU_INT32U event)
} }
else if(app_state.user_menu == USER_MENU_BALANCE_CARD) else if(app_state.user_menu == USER_MENU_BALANCE_CARD)
{ {
if (OSTimeGet() - app_state.last_card_manipulation_time > MENU_KEY_PRESS_TIMEOUT_MS) if (OSTimeGet() - app_state.last_card_manipulation_time > MENU_CARD_MANIPULATION_TIMEOUT_MS)
{ {
app_state.user_menu = USER_MENU_IDLE; app_state.user_menu = USER_MENU_IDLE;
app_state.ch_index = 0; app_state.ch_index = 0;
@ -1060,10 +1058,10 @@ void AppVladEventProcess(CPU_INT32U event)
RefreshMenu(); RefreshMenu();
// temporally // temporally
//SetAcceptedMoney(app_state.abonementtopay); SetAcceptedMoney(app_state.abonementtopay);
//SaveEventRecord(app_state.current_abonement, JOURNAL_EVENT_CARD_ACCEPTED, app_state.abonementtopay); SaveEventRecord(app_state.current_abonement, JOURNAL_EVENT_CARD_ACCEPTED, app_state.abonementtopay);
//app_state.user_menu = USER_MENU_INSERT_BONUS_CARD; app_state.user_menu = USER_MENU_INSERT_BONUS_CARD;
//PostUserEvent(EVENT_FINISH_PAYMENT_ABONEMENT); PostUserEvent(EVENT_FINISH_PAYMENT_ABONEMENT);
} }
} }
else if (app_state.user_menu == USER_MENU_SHOW_THANKS) else if (app_state.user_menu == USER_MENU_SHOW_THANKS)

2
PROJECT/drivers/mfrc522/mfrc522data.c
View File

@ -6,7 +6,7 @@
mifaredata_t mifare_card_data; mifaredata_t mifare_card_data;
#define START_BLOCK 44 #define START_BLOCK 12
#define NR_KNOWN_KEYS 2 #define NR_KNOWN_KEYS 2
uint8_t knownKeys[NR_KNOWN_KEYS][MF_KEY_SIZE] = { uint8_t knownKeys[NR_KNOWN_KEYS][MF_KEY_SIZE] = {

42
settings/sk-mlpc2368.dbgdt
View File

File diff suppressed because one or more lines are too long

28
settings/sk-mlpc2368.dnx
View File

@ -50,7 +50,7 @@
<MemConfigValue>C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\CONFIG\debugger\NXP\LPC2368.ddf</MemConfigValue> <MemConfigValue>C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\CONFIG\debugger\NXP\LPC2368.ddf</MemConfigValue>
</PlDriver> </PlDriver>
<DebugChecksum> <DebugChecksum>
<Checksum>2524785449</Checksum> <Checksum>2148628426</Checksum>
</DebugChecksum> </DebugChecksum>
<Exceptions> <Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught> <StopOnUncaught>_ 0</StopOnUncaught>
@ -89,16 +89,6 @@
<Enabled>0</Enabled> <Enabled>0</Enabled>
<ShowSource>0</ShowSource> <ShowSource>0</ShowSource>
</Trace2> </Trace2>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Bp0>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\rfid-spi.c}.321.7" 0 0 1 "" 0 "" 0</Bp0>
<Bp1>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\rfid-spi.c}.190.3" 0 0 1 "" 0 "" 0</Bp1>
<Bp2>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\mfrc522data.c}.210.15" 0 0 1 "" 0 "" 0</Bp2>
<Bp3>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\mfrc522data.c}.216.5" 0 0 1 "" 0 "" 0</Bp3>
<Count>4</Count>
</Breakpoints2>
<TermIOLog> <TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled> <LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile> <LogFile>_ ""</LogFile>
@ -108,10 +98,6 @@
<LogFile>_ ""</LogFile> <LogFile>_ ""</LogFile>
<Category>_ 0</Category> <Category>_ 0</Category>
</LogFile> </LogFile>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
<DriverProfiling> <DriverProfiling>
<Enabled>0</Enabled> <Enabled>0</Enabled>
<Mode>1</Mode> <Mode>1</Mode>
@ -124,4 +110,16 @@
<CallStackStripe> <CallStackStripe>
<ShowTiming>1</ShowTiming> <ShowTiming>1</ShowTiming>
</CallStackStripe> </CallStackStripe>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Bp0>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\rfid-spi.c}.321.7" 0 0 1 "" 0 "" 0</Bp0>
<Bp1>_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\drivers\mfrc522\rfid-spi.c}.190.3" 0 0 1 "" 0 "" 0</Bp1>
<Count>2</Count>
</Breakpoints2>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
</settings> </settings>

32
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

4
sk-mlpc2368.dep
View File

@ -1685,10 +1685,6 @@
<file> <file>
<name>$PROJ_DIR$\Solarium Vlad\Exe\sk_mlpc2368.out</name> <name>$PROJ_DIR$\Solarium Vlad\Exe\sk_mlpc2368.out</name>
<outputs> <outputs>
<tool>
<name>OBJCOPY</name>
<file> 4</file>
</tool>
<tool> <tool>
<name>ILINK</name> <name>ILINK</name>
<file> 73</file> <file> 73</file>