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

убран таймаут печати, теперь он жесткий - 300 сек. Исправлены ошибки.

Browse Source
This commit is contained in:
dimoniche 2020-07-23 00:02:39 +03:00
parent 919c228daa
commit 03c107e597
8 changed files with 4895 additions and 4922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PROJECT/app/app_serv.c
View File

@ -234,31 +234,14 @@ void UserAppTask(void *p_arg)
// åñòü äåíüãè è íåò îøèáîê
if(wash_State[post] != washing)
{
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû, íî íå â ðåæèìå ìîéêè
GetData(&PrintTimeoutAfterDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if(print_timeout)
// àâàðèéíûé òàéì àóò îæèäàíèÿ íà÷àëà ìîéêè
if (tick > 300000UL)
{
// åñëè óêàçàí òàéìàóò îáíóëåíèÿ äåíåã - âìåñòî ïðÿìîãî îáíóëåíèÿ çàïóñêàåì ïå÷àòü ÷åêà, òàì âñå ñáðîñÿò ïîñëå ïå÷àòè
if (tick > 1000UL * print_timeout)
{
countSecWait[post] = 0;
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ñîáûòèå ïîñëàëè - ê ñëåäóþùåìó êàíàëó
continue;
}
}
else
{
// àâàðèéíûé òàéì àóò îæèäàíèÿ íà÷àëà ìîéêè
if (tick > 300000UL)
{
countSecWait[post] = 0;
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ñîáûòèå ïîñëàëè - ê ñëåäóþùåìó êàíàëó
continue;
}
countSecWait[post] = 0;
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
// ñîáûòèå ïîñëàëè - ê ñëåäóþùåìó êàíàëó
continue;
}
}
else
@ -268,7 +251,7 @@ void UserAppTask(void *p_arg)
if(print_timeout)
{
// åñëè óêàçàíà ñòîèìîñòü ìèíóòû - ïî èñ÷åðïàíèþ âðåìåíè ìîéêè ïðèíóäèòåëüíî çàïóñêàåì ïå÷àòü ÷åêà
if (tick > 1000UL * accmoney / print_timeout)
if (tick > ((60000UL * accmoney) / print_timeout))
{
countSecWait[post] = 0;
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + post);
@ -571,6 +554,8 @@ void UserAppTask(void *p_arg)
wash_State[number_post] = washing;
SaveEventRecord(number_post, JOURNAL_EVENT_WASHING, number_post);
}
money_timestamp[number_post] = OSTimeGet();
}
break;

25
PROJECT/data/datadesc.c
View File

@ -797,30 +797,6 @@ TDataDescStruct const PrintTimeoutDesc = {
5 // çíà÷åíèå ïî óìîë÷àíèþ
};
/*************************************
Таймаут отмены печати чека
*************************************/
TRangeValueULONG const PrintTimeoutAfterRange = {0, 60};
CPU_INT08U const PrintTimeoutAfterName[] = "Таймаут обнул.";
TDataDescStruct const PrintTimeoutAfterDesc = {
DATA_DESC_EDIT, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_NO_ARRAY, // признак массива
0, // размер массива
0, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.PrintTimeoutAfter), // указатель на переменную или адрес FRAM
(void*)&PrintTimeoutAfterRange, // указатель на границы параметра
NULL, // функция по изменению
0, // смещение между элементами в массиве
PrintTimeoutAfterName, // указатель на строку названия параметра
DATA_NO_INDEX, // признак индексного параметра (список строк)
NULL, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
0 // значение по умолчанию
};
/*************************************
Ñòîèìîñòü ìèíóòû ìîéêè äëÿ òàéì àóòà
*************************************/
@ -2772,7 +2748,6 @@ const TDataDescArrayStruct AllDataArray[] =
{&ServiceNameDesc, "ServiceNameDesc"},
{&PrintModeDesc, "PrintModeDesc"},
{&PrintTimeoutAfterDesc, "PrintTimeoutAfterDesc"},
{&DisableFiscalErrorsDesc, "DisableFiscalErrorsDesc"},
{&EnableSignalDesc, "EnableSignalDesc"},
{&SignalPulseDesc, "SignalPulseDesc"},

1
PROJECT/data/datadesc.h
View File

