все заработало

This commit is contained in:
dimoniche 2019-10-08 21:25:55 +03:00
parent 10ef8caec9
commit 780fad18c8
5 changed files with 4614 additions and 4586 deletions

View File

@ -29,7 +29,7 @@ CPU_INT32U money_timestamp[COUNT_POST + COUNT_VACUUM];
//CPU_INT32U ChannelsCounters[COUNT_POST + COUNT_VACUUM];
CPU_INT32U ChannelsPayedTime[COUNT_POST + COUNT_VACUUM];
#define USER_QUERY_LEN 64
#define USER_QUERY_LEN 128
OS_STK UserTaskStk[USER_TASK_STK_SIZE];
OS_EVENT *UserQuery = NULL;
@ -190,7 +190,7 @@ void UserAppTask(void *p_arg)
FiscalConnState = FISCAL_NOCONN;
}
// ïðîâåðèì ôèñêàëüíèê, åñëè îí îòâàëèëñÿ èëè îòêëþ÷àëñÿ
// ïðîâåðèì ôèñêàëüíèê, âñåãäà åãî ïðîâåðÿåì
if ((++fr_conn_ctr % 5) == 0)
{
if (ConnectFiscalFast() == 0)
@ -222,8 +222,9 @@ void UserAppTask(void *p_arg)
accmoney = GetAcceptedMoney(post);
accmoney += GetAcceptedBankMoney(post);
if (accmoney > 0)
if (accmoney > 0 && !was_critical_error)
{
// åñòü äåíüãè è íåò îøèáîê
if(wash_State[post] != washing)
{
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû, íî íå â ðåæèìå ìîéêè
@ -249,8 +250,10 @@ void UserAppTask(void *p_arg)
{
countSecWait[post]--;
// ïðèøëî âðåìÿ ïå÷àòè ÷åêà
if(!countSecWait[post]) PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ïðèøëî âðåìÿ ïå÷àòè ÷åêà, íî íå äîëæíî áûòü îøèáîê - ïå÷àòàåì ÷åê
if(!countSecWait[post] && !was_critical_error) PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ïðèøëî âðåìÿ ïå÷àòè ÷åêà - æäåì äåíüãè
else if(!countSecWait[post]) wash_State[post] = waitMoney;
}
}
@ -259,8 +262,8 @@ void UserAppTask(void *p_arg)
{
accmoney = GetAcceptedMoney(post);
if (accmoney > 0)
{
if (accmoney > 0 && !was_critical_error)
{ // åñòü äåíüãè è íåò îøèáîê
// äëÿ ìîíåòîïðèåìíèêîâ ïûëåñîñîâ - ïå÷àòü ÷åêà ïî òàéìàóòó
GetData(&CoinTimeOutDesc, &print_timeout, post, DATA_FLAG_DIRECT_INDEX);
@ -301,8 +304,14 @@ void UserAppTask(void *p_arg)
if (accmoney > 0)
{
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ïåðåçàïóñòèì òàéì àóòû - ÷òî áû ïî òàéì àóòó íå âîâðåìÿ íå ñáðîñèòü íàêîïëåííîå
money_timestamp[post] = OSTimeGet();
// ïîñëå ñáðîñà îøèáêè ÷åêè ïå÷àòàåì íå ñðàçó - à ÷åðåç òàéì àóò ïå÷àòè, âäðóã íå âñå èñïðàâèëîñü?
PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1 + post);
}
// çàîäíî íà âñÿêèé ñëó÷àé ñáðîñèì ñîîáùåíèå î ïå÷àòè ÷åêà
if(wash_State[post] == printCheck) wash_State[post] = waitMoney;
}
break;
@ -504,9 +513,9 @@ void UserAppTask(void *p_arg)
accmoney = GetAcceptedMoney(number_post);
accmoney += GetAcceptedBankMoney(number_post);
if ((accmoney > 0) && (wash_State[number_post] != printCheck))
if ((accmoney > 0) && (wash_State[number_post] != printCheck) && !was_critical_error)
{
// çàïóñòèì çàäåðæêó ïå÷àòè ÷åêà
// çàïóñòèì çàäåðæêó ïå÷àòè ÷åêà, åñëè íåò îøèáîê
GetData(&PrintTimeoutDesc, &count_delay, number_post, DATA_FLAG_DIRECT_INDEX);
countSecWait[number_post] = count_delay;
@ -515,6 +524,11 @@ void UserAppTask(void *p_arg)
wash_State[number_post] = printCheck;
}
else if (was_critical_error)
{
// åñëè åñòü îøèáêè - ïðîñòî ïðîäîëæàåì îæèäàòü ïðèåì äåíåã
wash_State[number_post] = waitMoney;
}
}
break;
@ -537,7 +551,7 @@ void UserAppTask(void *p_arg)
wash_State[number_post] = waitMoney;
break;
}
// çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ
accmoney = GetAcceptedMoney(number_post);
@ -626,7 +640,14 @@ void UserAppTask(void *p_arg)
case EVENT_KEY_F1:
// testMoney = 100;
// PostUserEvent(EVENT_COIN_INSERTED_POST1);
// PostUserEvent(EVENT_COIN_INSERTED_POST2);
// PostUserEvent(EVENT_COIN_INSERTED_POST3);
// PostUserEvent(EVENT_COIN_INSERTED_POST4);
// PostUserEvent(EVENT_COIN_INSERTED_POST5);
// PostUserEvent(EVENT_COIN_INSERTED_POST6);
// PostUserEvent(EVENT_COIN_INSERTED_VACUUM1);
// PostUserEvent(EVENT_COIN_INSERTED_VACUUM2);
/*FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
@ -649,11 +670,22 @@ void UserAppTask(void *p_arg)
FIO4CLR_bit.P4_28 = 1;*/
break;
case EVENT_KEY_F2:
testMoney = 0;
// PostUserEvent(EVENT_STOP_MONEY_POST1);
// PostUserEvent(EVENT_STOP_MONEY_POST2);
// PostUserEvent(EVENT_STOP_MONEY_POST3);
// PostUserEvent(EVENT_STOP_MONEY_POST4);
// PostUserEvent(EVENT_STOP_MONEY_POST5);
// PostUserEvent(EVENT_STOP_MONEY_POST6);
break;
case EVENT_KEY_F3:
//testMoney = 100;
// PostUserEvent(EVENT_CASH_PRINT_CHECK_POST2);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST2);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST3);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST4);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST5);
// PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST6);
break;
#endif
default:

File diff suppressed because one or more lines are too long

View File

@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
Checksum=367742248
Checksum=-1836948852
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0

View File

@ -24,7 +24,7 @@
<Windows>
<Wnd0>
<Wnd2>
<Tabs>
<Tab>
<Identity>TabID-23142-24246</Identity>
@ -34,7 +34,7 @@
</Tab>
<Tab><Identity>TabID-28963-15244</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-3677-8150</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<Tabs>
<Tab>
<Identity>TabID-1122-24249</Identity>
@ -46,20 +46,20 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd1></Windows>
<SelectedTab>0</SelectedTab></Wnd3></Windows>
<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>
<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>762</YPos><SelStart>34079</SelStart><SelEnd>34093</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>185</YPos><SelStart>6131</SelStart><SelEnd>6131</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>32</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>179</SelStart><SelEnd>179</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>23</YPos><SelStart>1204</SelStart><SelEnd>1231</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>114</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>211</YPos><SelStart>5979</SelStart><SelEnd>5979</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>637</YPos><SelStart>26818</SelStart><SelEnd>26818</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>45</YPos><SelStart>484</SelStart><SelEnd>484</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_q.c</Filename><XPos>0</XPos><YPos>368</YPos><SelStart>19317</SelStart><SelEnd>19317</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1361</YPos><SelStart>56947</SelStart><SelEnd>56947</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-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>
<Top><Row0><Sizes><Toolbar-02a83140><key>iaridepm.enu1</key></Toolbar-02a83140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>722</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>761304</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>184</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>186</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>195584</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112513</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

File diff suppressed because it is too large Load Diff