dimoniche/solarium
1
0
Fork 0
mirror of https://github.com/dimoniche/solarium.git synced 2026-01-30 01:43:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправление ошибок

Browse Source
This commit is contained in:
Dmitriy 2023-01-25 22:01:25 +03:00
parent d1914db459
commit a2bd120f87
8 changed files with 5857 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Flash/Exe/solarium.out
View File

Binary file not shown.

5212
Flash/Exe/solarium_3_40.hex Normal file
View File

File diff suppressed because it is too large Load Diff

3
PROJECT/app/app_serv.c
View File

@ -561,12 +561,13 @@ void UserAppTask(void *p_arg)
if(accmoneyBank) if(accmoneyBank)
{ {
SaveEventRecord(RecentChannel, JOURNAL_EVENT_MONEY_COIN, accmoneyBank);
// íàïå÷àòàåì ÷åê - áàíê // íàïå÷àòàåì ÷åê - áàíê
if (IsFiscalConnected()) if (IsFiscalConnected())
{ {
if (PrintFiscalBill(accmoneyBank, (pricetime*accmoneyBank*60)/price, 1, price, pricetime) == 0) 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()); SaveEventRecord(RecentChannel, JOURNAL_EVENT_PRINT_BILL_ONLINE, GetTimeSec());
} }
else else

2
PROJECT/menu/menudesc.c
View File

@ -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 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};
/*********************************** /***********************************
ÌÅÍÞ ÍÀÑÒÐÎÉÊÈ ÌÅÍÞ ÍÀÑÒÐÎÉÊÈ

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_ #ifndef _VERSION_H_
#define _VERSION_H_ #define _VERSION_H_
#define DEVICE_FW_VERSION "03.39" #define DEVICE_FW_VERSION "03.40"
#endif // #ifndef _VERSION_H_ #endif // #ifndef _VERSION_H_

26
settings/solarium.wsdt
View File

File diff suppressed because one or more lines are too long

1257
solarium.dep
View File

File diff suppressed because it is too large Load Diff

4
solarium.ewp
View File

@ -650,7 +650,7 @@
</option> </option>
<option> <option>
<name>OOCOutputFile</name> <name>OOCOutputFile</name>
<state>solarium_3_39.hex</state> <state>solarium_3_40.hex</state>
</option> </option>
<option> <option>
<name>OOCCommandLineProducer</name> <name>OOCCommandLineProducer</name>
@ -668,7 +668,7 @@
<data> <data>
<extensions></extensions> <extensions></extensions>
<cmdline></cmdline> <cmdline></cmdline>
<hasPrio>1</hasPrio> <hasPrio>240</hasPrio>
<buildSequence>inputOutputBased</buildSequence> <buildSequence>inputOutputBased</buildSequence>
</data> </data>
</settings> </settings>