diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c index d8c6780..1693e3b 100644 --- a/PROJECT/app/app_serv.c +++ b/PROJECT/app/app_serv.c @@ -539,7 +539,7 @@ void UserAppTask(void *p_arg) // напечатаем безналичный чек if (IsFiscalConnected()) { - if (PrintFiscalBill(accmoney,number_post, 0) == 0) // здесь добавить с какого поста чек + if (PrintFiscalBill(accmoney,number_post, 1) == 0) // здесь добавить с какого поста чек { SaveEventRecord(number_post, JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1 + number_post, GetTimeSec()); } @@ -563,8 +563,8 @@ void UserAppTask(void *p_arg) break; case EVENT_KEY_F1: - //testMoney = 100; - //PostUserEvent(EVENT_BANK_INSERTED_POST1); + testMoney = 100; + PostUserEvent(EVENT_BANK_INSERTED_POST1); /*FIO4SET_bit.P4_28 = 1; OSTimeDly(50); @@ -587,11 +587,11 @@ void UserAppTask(void *p_arg) FIO4CLR_bit.P4_28 = 1;*/ break; case EVENT_KEY_F2: - //PostUserEvent(EVENT_COIN_INSERTED_POST1); + PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1); break; case EVENT_KEY_F3: - //testMoney = 100; - //PostUserEvent(EVENT_CASH_INSERTED_POST1); + testMoney = 100; + PostUserEvent(EVENT_CASH_INSERTED_POST1); break; #endif default: diff --git a/PROJECT/services/fr.c b/PROJECT/services/fr.c index 1d45296..15c3a25 100644 --- a/PROJECT/services/fr.c +++ b/PROJECT/services/fr.c @@ -710,6 +710,8 @@ repeat_sell1: { if (service_name[i] == 0) ok = 1; } + sprintf(service_name, "%s пост %d", service_name, post + 1); + if (!ok) { CPU_INT32U serv_index; @@ -802,6 +804,8 @@ repeat_sell2: { if (service_name[i] == 0) ok = 1; } + sprintf(service_name, "%s пост %d", service_name, post + 1); + if (!ok) { CPU_INT32U serv_index; diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni index 06ab1fb..e2a387d 100644 --- a/settings/sk-mlpc2368.dni +++ b/settings/sk-mlpc2368.dni @@ -14,7 +14,7 @@ Count=0 Enabled=0 ShowSource=1 [DebugChecksum] -Checksum=-1578374706 +Checksum=1108304254 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index ef5ac0d..6c67ff9 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -52,7 +52,7 @@ - TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\services\coin.c053013077130778TextEditor$WS_DIR$\PROJECT\app\journal.h05246250TextEditor$WS_DIR$\PROJECT\data\datadesc.h014151455169TextEditor$WS_DIR$\PROJECT\app\app_serv.c03431178111781TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c021260586058TextEditor$WS_DIR$\PROJECT\menu\menudesc.c013245350253502TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08652326123265TextEditor$WS_DIR$\PROJECT\services\fr.c06219721972TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c0165474280742800100000010000001 + TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\app\journal.h05246250TextEditor$WS_DIR$\PROJECT\data\datadesc.h06635635TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c021260586058TextEditor$WS_DIR$\PROJECT\menu\menudesc.c013245350253502TextEditor$WS_DIR$\PROJECT\app\app_serv.c05622033620336TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c0865229882298816TextEditor$WS_DIR$\PROJECT\services\fr.c08562357723577TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\PROJECT\services\coin.c012762337223372TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c0214996367963670100000010000001