mirror of
https://github.com/dimoniche/solarium.git
synced 2026-01-29 17:33:32 +03:00
Исправление ошибок
This commit is contained in:
parent
d1914db459
commit
a2bd120f87
Binary file not shown.
5212
Flash/Exe/solarium_3_40.hex
Normal file
5212
Flash/Exe/solarium_3_40.hex
Normal file
File diff suppressed because it is too large
Load Diff
@ -561,12 +561,13 @@ void UserAppTask(void *p_arg)
|
||||
|
||||
if(accmoneyBank)
|
||||
{
|
||||
SaveEventRecord(RecentChannel, JOURNAL_EVENT_MONEY_COIN, accmoneyBank);
|
||||
|
||||
// íàïå÷àòàåì ÷åê - áàíê
|
||||
if (IsFiscalConnected())
|
||||
{
|
||||
if (PrintFiscalBill(accmoneyBank, (pricetime*accmoneyBank*60)/price, 1, price, pricetime) == 0)
|
||||
{
|
||||
SaveEventRecord(RecentChannel, JOURNAL_EVENT_MONEY_COIN, accmoneyBank);
|
||||
SaveEventRecord(RecentChannel, JOURNAL_EVENT_PRINT_BILL_ONLINE, GetTimeSec());
|
||||
}
|
||||
else
|
||||
|
||||
@ -470,7 +470,7 @@ const TMenuLine line_CommonCountersLongMenu_3 = {
|
||||
};
|
||||
|
||||
const TMenuLineArray arr_CommonCountersLongArray[] = {&line_CommonCountersLongMenu_0, &line_CommonCountersLongMenu_1, &line_CommonCountersLongMenu_2, &line_CommonCountersLongMenu_4, &line_CommonCountersLongMenu_3, NULL};
|
||||
const TMenuPanel CommonCountersLongPanel[] = {arr_CommonCountersLongArray, NULL, 4, MENU_PANEL_STANDARD};
|
||||
const TMenuPanel CommonCountersLongPanel[] = {arr_CommonCountersLongArray, NULL, 5, MENU_PANEL_STANDARD};
|
||||
|
||||
/***********************************
|
||||
ÌÅÍÞ ÍÀÑÒÐÎÉÊÈ
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _VERSION_H_
|
||||
#define _VERSION_H_
|
||||
|
||||
#define DEVICE_FW_VERSION "03.39"
|
||||
#define DEVICE_FW_VERSION "03.40"
|
||||
|
||||
|
||||
#endif // #ifndef _VERSION_H_
|
||||
File diff suppressed because one or more lines are too long
1257
solarium.dep
1257
solarium.dep
File diff suppressed because it is too large
Load Diff
@ -650,7 +650,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>solarium_3_39.hex</state>
|
||||
<state>solarium_3_40.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
@ -668,7 +668,7 @@
|
||||
<data>
|
||||
<extensions></extensions>
|
||||
<cmdline></cmdline>
|
||||
<hasPrio>1</hasPrio>
|
||||
<hasPrio>240</hasPrio>
|
||||
<buildSequence>inputOutputBased</buildSequence>
|
||||
</data>
|
||||
</settings>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user