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

Добавлен таймаут старта начала мойки

Browse Source
This commit is contained in:
Dmitriy 2021-09-22 20:37:45 +03:00
parent 8118d9ef1d
commit c304a1aec3
6 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PROJECT/app/app_serv.c
View File

@ -230,10 +230,20 @@ void UserAppTask(void *p_arg)
if (accmoney > 0 && !was_critical_error)
{
CPU_INT32U tick = labs(OSTimeGet() - money_timestamp[post]);
// åñòü äåíüãè è íåò îøèáîê
if(wash_State[post] != washing)
{
{
// åñëè çàäàí òàéì àóò íà÷àëà ìîéêè è îí ïðîøåë - çàïóñêàåì ìîéêó - òîëüêî äëÿ ïîñòîâ ìîéêè
GetData(&SignalTimeOutDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if((print_timeout > 0) && (tick > print_timeout * 1000L) && (post < COUNT_POST))
{
PostUserEvent(EVENT_STOP_MONEY_POST1 + post); // íà÷èíàåì ìîéêó
// ñîáûòèå ïîñëàëè - ê ñëåäóþùåìó êàíàëó
continue;
}
// àâàðèéíûé òàéì àóò îæèäàíèÿ íà÷àëà ìîéêè
if (tick > 300000UL)
{

25
PROJECT/data/datadesc.c
View File

@ -541,6 +541,30 @@ TDataDescStruct const SignalPulseDesc = {
1 // çíà÷åíèå ïî óìîë÷àíèþ
};
/*************************************
Таймаут сигнала начала мойки
*************************************/
TRangeValueULONG const SignalTimeOutRange = {1, 300};
CPU_INT08U const SignalTimeOutName[] = "Таймаут,сек.";
TDataDescStruct const SignalTimeOutDesc = {
DATA_DESC_EDIT, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_NO_ARRAY, // признак массива
0, // размер массива
0, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, signal_print_timeout_len), // указатель на переменную или адрес FRAM
(void*)&SignalTimeOutRange, // указатель на границы параметра
NULL, // функция по изменению
0, // смещение между элементами в массиве
SignalTimeOutName, // указатель на строку названия параметра
DATA_NO_INDEX, // признак индексного параметра (список строк)
NULL, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
0 // значение по умолчанию
};
/*************************************
Èíäåêñ ïðè íàñòðîéêå ìîíåòîïðèåìíèêîâ
*************************************/
@ -2751,6 +2775,7 @@ const TDataDescArrayStruct AllDataArray[] =
{&DisableFiscalErrorsDesc, "DisableFiscalErrorsDesc"},
{&EnableSignalDesc, "EnableSignalDesc"},
{&SignalPulseDesc, "SignalPulseDesc"},
{&SignalTimeOutDesc, "SignalTimeOutDesc"},
{&CashPerMinuteDesc, "CashPerMinuteDesc"},
{&CashLevelDesc, "CashLevelDesc"},

1
PROJECT/data/datadesc.h
View File

@ -180,6 +180,7 @@ extern CPU_INT32U CoinIndex;
extern TDataDescStruct const SignalIndexDesc;
extern TDataDescStruct const EnableSignalDesc;
extern TDataDescStruct const SignalPulseDesc;
extern TDataDescStruct const SignalTimeOutDesc;
extern TDataDescStruct const CashLevelDesc;
extern TDataDescStruct const CoinLevelDesc;

3
PROJECT/data/fram_map.h
View File

@ -52,6 +52,9 @@ typedef struct
TCountersLong CountersLong;
CPU_INT32U StartButtonName;
// таймаут начала мойки без внешнего сигнала - общий на все каналы
CPU_INT32U signal_print_timeout_len;
#endif
CPU_INT08U mac_addr[6];

11
PROJECT/menu/menudesc.c
View File

@ -627,6 +627,13 @@ const TMenuLine line_SignalMenu_1 = {
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_SignalMenu_6 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&SignalTimeOutDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_SignalMenu_2 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
@ -660,8 +667,8 @@ void OnEnterSignalMenu(void)
CoinIndex = 0;
}
const TMenuLineArray arr_SignalMenuArray[] = {&line_SignalMenu_0, &line_SignalMenu_1, &line_SignalMenu_2, &line_SignalMenu_3, &line_SignalMenu_4, &line_SignalMenu_5, NULL};
const TMenuPanel SignalSetupPanel[] = {arr_SignalMenuArray, OnEnterSignalMenu, 6, MENU_PANEL_STANDARD};
const TMenuLineArray arr_SignalMenuArray[] = {&line_SignalMenu_0, &line_SignalMenu_1, &line_SignalMenu_6, &line_SignalMenu_2, &line_SignalMenu_3, &line_SignalMenu_4, &line_SignalMenu_5, NULL};
const TMenuPanel SignalSetupPanel[] = {arr_SignalMenuArray, OnEnterSignalMenu, 7, MENU_PANEL_STANDARD};
/***********************************

4
settings/sk-mlpc2368.wsdt
View File

@ -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></Wnd2><Wnd3>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<Tabs>
<Tab>
<Identity>TabID-1122-24249</Identity>
@ -52,7 +52,7 @@
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>103</YPos><SelStart>3722</SelStart><SelEnd>3884</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.h</Filename><XPos>0</XPos><YPos>63</YPos><SelStart>4023</SelStart><SelEnd>4023</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>286</SelStart><SelEnd>382</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>604</YPos><SelStart>23128</SelStart><SelEnd>23128</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>449</SelStart><SelEnd>449</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>688</SelStart><SelEnd>702</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>792</YPos><SelStart>19145</SelStart><SelEnd>19145</SelEnd></Tab><ActiveTab>7</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>238</SelStart><SelEnd>238</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>540</SelStart><SelEnd>540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>279</YPos><SelStart>5945</SelStart><SelEnd>5945</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>155</SelStart><SelEnd>155</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>30</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>936</YPos><SelStart>25210</SelStart><SelEnd>25210</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2545</SelStart><SelEnd>2545</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>459</YPos><SelStart>13186</SelStart><SelEnd>13188</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>206</YPos><SelStart>6049</SelStart><SelEnd>6049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>2116</SelStart><SelEnd>2116</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1353</YPos><SelStart>55754</SelStart><SelEnd>55754</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>927</SelStart><SelEnd>927</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2161</YPos><SelStart>96286</SelStart><SelEnd>96286</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\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.h</Filename><XPos>0</XPos><YPos>63</YPos><SelStart>4023</SelStart><SelEnd>4023</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>449</SelStart><SelEnd>449</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>76</YPos><SelStart>2101</SelStart><SelEnd>2101</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>792</YPos><SelStart>19145</SelStart><SelEnd>19145</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>238</SelStart><SelEnd>238</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>540</SelStart><SelEnd>540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>54</YPos><SelStart>2371</SelStart><SelEnd>2371</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>155</SelStart><SelEnd>155</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>30</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>936</YPos><SelStart>25210</SelStart><SelEnd>25210</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2545</SelStart><SelEnd>2545</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>459</YPos><SelStart>13186</SelStart><SelEnd>13188</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>206</YPos><SelStart>6049</SelStart><SelEnd>6049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>2116</SelStart><SelEnd>2116</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>613</YPos><SelStart>26607</SelStart><SelEnd>26607</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>927</SelStart><SelEnd>927</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>659</YPos><SelStart>29363</SelStart><SelEnd>29363</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>160</YPos><SelStart>6110</SelStart><SelEnd>6110</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1272</SelStart><SelEnd>1272</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>230</YPos><SelStart>6810</SelStart><SelEnd>6810</SelEnd></Tab><ActiveTab>20</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>