mirror of
https://github.com/dimoniche/Moyka.git
synced 2026-01-29 17:33:33 +03:00
обработал отсутствие бумаги
This commit is contained in:
parent
01acb6a6b0
commit
10ef8caec9
@ -193,13 +193,10 @@ void UserAppTask(void *p_arg)
|
||||
// ïðîâåðèì ôèñêàëüíèê, åñëè îí îòâàëèëñÿ èëè îòêëþ÷àëñÿ
|
||||
if ((++fr_conn_ctr % 5) == 0)
|
||||
{
|
||||
if ((FiscalConnState == FISCAL_NOCONN) || (TstCriticalFiscalError()))
|
||||
{
|
||||
if (ConnectFiscalFast() == 0)
|
||||
{
|
||||
CheckFiscalStatus();
|
||||
}
|
||||
}
|
||||
if (ConnectFiscalFast() == 0)
|
||||
{
|
||||
CheckFiscalStatus();
|
||||
}
|
||||
}
|
||||
|
||||
// ñåðâåð îøèáîê
|
||||
@ -257,6 +254,7 @@ void UserAppTask(void *p_arg)
|
||||
}
|
||||
}
|
||||
|
||||
// ìîíåòîïðèåìíèêè äëÿ ïûëåñîñîâ áåç ñèãíàëà îêîí÷àíèÿ ïðèåìà äåíåã - òîëüêî ïî òàéì àóòó
|
||||
for(int post = COUNT_POST; post < COUNT_POST + COUNT_VACUUM; post++)
|
||||
{
|
||||
accmoney = GetAcceptedMoney(post);
|
||||
@ -282,7 +280,7 @@ void UserAppTask(void *p_arg)
|
||||
UserPrintErrorMenu();
|
||||
RefreshMenu();
|
||||
|
||||
// âûêëþ÷èì ïðèåì äåíåã
|
||||
// âûêëþ÷èì ïðèåì äåíåã, äåíüãè ïðèíèìàþòñÿ - íî ÷åêè íå ïå÷àòàåì - êîïèì
|
||||
if (was_critical_error == 0)
|
||||
{
|
||||
was_critical_error = 1;
|
||||
@ -294,6 +292,19 @@ void UserAppTask(void *p_arg)
|
||||
if (was_critical_error)
|
||||
{
|
||||
was_critical_error = 0;
|
||||
|
||||
// îøèáêè êîí÷èëèñü - íàïå÷àòàåì ÷åê ñ ñóììîé, êîòîðàÿ íàêîïèëàñü çà âðåìÿ îòñóòñâèÿ áóìàãè,
|
||||
// åñëè êîíå÷íî íàäî
|
||||
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
|
||||
{
|
||||
accmoney = GetAcceptedMoney(post);
|
||||
|
||||
if (accmoney > 0)
|
||||
{
|
||||
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -516,13 +527,17 @@ void UserAppTask(void *p_arg)
|
||||
case EVENT_CASH_PRINT_CHECK_VACUUM1:
|
||||
case EVENT_CASH_PRINT_CHECK_VACUUM2:
|
||||
|
||||
if (was_critical_error) break;
|
||||
|
||||
//if (GetMode() == MODE_WORK) // ïðèåì äåíåã èäåò âñåãäà
|
||||
{
|
||||
int number_post = event - EVENT_CASH_PRINT_CHECK_POST1;
|
||||
CPU_INT32U accmoney = 0;
|
||||
|
||||
|
||||
if (was_critical_error)
|
||||
{
|
||||
wash_State[number_post] = waitMoney;
|
||||
break;
|
||||
}
|
||||
|
||||
// çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ
|
||||
accmoney = GetAcceptedMoney(number_post);
|
||||
|
||||
@ -540,6 +555,16 @@ void UserAppTask(void *p_arg)
|
||||
}
|
||||
}
|
||||
|
||||
// åñëè åñòü îøèáêè, íå ðàáîòàåì - ïîëó÷åííûå äåíüãè íå îáíóëÿåì
|
||||
if (TstCriticalErrors())
|
||||
{
|
||||
// âûêëþ÷èì ïðèåì äåíåã
|
||||
if (was_critical_error == 0) {was_critical_error = 1;}
|
||||
wash_State[number_post] = waitMoney;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
IncCounter(number_post, ChannelsPayedTime[number_post], accmoney);
|
||||
SetAcceptedMoney(0, number_post);
|
||||
if (GetMode() == MODE_WORK) OSTimeDly(1000);
|
||||
@ -572,6 +597,16 @@ void UserAppTask(void *p_arg)
|
||||
}
|
||||
}
|
||||
|
||||
// åñëè åñòü îøèáêè, íå ðàáîòàåì - ïîëó÷åííûå äåíüãè íå îáíóëÿåì
|
||||
if (TstCriticalErrors())
|
||||
{
|
||||
// âûêëþ÷èì ïðèåì äåíåã
|
||||
if (was_critical_error == 0) {was_critical_error = 1;}
|
||||
wash_State[number_post] = waitMoney;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
IncCounter(number_post, ChannelsPayedTime[number_post], accmoney);
|
||||
SetAcceptedBankMoney(0, number_post);
|
||||
if (GetMode() == MODE_WORK) OSTimeDly(1000);
|
||||
@ -590,8 +625,8 @@ void UserAppTask(void *p_arg)
|
||||
break;
|
||||
|
||||
case EVENT_KEY_F1:
|
||||
//testMoney = 100;
|
||||
//PostUserEvent(EVENT_COIN_INSERTED_POST2);
|
||||
// testMoney = 100;
|
||||
// PostUserEvent(EVENT_COIN_INSERTED_POST2);
|
||||
|
||||
/*FIO4SET_bit.P4_28 = 1;
|
||||
OSTimeDly(50);
|
||||
@ -614,11 +649,11 @@ void UserAppTask(void *p_arg)
|
||||
FIO4CLR_bit.P4_28 = 1;*/
|
||||
break;
|
||||
case EVENT_KEY_F2:
|
||||
//PostUserEvent(EVENT_STOP_MONEY_POST2);
|
||||
// PostUserEvent(EVENT_STOP_MONEY_POST2);
|
||||
break;
|
||||
case EVENT_KEY_F3:
|
||||
//testMoney = 100;
|
||||
//PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST2);
|
||||
// PostUserEvent(EVENT_CASH_PRINT_CHECK_POST2);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
|
||||
@ -14,7 +14,7 @@ Count=0
|
||||
Enabled=0
|
||||
ShowSource=1
|
||||
[DebugChecksum]
|
||||
Checksum=420203469
|
||||
Checksum=367742248
|
||||
[Exceptions]
|
||||
StopOnUncaught=_ 0
|
||||
StopOnThrow=_ 0
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
|
||||
<Column0>157</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
<Column0>160</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
</Workspace>
|
||||
<Find-in-Files><ColumnWidth0>440</ColumnWidth0><ColumnWidth1>62</ColumnWidth1><ColumnWidth2>754</ColumnWidth2></Find-in-Files><TerminalIO/><Debug-Log><ColumnWidth0>22</ColumnWidth0><ColumnWidth1>1219</ColumnWidth1></Debug-Log></Static>
|
||||
<Windows>
|
||||
@ -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$\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\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\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$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>695</YPos><SelStart>18058</SelStart><SelEnd>18058</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>786</YPos><SelStart>21534</SelStart><SelEnd>21534</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\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>663</YPos><SelStart>21796</SelStart><SelEnd>21796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1742</YPos><SelStart>77566</SelStart><SelEnd>77566</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>7972</SelStart><SelEnd>7972</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>429</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>467</YPos><SelStart>14544</SelStart><SelEnd>14544</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>239</SelStart><SelEnd>239</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>25</YPos><SelStart>1059</SelStart><SelEnd>1084</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>70</SelStart><SelEnd>70</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>129</YPos><SelStart>4906</SelStart><SelEnd>4906</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\app\app_serv.c</Filename><XPos>0</XPos><YPos>551</YPos><SelStart>21610</SelStart><SelEnd>21610</SelEnd></Tab><ActiveTab>21</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fram\fram.c</Filename><XPos>0</XPos><YPos>96</YPos><SelStart>2256</SelStart><SelEnd>2256</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1441</YPos><SelStart>57674</SelStart><SelEnd>57674</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></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$\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\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</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$\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\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>663</YPos><SelStart>21796</SelStart><SelEnd>21796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1742</YPos><SelStart>77566</SelStart><SelEnd>77566</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>7972</SelStart><SelEnd>7972</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>429</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>978</SelStart><SelEnd>978</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>239</SelStart><SelEnd>239</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2031</SelStart><SelEnd>2059</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>70</SelStart><SelEnd>70</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>129</YPos><SelStart>4906</SelStart><SelEnd>4906</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\app\app_serv.c</Filename><XPos>0</XPos><YPos>619</YPos><SelStart>23083</SelStart><SelEnd>23083</SelEnd></Tab><ActiveTab>18</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fram\fram.c</Filename><XPos>0</XPos><YPos>96</YPos><SelStart>2256</SelStart><SelEnd>2256</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1441</YPos><SelStart>57674</SelStart><SelEnd>57674</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\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>271</YPos><SelStart>13623</SelStart><SelEnd>13623</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>910</YPos><SelStart>24201</SelStart><SelEnd>24201</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>629</YPos><SelStart>16946</SelStart><SelEnd>16946</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><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>710</Bottom><Right>248</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>748686</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>198</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>208202</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-02fb3140><key>iaridepm.enu1</key></Toolbar-02fb3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>774</Bottom><Right>251</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>107</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>112513</sizeHorzCY><sizeVertCX>197656</sizeVertCX><sizeVertCY>815983</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>132</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>134</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>140904</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112513</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
7908
sk-mlpc2368.dep
7908
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user