@ -165,7 +165,6 @@ extern TDataDescStruct const CoinPauseLenDesc;
extern void OnChangeCoinPulseLen();
extern TDataDescStruct const PrintModeDesc;
extern TDataDescStruct const PrintTimeoutAfterDesc;
extern TDataDescStruct const CashPerMinuteDesc;
extern TDataDescStruct const TaxFormatDesc;
extern TDataDescStruct const SubjSellDesc;

13
PROJECT/menu/menudesc.c
View File

@ -201,7 +201,7 @@ const TMenuLine line_WashStatMenu_1 = {
const TMenuLine line_WashStatMenu_2 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&AcceptedMoneyDesc1, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
(void*)&AcceptedBankMoneyDesc1, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
@ -698,13 +698,6 @@ const TMenuLine line_FrMenu_3 = {
NULL
};
const TMenuLine line_FrMenu_4 = {
MENU_LINE_SHOW_DESC,
0,
(void*)&PrintTimeoutAfterDesc,
NULL
};
const TMenuLine line_FrMenu_5 = {
MENU_LINE_SHOW_DESC,
0,
@ -761,8 +754,8 @@ const TMenuLine line_FrMenu_12 = {
NULL
};
const TMenuLineArray arr_FrMenuArray[] = {&line_FrMenu_0, &line_FrMenu_1, /*&line_FrMenu_2,*/ &line_FrMenu_3, &line_FrMenu_4, &line_FrMenu_5, &line_FrMenu_6, &line_FrMenu_7, &line_FrMenu_8, &line_FrMenu_9, &line_FrMenu_10, &line_FrMenu_11, &line_FrMenu_12, NULL};
const TMenuPanel FrMenuPanel[] = {arr_FrMenuArray, NULL, 12, MENU_PANEL_STANDARD};
const TMenuLineArray arr_FrMenuArray[] = {&line_FrMenu_0, &line_FrMenu_1, /*&line_FrMenu_2,*/ &line_FrMenu_3, &line_FrMenu_5, &line_FrMenu_6, &line_FrMenu_7, &line_FrMenu_8, &line_FrMenu_9, &line_FrMenu_10, &line_FrMenu_11, &line_FrMenu_12, NULL};
const TMenuPanel FrMenuPanel[] = {arr_FrMenuArray, NULL, 11, MENU_PANEL_STANDARD};
/***********************************
ÌÅÍÞ ÍÀÑÒÐÎÉÊÀ ÌÎÍÅÒÎÏÐÈÅÌÍÈÊÎÂ

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define DEVICE_FW_VERSION "02.07"
#define DEVICE_FW_VERSION "02.08"
#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>815</YPos><SelStart>36403</SelStart><SelEnd>36420</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>597</YPos><SelStart>26485</SelStart><SelEnd>26485</SelEnd></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>32</YPos><SelStart>1720</SelStart><SelEnd>1733</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>80</SelStart><SelEnd>80</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>71</YPos><SelStart>484</SelStart><SelEnd>484</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>4666</SelStart><SelEnd>4675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>250</YPos><SelStart>7200</SelStart><SelEnd>7200</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\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>158</SelStart><SelEnd>158</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></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>785</YPos><SelStart>35249</SelStart><SelEnd>35249</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>728</YPos><SelStart>29628</SelStart><SelEnd>29628</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>147</YPos><SelStart>5541</SelStart><SelEnd>5541</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\services\fr.c</Filename><XPos>0</XPos><YPos>71</YPos><SelStart>484</SelStart><SelEnd>484</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>4666</SelStart><SelEnd>4675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>234</YPos><SelStart>7140</SelStart><SelEnd>7140</SelEnd></Tab><ActiveTab>7</ActiveTab><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\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>158</SelStart><SelEnd>158</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></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-031b1d08><key>iaridepm.enu1</key></Toolbar-031b1d08></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>743</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>759429</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>193</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>195</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>198777</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-02894c70><key>iaridepm.enu1</key></Toolbar-02894c70></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>743</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>759429</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>193</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>195</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>198777</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

9733
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>
<name>OOCOutputFile</name>
<state>version2_07.hex</state>
<state>version2_08.hex</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
@ -1566,7 +1566,7 @@
</option>
<option>
<name>IlinkOutputFile</name>
<state>version2_07.out</state>
<state>version2_08.out</state>
</option>
<option>
<name>IlinkDebugInfoEnable</name>