dimoniche/Moyka
1
0
Fork 0
mirror of https://github.com/dimoniche/Moyka.git synced 2026-01-30 01:43:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

убрал постоянно висящее окно ожидания печати при неверном приходе сигнала окончания мойки

Browse Source
This commit is contained in:
dimoniche 2020-02-25 22:35:10 +03:00
parent d7883bf8e1
commit 63ed4f0afd
5 changed files with 3786 additions and 3773 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
PROJECT/app/app_serv.c
View File

@ -319,23 +319,24 @@ void UserAppTask(void *p_arg)
accmoney = GetAcceptedMoney(post); accmoney = GetAcceptedMoney(post);
accmoney += GetAcceptedBankMoney(post); accmoney += GetAcceptedBankMoney(post);
if (accmoney > 0)
{
// ïåðåçàïóñòèì òàéì àóòû - ÷òî áû ïî òàéì àóòó íå âîâðåìÿ íå ñáðîñèòü íàêîïëåííîå
money_timestamp[post] = OSTimeGet();
// ïîñëå ñáðîñà îøèáêè ÷åêè ïå÷àòàåì íå ñðàçó - à ÷åðåç òàéì àóò ïå÷àòè, âäðóã íå âñå èñïðàâèëîñü?
PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1 + post);
// âçâåäåì òàéìàóò ïå÷àòè ÷åêà - ïîñëàëè æå çàïðîñ
time_out_print_check[post] = 35;
}
// çàîäíî íà âñÿêèé ñëó÷àé ñáðîñèì ñîîáùåíèå î ïå÷àòè ÷åêà è òàéì àóò åãî îæèäàíèÿ // çàîäíî íà âñÿêèé ñëó÷àé ñáðîñèì ñîîáùåíèå î ïå÷àòè ÷åêà è òàéì àóò åãî îæèäàíèÿ
if(wash_State[post] == printCheck) if(wash_State[post] == printCheck)
{ {
wash_State[post] = waitMoney; wash_State[post] = waitMoney;
countSecWait[post] = 0; countSecWait[post] = 0;
} }
if (accmoney > 0)
{
// перезапустим тайм ауты - что бы по тайм ауту не вовремя не сбросить накопленное
money_timestamp[post] = OSTimeGet();
// взведем таймаут печати чека - послали же запрос
time_out_print_check[post] = 35;
// после сброса ошибки чеки печатаем не сразу - а через тайм аут печати, вдруг не все исправилось?
PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1 + post);
}
} }
break; break;
@ -558,10 +559,10 @@ void UserAppTask(void *p_arg)
GetData(&PrintTimeoutDesc, &count_delay, number_post, DATA_FLAG_DIRECT_INDEX); GetData(&PrintTimeoutDesc, &count_delay, number_post, DATA_FLAG_DIRECT_INDEX);
countSecWait[number_post] = count_delay; countSecWait[number_post] = count_delay;
wash_State[number_post] = printCheck;
// åñëè çàäåðæêè íåò - ñðàçó ïå÷àòàåì // åñëè çàäåðæêè íåò - ñðàçó ïå÷àòàåì
if(countSecWait[number_post] == 0) PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + number_post); if(countSecWait[number_post] == 0) PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + number_post);
wash_State[number_post] = printCheck;
} }
else if (was_critical_error) else if (was_critical_error)
{ {
@ -585,10 +586,14 @@ void UserAppTask(void *p_arg)
int number_post = event - EVENT_CASH_PRINT_CHECK_POST1; int number_post = event - EVENT_CASH_PRINT_CHECK_POST1;
CPU_INT32U accmoney = 0; CPU_INT32U accmoney = 0;
// переходим в ожидание приема денег
wash_State[number_post] = waitMoney;
// сбросим таймаут ожидания печати чека после снятия ошибки
time_out_print_check[number_post] = 0;
if (was_critical_error) if (was_critical_error)
{ {
wash_State[number_post] = waitMoney; break;
break;
} }
// çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ // çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ
@ -612,9 +617,7 @@ void UserAppTask(void *p_arg)
if (TstCriticalErrors()) if (TstCriticalErrors())
{ {
// âûêëþ÷èì ïðèåì äåíåã // âûêëþ÷èì ïðèåì äåíåã
if (was_critical_error == 0) {was_critical_error = 1;} if (was_critical_error == 0) {was_critical_error = 1;}
wash_State[number_post] = waitMoney;
break; break;
} }
@ -630,7 +633,6 @@ void UserAppTask(void *p_arg)
} }
if (GetMode() == MODE_WORK) OSTimeDly(1000); if (GetMode() == MODE_WORK) OSTimeDly(1000);
wash_State[number_post] = waitMoney;
} }
// çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ // çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ
@ -655,8 +657,6 @@ void UserAppTask(void *p_arg)
{ {
// âûêëþ÷èì ïðèåì äåíåã // âûêëþ÷èì ïðèåì äåíåã
if (was_critical_error == 0) {was_critical_error = 1;} if (was_critical_error == 0) {was_critical_error = 1;}
wash_State[number_post] = waitMoney;
break; break;
} }
@ -672,11 +672,7 @@ void UserAppTask(void *p_arg)
} }
if (GetMode() == MODE_WORK) OSTimeDly(1000); if (GetMode() == MODE_WORK) OSTimeDly(1000);
wash_State[number_post] = waitMoney;
} }
// ñáðîñèì òàéìàóò îæèäàíèÿ ïå÷àòè ÷åêà ïîñëå ñíÿòèÿ îøèáêè
time_out_print_check[number_post] = 0;
} }
break; break;

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_ #ifndef _VERSION_H_
#define _VERSION_H_ #define _VERSION_H_
#define DEVICE_FW_VERSION "02.03" #define DEVICE_FW_VERSION "02.04"
#endif // #ifndef _VERSION_H_ #endif // #ifndef _VERSION_H_

