mirror of
https://github.com/dimoniche/Moyka.git
synced 2026-01-30 01:43:30 +03:00
ошибки
This commit is contained in:
parent
5ba4a5f6b9
commit
a88e674556
@ -106,6 +106,7 @@ CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
|
||||
CPU_INT32U cash_enable[COUNT_POST];
|
||||
CPU_INT32U bank_enable[COUNT_POST];
|
||||
CPU_INT32U enable_signal[COUNT_POST];
|
||||
CPU_INT32U fiscal_enable;
|
||||
|
||||
void DrawMenu(void)
|
||||
{
|
||||
@ -144,7 +145,6 @@ void DrawMenu(void)
|
||||
void UserAppTask(void *p_arg)
|
||||
{
|
||||
CPU_INT32U print_timeout;
|
||||
CPU_INT32U accmoney;
|
||||
int event;
|
||||
|
||||
#ifdef BOARD_CENTRAL_CFG
|
||||
@ -180,12 +180,21 @@ void UserAppTask(void *p_arg)
|
||||
}
|
||||
break;
|
||||
case EVENT_SEC:
|
||||
{
|
||||
CPU_INT32U accmoney = 0;
|
||||
|
||||
// ðàáî÷èé ñåðâåð - ñ÷åò÷èêè, ñîñòîÿíèÿ è ò.ï.
|
||||
WorkServer();
|
||||
|
||||
// ïðîâåðèì ôèñêàëüíèê, åñëè îí îòâàëèëñÿ
|
||||
if ((++fr_conn_ctr % 10) == 0)
|
||||
GetData(&EnableFiscalDesc, &fiscal_enable, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
|
||||
if(!fiscal_enable)
|
||||
{
|
||||
FiscalConnState = FISCAL_NOCONN;
|
||||
}
|
||||
|
||||
// ïðîâåðèì ôèñêàëüíèê, åñëè îí îòâàëèëñÿ èëè îòêëþ÷àëñÿ
|
||||
if ((++fr_conn_ctr % 5) == 0)
|
||||
{
|
||||
if ((FiscalConnState == FISCAL_NOCONN) || (TstCriticalFiscalError()))
|
||||
{
|
||||
@ -297,8 +306,8 @@ void UserAppTask(void *p_arg)
|
||||
was_critical_error = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case EVENT_MODE_CHANGE:
|
||||
ReInitMenu();
|
||||
@ -315,7 +324,7 @@ void UserAppTask(void *p_arg)
|
||||
case EVENT_COIN_INSERTED_VACUUM2:
|
||||
{
|
||||
CPU_INT32U cpp = 1;
|
||||
CPU_INT32U money, accmoney;
|
||||
CPU_INT32U money, accmoney = 0;
|
||||
int number_post = event - EVENT_COIN_INSERTED_POST1;
|
||||
|
||||
GetData(&CoinPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
|
||||
@ -342,7 +351,7 @@ void UserAppTask(void *p_arg)
|
||||
case EVENT_CASH_INSERTED_POST6:
|
||||
{
|
||||
CPU_INT32U cpp = 1;
|
||||
CPU_INT32U money, accmoney;
|
||||
CPU_INT32U money, accmoney = 0;
|
||||
int number_post = event - EVENT_CASH_INSERTED_POST1;
|
||||
|
||||
GetData(&CashPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
|
||||
@ -368,7 +377,7 @@ void UserAppTask(void *p_arg)
|
||||
case EVENT_BANK_INSERTED_POST6:
|
||||
{
|
||||
CPU_INT32U cpp = 1;
|
||||
CPU_INT32U money, accmoney;
|
||||
CPU_INT32U money, accmoney = 0;
|
||||
int number_post = event - EVENT_BANK_INSERTED_POST1;
|
||||
|
||||
GetData(&BankPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
|
||||
@ -455,11 +464,12 @@ void UserAppTask(void *p_arg)
|
||||
if (GetMode() == MODE_WORK) //
|
||||
{
|
||||
int number_post = event - EVENT_STOP_MONEY_POST1;
|
||||
CPU_INT32U accmoney = 0;
|
||||
|
||||
accmoney = GetAcceptedMoney(number_post);
|
||||
accmoney += GetAcceptedBankMoney(number_post);
|
||||
|
||||
if (accmoney > 0)
|
||||
if ((accmoney > 0) && (wash_State[number_post] != washing) && (wash_State[number_post] != printCheck))
|
||||
{
|
||||
wash_State[number_post] = washing;
|
||||
SaveEventRecord(number_post, JOURNAL_EVENT_WASHING, number_post);
|
||||
@ -477,6 +487,7 @@ void UserAppTask(void *p_arg)
|
||||
{
|
||||
int number_post = event - EVENT_WAIT_CASH_PRINT_CHECK_POST1;
|
||||
int count_delay = 0;
|
||||
CPU_INT32U accmoney = 0;
|
||||
|
||||
accmoney = GetAcceptedMoney(number_post);
|
||||
accmoney += GetAcceptedBankMoney(number_post);
|
||||
@ -509,6 +520,7 @@ void UserAppTask(void *p_arg)
|
||||
if (GetMode() == MODE_WORK) // ïå÷àòàåì òîëüêî â ðàáî÷åì ðåæèìå
|
||||
{
|
||||
int number_post = event - EVENT_CASH_PRINT_CHECK_POST1;
|
||||
CPU_INT32U accmoney = 0;
|
||||
|
||||
// çäåñü ñîáûòèå ñòàðòà ïå÷àòè ÷åêà - âêëþ÷èëè íàñîñ èëè ïûëåñîñ
|
||||
accmoney = GetAcceptedMoney(number_post);
|
||||
@ -578,7 +590,7 @@ void UserAppTask(void *p_arg)
|
||||
|
||||
case EVENT_KEY_F1:
|
||||
//testMoney = 100;
|
||||
//PostUserEvent(EVENT_BANK_INSERTED_POST4);
|
||||
//PostUserEvent(EVENT_BANK_INSERTED_POST2);
|
||||
|
||||
/*FIO4SET_bit.P4_28 = 1;
|
||||
OSTimeDly(50);
|
||||
@ -601,11 +613,11 @@ void UserAppTask(void *p_arg)
|
||||
FIO4CLR_bit.P4_28 = 1;*/
|
||||
break;
|
||||
case EVENT_KEY_F2:
|
||||
//PostUserEvent(EVENT_STOP_MONEY_POST4);
|
||||
//PostUserEvent(EVENT_STOP_MONEY_POST2);
|
||||
break;
|
||||
case EVENT_KEY_F3:
|
||||
//testMoney = 100;
|
||||
//PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST4);
|
||||
//PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST2);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
|
||||
@ -524,7 +524,7 @@ CPU_INT32U input_register()
|
||||
{
|
||||
SETBIT(input, 24);
|
||||
}
|
||||
if (FIO0PIN_bit.P0_10)
|
||||
if (FIO0PIN_bit.P0_1)
|
||||
{
|
||||
SETBIT(input, 25);
|
||||
}
|
||||
@ -1057,7 +1057,7 @@ void InputCapture_ISR(void)
|
||||
// áàíê 6
|
||||
if(TSTBIT(input_event, 25))
|
||||
{
|
||||
if ((!FIO0PIN_bit.P0_10 && bankLevel[5]) || (FIO0PIN_bit.P0_10 && !bankLevel[5]))
|
||||
if ((!FIO0PIN_bit.P0_1 && bankLevel[5]) || (FIO0PIN_bit.P0_1 && !bankLevel[5]))
|
||||
{ // ïðèøåë çàäíèé ôðîíò
|
||||
CPU_INT32U cr=T3CR;
|
||||
cr -= period_bank[5];
|
||||
@ -1257,11 +1257,11 @@ void InitInputPorts()
|
||||
FIO0MASK_bit.P0_6 = 0;
|
||||
|
||||
// áàíê 6
|
||||
PINSEL0_bit.P0_10 = 0;
|
||||
if(bankLevel[5])PINMODE0_bit.P0_10 = 3;
|
||||
else PINMODE0_bit.P0_10 = 0;
|
||||
FIO0DIR_bit.P0_10 = 0;
|
||||
FIO0MASK_bit.P0_10 = 0;
|
||||
PINSEL0_bit.P0_1 = 0;
|
||||
if(bankLevel[5])PINMODE0_bit.P0_1 = 3;
|
||||
else PINMODE0_bit.P0_1 = 0;
|
||||
FIO0DIR_bit.P0_1 = 0;
|
||||
FIO0MASK_bit.P0_1 = 0;
|
||||
}
|
||||
|
||||
// èíèöèàëèçàöèÿ èìïóëüñíûõ âõîäîâ
|
||||
|
||||
@ -14,7 +14,7 @@ Count=0
|
||||
Enabled=0
|
||||
ShowSource=1
|
||||
[DebugChecksum]
|
||||
Checksum=-1582667056
|
||||
Checksum=-853996095
|
||||
[Exceptions]
|
||||
StopOnUncaught=_ 0
|
||||
StopOnThrow=_ 0
|
||||
|
||||
@ -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>1</SelectedTab></Wnd0><Wnd1>
|
||||
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
|
||||
<Tabs>
|
||||
<Tab>
|
||||
<Identity>TabID-1122-24249</Identity>
|
||||
@ -52,7 +52,7 @@
|
||||
|
||||
|
||||
|
||||
<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\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2091</SelStart><SelEnd>2091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>3764</SelStart><SelEnd>3785</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>399</SelStart><SelEnd>417</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\menu\menudesc.c</Filename><XPos>0</XPos><YPos>725</YPos><SelStart>28758</SelStart><SelEnd>28758</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>470</YPos><SelStart>9017</SelStart><SelEnd>9017</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>872</YPos><SelStart>23135</SelStart><SelEnd>23135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>318</YPos><SelStart>10362</SelStart><SelEnd>10362</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$\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>571</YPos><SelStart>25718</SelStart><SelEnd>25732</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>1268</YPos><SelStart>30713</SelStart><SelEnd>30713</SelEnd></Tab><ActiveTab>22</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.c</Filename><XPos>0</XPos><YPos>24</YPos><SelStart>463</SelStart><SelEnd>463</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>109</YPos><SelStart>3102</SelStart><SelEnd>3102</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\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2091</SelStart><SelEnd>2091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>3764</SelStart><SelEnd>3785</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>503</SelStart><SelEnd>526</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\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1151</YPos><SelStart>46280</SelStart><SelEnd>46280</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>369</YPos><SelStart>11593</SelStart><SelEnd>11593</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>390</YPos><SelStart>12067</SelStart><SelEnd>12067</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$\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>2214</YPos><SelStart>99560</SelStart><SelEnd>99560</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>962</YPos><SelStart>23411</SelStart><SelEnd>23416</SelEnd></Tab><ActiveTab>22</ActiveTab><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>109</YPos><SelStart>3102</SelStart><SelEnd>3102</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Positions>
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user