diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c
index c0f9a20..175175b 100644
--- a/PROJECT/app/app_serv.c
+++ b/PROJECT/app/app_serv.c
@@ -523,7 +523,7 @@ void UserAppTask(void *p_arg)
{
if (PrintFiscalBill(accmoney, number_post, 0) == 0) // здесь добавить с какого поста чек
{
- SaveEventRecord(number_post, JOURNAL_EVENT_PRINT_BILL_POST1 + number_post, GetTimeSec());
+ SaveEventRecord(number_post, JOURNAL_EVENT_PRINT_BILL_POST1 + number_post, accmoney);
}
}
@@ -555,7 +555,7 @@ void UserAppTask(void *p_arg)
{
if (PrintFiscalBill(accmoney,number_post, 1) == 0) // здесь добавить с какого поста чек
{
- SaveEventRecord(number_post, JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1 + number_post, GetTimeSec());
+ SaveEventRecord(number_post, JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1 + number_post, accmoney);
}
}
diff --git a/PROJECT/app/journal.c b/PROJECT/app/journal.c
index 164d02a..4779112 100644
--- a/PROJECT/app/journal.c
+++ b/PROJECT/app/journal.c
@@ -411,11 +411,11 @@ void PrintEventJournalRecordEng(char* str, TEventRecord *record)
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_VACUUM2))
{
- sprintf(&str[strlen(str)], " ");
+ sprintf(&str[strlen(str)], "%d rub.", record->data);
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1))
{
- sprintf(&str[strlen(str)], " ");
+ sprintf(&str[strlen(str)], "%d rub.", record->data);
}
else if (record->event == JOURNAL_EVENT_PRINT_Z)
{
diff --git a/PROJECT/app/journal.h b/PROJECT/app/journal.h
index a129e0f..3d1d654 100644
--- a/PROJECT/app/journal.h
+++ b/PROJECT/app/journal.h
@@ -3,7 +3,7 @@
#include "fiscal.h"
-#define EVENT_RECORDS_COUNT 384 // число записей в журнале
+#define EVENT_RECORDS_COUNT 512 // число записей в журнале
#pragma pack(push, 1)
/// структура записи журнала рабочих событий
diff --git a/PROJECT/data/datadesc.h b/PROJECT/data/datadesc.h
index 5aa77ce..46bb590 100644
--- a/PROJECT/data/datadesc.h
+++ b/PROJECT/data/datadesc.h
@@ -99,6 +99,7 @@ extern const TDataDescArrayStruct AllDataArray[];
extern CPU_INT32U ErrorJournalIndex;
extern CPU_INT32U EventJournalIndex;
+extern CPU_INT32U last_Index;
extern TDataDescStruct const CounterRunDesc;
extern TDataDescStruct const CounterMoneyDesc;
diff --git a/PROJECT/menu/menudesc.c b/PROJECT/menu/menudesc.c
index c44e101..43747a7 100644
--- a/PROJECT/menu/menudesc.c
+++ b/PROJECT/menu/menudesc.c
@@ -1402,11 +1402,11 @@ void PrintEventJournalRecord(TEventRecord *record)
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_VACUUM2))
{
- sprintf(str_EventData, "");
+ sprintf(str_EventData, "%d руб.", record->data);
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST6))
{
- sprintf(str_EventData, "");
+ sprintf(str_EventData, "%d руб.", record->data);
}
else if (record->event == JOURNAL_EVENT_PRINT_Z)
{
@@ -1459,6 +1459,7 @@ void OnEnterEventJournal(void)
{
last = record.time;
EventJournalIndex = i;
+ last_Index = EventJournalIndex;
}
}
if (!last) {SetMenu(JournalEmptyMenuPanel); return;}
diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c
index d112313..ded7bf1 100644
--- a/PROJECT/services/coin.c
+++ b/PROJECT/services/coin.c
@@ -106,8 +106,8 @@ static CPU_INT32U cash_enable[COUNT_POST];
static CPU_INT32U enable_signal[COUNT_POST];
static CPU_INT32U bank_enable[COUNT_POST];
-static CPU_INT32U last_coin_count[COUNT_POST];
-static CPU_INT32U last_coin_time[COUNT_POST];
+static CPU_INT32U last_coin_count[COUNT_POST + COUNT_VACUUM];
+static CPU_INT32U last_coin_time[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U last_cash_count[COUNT_POST];
static CPU_INT32U last_cash_time[COUNT_POST];
diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni
index 3e3fb48..b70d9d0 100644
--- a/settings/sk-mlpc2368.dni
+++ b/settings/sk-mlpc2368.dni
@@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
-Checksum=839030362
+Checksum=161223186
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0
diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt
index d100434..5d4d6ee 100644
--- a/settings/sk-mlpc2368.wsdt
+++ b/settings/sk-mlpc2368.wsdt
@@ -42,7 +42,7 @@
Workspace
- sk-mlpc2368sk-mlpc2368/PROJECTsk-mlpc2368/PROJECT/appsk-mlpc2368/PROJECT/datask-mlpc2368/PROJECT/driverssk-mlpc2368/PROJECT/drivers/keyboardsk-mlpc2368/PROJECT/drivers/lcdsk-mlpc2368/PROJECT/libssk-mlpc2368/PROJECT/menusk-mlpc2368/PROJECT/services
+ sk-mlpc2368sk-mlpc2368/PROJECTsk-mlpc2368/PROJECT/appsk-mlpc2368/PROJECT/datask-mlpc2368/PROJECT/driverssk-mlpc2368/PROJECT/drivers/framsk-mlpc2368/PROJECT/drivers/keyboardsk-mlpc2368/PROJECT/drivers/lcdsk-mlpc2368/PROJECT/libssk-mlpc2368/PROJECT/menusk-mlpc2368/PROJECT/services
@@ -52,7 +52,7 @@
- TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\PROJECT\menu\menudesc.c011514628046280TextEditor$WS_DIR$\PROJECT\app\app_serv.c06982265422654TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c06951805818058TextEditor$WS_DIR$\PROJECT\services\fr.c03901177111771TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c02413081308TextEditor$WS_DIR$\PROJECT\services\coin.c04228132813TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00420429TextEditor$WS_DIR$\PROJECT\app\journal.c010931023102TextEditor$WS_DIR$\PROJECT\data\fram_map.h03547561TextEditor$WS_DIR$\PROJECT\app\app_serv.h00777777TextEditor$WS_DIR$\PROJECT\app\journal.h08444024402TextEditor$WS_DIR$\PROJECT\data\datadesc.h03236248TextEditor$WS_DIR$\OS\app\app.c0871659165923TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c0135956869568690100000010000001
+ TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c06951805818058TextEditor$WS_DIR$\PROJECT\services\fr.c03901206712067TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c09454260742607TextEditor$WS_DIR$\PROJECT\services\coin.c09832463256TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00420429TextEditor$WS_DIR$\PROJECT\app\journal.c09230363036TextEditor$WS_DIR$\PROJECT\data\fram_map.h0010381038TextEditor$WS_DIR$\PROJECT\app\app_serv.h05314731473TextEditor$WS_DIR$\PROJECT\app\journal.h007070TextEditor$WS_DIR$\PROJECT\data\datadesc.h0016041604TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\app\app_serv.c0577208632086322TextEditor$WS_DIR$\PROJECT\drivers\fram\fram.c09622562256TextEditor$WS_DIR$\PROJECT\menu\menudesc.c0144157674576740100000010000001
diff --git a/sk-mlpc2368.dep b/sk-mlpc2368.dep
index acfc471..7f84a86 100644
--- a/sk-mlpc2368.dep
+++ b/sk-mlpc2368.dep
@@ -862,6 +862,10 @@
+
+ BICOMP
+ 64 18 7 9 45 10 78 1 11 50 88 68 51 80 71 48 84 92 16 61 30 12 22 38 40 52 43 91 77 83 67 65 56 89 46 62 59
+
ICCARM
64 18 7 9 45 10 78 1 11 50 88 68 51 80 71 48 84 92 16 61 30 12 22 38 40 52 43 91 77 83 67 65 56 89 46 62 59