4
settings/sk-mlpc2368.wsdt
View File

@ -52,14 +52,14 @@
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1355</YPos><SelStart>54680</SelStart><SelEnd>54680</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>613</YPos><SelStart>14999</SelStart><SelEnd>15020</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>228</YPos><SelStart>7007</SelStart><SelEnd>7007</SelEnd></Tab><ActiveTab>2</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>6982</SelStart><SelEnd>6982</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>489</YPos><SelStart>15185</SelStart><SelEnd>15185</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>324</YPos><SelStart>9980</SelStart><SelEnd>9980</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>32</YPos><SelStart>4067</SelStart><SelEnd>4069</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>9</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>194</SelStart><SelEnd>194</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>88</YPos><SelStart>4701</SelStart><SelEnd>4711</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$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1355</YPos><SelStart>54680</SelStart><SelEnd>54680</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>613</YPos><SelStart>14999</SelStart><SelEnd>15020</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>6982</SelStart><SelEnd>6982</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>489</YPos><SelStart>15185</SelStart><SelEnd>15185</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>324</YPos><SelStart>9980</SelStart><SelEnd>9980</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>32</YPos><SelStart>4067</SelStart><SelEnd>4069</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>9</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>194</SelStart><SelEnd>194</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>88</YPos><SelStart>4701</SelStart><SelEnd>4711</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_q.c</Filename><XPos>0</XPos><YPos>571</YPos><SelStart>28865</SelStart><SelEnd>28865</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>656</YPos><SelStart>28847</SelStart><SelEnd>28847</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>646</YPos><SelStart>22221</SelStart><SelEnd>22221</SelEnd></Tab><ActiveTab>12</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions> <Positions>
<Top><Row0><Sizes><Toolbar-02fc2c00><key>iaridepm.enu1</key></Toolbar-02fc2c00></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>748</Bottom><Right>288</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>110</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>112130</sizeHorzCY><sizeVertCX>226563</sizeVertCX><sizeVertCY>764526</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>188</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>190</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>193680</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> <Top><Row0><Sizes><Toolbar-03af2c00><key>iaridepm.enu1</key></Toolbar-03af2c00></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>748</Bottom><Right>288</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>110</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>112130</sizeHorzCY><sizeVertCX>226563</sizeVertCX><sizeVertCY>764526</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>188</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>190</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>193680</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop> </Desktop>
</Workspace> </Workspace>

7503
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff

4
sk-mlpc2368.ewp
View File

@ -1512,7 +1512,7 @@
</option> </option>
<option> <option>
<name>OOCOutputFile</name> <name>OOCOutputFile</name>
<state>version2_03.hex</state> <state>version2_04.hex</state>
</option> </option>
<option> <option>
<name>OOCCommandLineProducer</name> <name>OOCCommandLineProducer</name>
@ -1566,7 +1566,7 @@
</option> </option>
<option> <option>
<name>IlinkOutputFile</name> <name>IlinkOutputFile</name>
<state>version2_03.out</state> <state>version2_04.out</state>
</option> </option>
<option> <option>
<name>IlinkDebugInfoEnable</name> <name>IlinkDebugInfoEnable</name>