diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c index ff73753..18f9aa6 100644 --- a/PROJECT/app/app_serv.c +++ b/PROJECT/app/app_serv.c @@ -379,7 +379,7 @@ void UserAppTask(void *p_arg) } break; - case EVENT_KEY_F1: + /*case EVENT_KEY_F1: PostUserEvent(EVENT_CASH_INSERTED_POST1); break; case EVENT_KEY_F2: @@ -387,7 +387,7 @@ void UserAppTask(void *p_arg) break; case EVENT_KEY_F3: PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1); - break; + break;*/ #endif default: break; diff --git a/PROJECT/data/datadesc.c b/PROJECT/data/datadesc.c index ab4f18a..d3a55b3 100644 --- a/PROJECT/data/datadesc.c +++ b/PROJECT/data/datadesc.c @@ -869,7 +869,10 @@ CPU_INT08U const *ErrorNumberList0[JOURNAL_EVENTS_COUNT] = "", "", "", "", "", "", "", "", "", "", "", "", - + + "", "", "", "", + "", "", "", "", "", "", "", + "ФР:01h-Неизвестная", "ФР:02h-Неверное", "ФР:03h-Ошибка ФН", @@ -1012,6 +1015,9 @@ CPU_INT08U const *ErrorNumberList1[JOURNAL_EVENTS_COUNT] = "", "", "", "", "", "", "", "", + "", "", "", "", + "", "", "", "", "", "", "", + "команда", // ФР:01h "состояние ФН", "", diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni index 57a05bf..cb74e22 100644 --- a/settings/sk-mlpc2368.dni +++ b/settings/sk-mlpc2368.dni @@ -14,7 +14,7 @@ Count=0 Enabled=0 ShowSource=1 [DebugChecksum] -Checksum=1198817827 +Checksum=247790277 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index 021bcaf..dbb3afd 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -52,7 +52,7 @@ - TextEditor$WS_DIR$\PROJECT\menu\menu.h04814241424TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\fr.c080322014220143TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\cpu\cpu.h08545784589TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\data\fram_map.h020665665TextEditor$WS_DIR$\PROJECT\app\app_serv.h03115361564TextEditor$WS_DIR$\PROJECT\app\journal.c011031673200TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\datadesc.c017827935879358TextEditor$WS_DIR$\PROJECT\menu\menudesc.c06172666426664TextEditor$WS_DIR$\PROJECT\data\data.h07316181618TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\coin.h00159159TextEditor$WS_DIR$\PROJECT\services\coin.c021453505350TextEditor$WS_DIR$\PROJECT\app\app_serv.c03411129911299TextEditor$WS_DIR$\PROJECT\data\datadesc.h012645634563TextEditor$WS_DIR$\OS\app\app.c028113111310100000010000001 + TextEditor$WS_DIR$\PROJECT\menu\menu.h04814241424TextEditor$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\cpu\cpu.h08545784589TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\data\fram_map.h020665665TextEditor$WS_DIR$\PROJECT\app\app_serv.h03115361564TextEditor$WS_DIR$\PROJECT\app\journal.c03901170811708TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\datadesc.c08433803938039TextEditor$WS_DIR$\PROJECT\app\journal.h03930573070TextEditor$WS_DIR$\PROJECT\menu\menudesc.c015136099960999TextEditor$WS_DIR$\PROJECT\data\data.h07316181618TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\coin.h00159159TextEditor$WS_DIR$\PROJECT\services\coin.c010424152415TextEditor$WS_DIR$\PROJECT\app\app_serv.c0365124211242117TextEditor$WS_DIR$\PROJECT\data\datadesc.h012645634563TextEditor$WS_DIR$\OS\app\app.c02811311131TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c015137963796TextEditor$WS_DIR$\PROJECT\services\fr.c010402708627086TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h0125751575170100000010000001