mirror of
https://github.com/dimoniche/Moyka.git
synced 2026-01-29 17:33:33 +03:00
улучшения
This commit is contained in:
parent
11f1bcc96f
commit
2add04de80
@ -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:
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -52,14 +52,14 @@
|
||||
|
||||
|
||||
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>9426</SelStart><SelEnd>9426</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>470</SelStart><SelEnd>470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1536</SelStart><SelEnd>1536</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>839</YPos><SelStart>25924</SelStart><SelEnd>25924</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2374</YPos><SelStart>105931</SelStart><SelEnd>105931</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>16</YPos><SelStart>1676</SelStart><SelEnd>1676</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>430</YPos><SelStart>14910</SelStart><SelEnd>14910</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>141</YPos><SelStart>5145</SelStart><SelEnd>5169</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1359</YPos><SelStart>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>431</YPos><SelStart>13018</SelStart><SelEnd>13018</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1417</YPos><SelStart>56979</SelStart><SelEnd>56979</SelEnd></Tab><ActiveTab>18</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>871</YPos><SelStart>20236</SelStart><SelEnd>20391</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>62</YPos><SelStart>1972</SelStart><SelEnd>1972</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>33</YPos><SelStart>285</SelStart><SelEnd>285</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>146</YPos><SelStart>4294</SelStart><SelEnd>4294</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>470</SelStart><SelEnd>470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1536</SelStart><SelEnd>1536</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>530</YPos><SelStart>13077</SelStart><SelEnd>13077</SelEnd></Tab><ActiveTab>8</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>5</YPos><SelStart>246</SelStart><SelEnd>250</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>141</YPos><SelStart>5145</SelStart><SelEnd>5169</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>343</YPos><SelStart>11781</SelStart><SelEnd>11781</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1359</YPos><SelStart>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>212</YPos><SelStart>6058</SelStart><SelEnd>6058</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1324</YPos><SelStart>53502</SelStart><SelEnd>53502</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>865</YPos><SelStart>23261</SelStart><SelEnd>23265</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>62</YPos><SelStart>1972</SelStart><SelEnd>1972</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>33</YPos><SelStart>285</SelStart><SelEnd>285</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>3540</SelStart><SelEnd>3540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>15135</SelStart><SelEnd>15135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1654</YPos><SelStart>74280</SelStart><SelEnd>74280</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Positions>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Top><Row0><Sizes><Toolbar-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>510</Bottom><Right>237</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>294964</sizeHorzCY><sizeVertCX>186719</sizeVertCX><sizeVertCY>736691</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>140</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>142</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>204317</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>294964</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>766</Bottom><Right>237</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>186719</sizeVertCX><sizeVertCY>807571</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>140</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>142</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>149317</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user