diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c index c8a9fa7..d8c6780 100644 --- a/PROJECT/app/app_serv.c +++ b/PROJECT/app/app_serv.c @@ -563,8 +563,8 @@ void UserAppTask(void *p_arg) break; case EVENT_KEY_F1: - testMoney = 100; - PostUserEvent(EVENT_BANK_INSERTED_POST1); + //testMoney = 100; + //PostUserEvent(EVENT_BANK_INSERTED_POST1); /*FIO4SET_bit.P4_28 = 1; OSTimeDly(50); @@ -587,11 +587,11 @@ void UserAppTask(void *p_arg) FIO4CLR_bit.P4_28 = 1;*/ break; case EVENT_KEY_F2: - PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1); + //PostUserEvent(EVENT_COIN_INSERTED_POST1); break; case EVENT_KEY_F3: - testMoney = 100; - PostUserEvent(EVENT_CASH_INSERTED_POST1); + //testMoney = 100; + //PostUserEvent(EVENT_CASH_INSERTED_POST1); break; #endif default: diff --git a/PROJECT/data/datadesc.c b/PROJECT/data/datadesc.c index 634fc3a..1939196 100644 --- a/PROJECT/data/datadesc.c +++ b/PROJECT/data/datadesc.c @@ -1665,15 +1665,24 @@ TDataDescStruct const JournalErrorNumberDescEng = { TRangeValueULONG const EventJournalIndexRange = {0, 0xffffffff}; CPU_INT08U const EventJournalIndexName[] = "Запись #"; CPU_INT32U EventJournalIndex = 0; +CPU_INT32U last_Index = 0; void OnChangeEventJournalIndex(void) { TEventRecord record; - - if (EventJournalIndex == 0xffffffff) EventJournalIndex = JOURNAL_EVENTS_COUNT - 1; - else if (EventJournalIndex > JOURNAL_EVENTS_COUNT - 1) EventJournalIndex = 0; + + if (EventJournalIndex == 0xffffffff) EventJournalIndex = EVENT_RECORDS_COUNT - 1; + else if (EventJournalIndex > EVENT_RECORDS_COUNT - 1) EventJournalIndex = 0; GetEventRecord(&record, EventJournalIndex); + + if(record.time == 0) + { + EventJournalIndex = last_Index; + return; + } + + last_Index = EventJournalIndex; PrintEventJournalRecord(&record); } diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni index 92bce4f..06ab1fb 100644 --- a/settings/sk-mlpc2368.dni +++ b/settings/sk-mlpc2368.dni @@ -14,7 +14,7 @@ Count=0 Enabled=0 ShowSource=1 [DebugChecksum] -Checksum=-1170505141 +Checksum=-1578374706 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 @@ -24,8 +24,8 @@ ShowArgs=0 MixedMode=1 [JLinkDriver] WatchCond=_ 0 -Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 -Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 +Watch0=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 0 0 0 +Watch1=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 0 0 0 ETM_Cookie=ID100_127104120001100101001 ETM_Reg_GeneralControl=0x00002C08 ETM_Reg_TriggerEvent=0x0000406F @@ -152,6 +152,10 @@ UnspecRange=1 ActionState=1 [watch_formats] Fmt0={W}0:curr_input 4 0 +[Disassemble mode] +mode=0 +[Breakpoints2] +Count=0 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -159,6 +163,9 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" +[Aliases] +Count=0 +SuppressDialog=0 [Trace1] Enabled=0 ShowSource=1 @@ -169,10 +176,3 @@ Enabled=0 Mode=1 Graph=0 Symbiont=0 -[Disassemble mode] -mode=0 -[Breakpoints2] -Count=0 -[Aliases] -Count=0 -SuppressDialog=0 diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index 3606e9f..ef5ac0d 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -52,14 +52,14 @@ - TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\services\coin.c08392592425924TextEditor$WS_DIR$\PROJECT\data\datadesc.c02374105931105931TextEditor$WS_DIR$\PROJECT\app\journal.h01616761676TextEditor$WS_DIR$\PROJECT\app\app_serv.c04301491014910TextEditor$WS_DIR$\PROJECT\data\datadesc.h014151455169TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c04311301813018TextEditor$WS_DIR$\PROJECT\menu\menudesc.c01417569795697918TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08712023620391TextEditor$WS_DIR$\PROJECT\services\fr.c06219721972TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\OS\app\app.c014642944294TextEditor$WS_DIR$\PROJECT\menu\menudesc.h026139015320100000010000001 + TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\services\coin.c053013077130778TextEditor$WS_DIR$\PROJECT\app\journal.h05246250TextEditor$WS_DIR$\PROJECT\data\datadesc.h014151455169TextEditor$WS_DIR$\PROJECT\app\app_serv.c03431178111781TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c021260586058TextEditor$WS_DIR$\PROJECT\menu\menudesc.c013245350253502TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08652326123265TextEditor$WS_DIR$\PROJECT\services\fr.c06219721972TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c0165474280742800100000010000001 - iaridepm.enu1-2-2510237-2-2254205198438294964186719736691-2-21401282-2-212841421003125204317198438294964 + iaridepm.enu1-2-2766237-2-2254205198438215563186719807571-2-21401282-2-212841421003125149317198438215563