mirror of
https://github.com/dimoniche/changer.git
synced 2026-01-30 01:03:30 +03:00
вторая итерация замечаний + ftp
3 часа
This commit is contained in:
parent
c1c9264976
commit
ecf76eaa39
12134
Flash Central/Exe/changer0_03.hex
Normal file
12134
Flash Central/Exe/changer0_03.hex
Normal file
File diff suppressed because it is too large
Load Diff
@ -32,8 +32,8 @@
|
||||
|
||||
#define APP_TASK_START_STK_SIZE 128
|
||||
#define NET_OS_CFG_TMR_TASK_STK_SIZE 300
|
||||
#define NET_OS_CFG_IF_RX_TASK_STK_SIZE 256
|
||||
#define APP_TASK_PHY_STK_SIZE 256
|
||||
#define NET_OS_CFG_IF_RX_TASK_STK_SIZE 640
|
||||
#define APP_TASK_PHY_STK_SIZE 640
|
||||
|
||||
/*
|
||||
*********************************************************************************************************
|
||||
|
||||
@ -164,13 +164,13 @@
|
||||
|
||||
/* Configure external argument check feature ... */
|
||||
/* ... (see Note #1) : */
|
||||
#define NET_ERR_CFG_ARG_CHK_EXT_EN DEF_DISABLED
|
||||
#define NET_ERR_CFG_ARG_CHK_EXT_EN DEF_ENABLED
|
||||
/* DEF_DISABLED Argument check DISABLED */
|
||||
/* DEF_ENABLED Argument check ENABLED */
|
||||
|
||||
/* Configure internal argument check feature : */
|
||||
/* ... (see Note #2) : */
|
||||
#define NET_ERR_CFG_ARG_CHK_DBG_EN DEF_DISABLED
|
||||
#define NET_ERR_CFG_ARG_CHK_DBG_EN DEF_ENABLED
|
||||
/* DEF_DISABLED Argument check DISABLED */
|
||||
/* DEF_ENABLED Argument check ENABLED */
|
||||
|
||||
@ -226,7 +226,7 @@
|
||||
*********************************************************************************************************
|
||||
*/
|
||||
|
||||
#define NET_TMR_CFG_NBR_TMR 30 /* Configure total number of TIMERs (see Note #1). */
|
||||
#define NET_TMR_CFG_NBR_TMR 15 /* Configure total number of TIMERs (see Note #1). */
|
||||
|
||||
#define NET_TMR_CFG_TASK_FREQ 100 /* Configure Timer Task frequency (see Note #2). */
|
||||
|
||||
@ -527,7 +527,7 @@
|
||||
*********************************************************************************************************
|
||||
*/
|
||||
|
||||
#define NET_TCP_CFG_NBR_CONN 3 /* Configure total number of TCP connections. */
|
||||
#define NET_TCP_CFG_NBR_CONN 4 /* Configure total number of TCP connections. */
|
||||
|
||||
|
||||
/* Configure TCP connections' window sizes ... */
|
||||
@ -585,10 +585,10 @@
|
||||
|
||||
|
||||
/* Configure socket timeout values (see Note #3) : */
|
||||
#define NET_SOCK_CFG_TIMEOUT_RX_Q_MS 3000 /* Configure socket receive queue timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_REQ_MS 10000 /* Configure socket connection request timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_ACCEPT_MS 3000 /* Configure socket connection accept timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_CLOSE_MS 10000 /* Configure socket connection close timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_RX_Q_MS 1000 /* Configure socket receive queue timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_REQ_MS 1000 /* Configure socket connection request timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_ACCEPT_MS 1000 /* Configure socket connection accept timeout. */
|
||||
#define NET_SOCK_CFG_TIMEOUT_CONN_CLOSE_MS 3000 /* Configure socket connection close timeout. */
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -635,6 +635,16 @@ void UserAppTask(void *p_arg)
|
||||
{
|
||||
if (GetMode() != MODE_WORK) break;
|
||||
|
||||
// Èãíîğèğóåì îøèáêè õîïïåğà?
|
||||
CPU_INT32U DisableHopperErrors = 0;
|
||||
GetData(&DisableHopperErrorsDesc, &DisableHopperErrors, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
|
||||
if(DisableHopperErrors)
|
||||
{
|
||||
ClrErrorFlag(ERROR_HOPPER);
|
||||
break;
|
||||
}
|
||||
|
||||
if(!TstErrorFlag(ERROR_HOPPER))
|
||||
{
|
||||
// ñèãíàë îøèáêè õîïïåğà
|
||||
@ -654,6 +664,16 @@ void UserAppTask(void *p_arg)
|
||||
{
|
||||
if (GetMode() != MODE_WORK) break;
|
||||
|
||||
// Èãíîğèğóåì îøèáêè õîïïåğà?
|
||||
CPU_INT32U DisableHopperErrors = 0;
|
||||
GetData(&DisableHopperErrorsDesc, &DisableHopperErrors, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
|
||||
if(DisableHopperErrors)
|
||||
{
|
||||
ClrErrorFlag(ERROR_NO_MONEY_HOPPER);
|
||||
break;
|
||||
}
|
||||
|
||||
if(!TstErrorFlag(ERROR_NO_MONEY_HOPPER))
|
||||
{
|
||||
// ñèãíàë îòñóòñòâèÿ äåíåã â õîïïåğå
|
||||
@ -716,11 +736,10 @@ void UserAppTask(void *p_arg)
|
||||
{
|
||||
UserPrintThanksMenu();
|
||||
RefreshMenu();
|
||||
|
||||
OSTimeDly(1000);
|
||||
}
|
||||
|
||||
if (IsValidatorConnected()) CC_CmdBillType(0xffffff, 0xffffff, ADDR_FL);
|
||||
|
||||
OSTimeDly(1000);
|
||||
LED_OK_OFF();
|
||||
}
|
||||
|
||||
@ -750,9 +769,10 @@ void UserAppTask(void *p_arg)
|
||||
{
|
||||
UserPrintThanksMenu();
|
||||
RefreshMenu();
|
||||
|
||||
OSTimeDly(1000);
|
||||
}
|
||||
|
||||
OSTimeDly(1000);
|
||||
LED_OK_OFF();
|
||||
}
|
||||
|
||||
@ -985,15 +1005,15 @@ void UserPrintMoneyMenu(void)
|
||||
|
||||
strcpy(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, " Âíåñèòå äåíüãè");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
sprintf(buf, "Âíåñèòå äåíüãè");
|
||||
PrintUserMenuStrNew(buf, 1);
|
||||
|
||||
accmoney = GetAcceptedMoney();
|
||||
accmoney += GetAcceptedBankMoney();
|
||||
accmoney += GetAcceptedRestMoney();
|
||||
|
||||
sprintf(buf, "Ïğèíÿòî %d ğóá.", accmoney);
|
||||
PrintUserMenuStr(buf, 2);
|
||||
PrintUserMenuStrNew(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
}
|
||||
@ -1040,14 +1060,23 @@ void UserPrintErrorMenu(void)
|
||||
GetDataItem(&JournalErrorNumberDesc1, (CPU_INT08U*)buf, errcode);
|
||||
PrintUserMenuStr(buf, 3);
|
||||
}
|
||||
else if(TstErrorFlag(ERROR_HOPPER) || TstErrorFlag(ERROR_NO_MONEY_HOPPER))
|
||||
else if(TstErrorFlag(ERROR_HOPPER))
|
||||
{
|
||||
sprintf(buf, "ÎØÈÁÊÀ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, "Õîïïåğ îøèáêà äàò÷èêà");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
|
||||
sprintf(buf, "");
|
||||
PrintUserMenuStr(buf, 2);
|
||||
PrintUserMenuStr(buf, 3);
|
||||
}
|
||||
else if(TstErrorFlag(ERROR_NO_MONEY_HOPPER))
|
||||
{
|
||||
sprintf(buf, "ÎØÈÁÊÀ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
CPU_INT08U errcode = 0;
|
||||
sprintf(buf, "Õîïïåğ ïóñò");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
GetFirstCriticalFiscalError(&errcode);
|
||||
|
||||
sprintf(buf, "");
|
||||
PrintUserMenuStr(buf, 2);
|
||||
@ -1087,28 +1116,28 @@ void WorkServer(void)
|
||||
|
||||
void UserPrintCoinOut(CPU_INT32U coin)
|
||||
{
|
||||
char buf[32];
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, "Ïîëó÷èòå ğàçìåí");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
sprintf(buf, "%d æåòîíîâ", coin);
|
||||
PrintUserMenuStr(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
char buf[32];
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, "Ïîëó÷èòå æåòîíû");
|
||||
PrintUserMenuStrNew(buf, 1);
|
||||
sprintf(buf, " %d", coin);
|
||||
PrintUserMenuStrNew(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
}
|
||||
|
||||
void UserPrintPrintBillMenu(void)
|
||||
{
|
||||
char buf[32];
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, "Èäeò ïå÷àòü");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
sprintf(buf, " ÷åêà");
|
||||
PrintUserMenuStr(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
char buf[32];
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, "Èäeò ïå÷àòü");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
sprintf(buf, " ÷åêà");
|
||||
PrintUserMenuStr(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
}
|
||||
|
||||
void UserPrintThanksMenu(void)
|
||||
@ -1135,9 +1164,9 @@ void UserPrintFirstMenu(void)
|
||||
char buf[32];
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 0);
|
||||
sprintf(buf, " ÂÍÅÑÈÒÅ");
|
||||
sprintf(buf, " ÂÍÅÑÈÒÅ");
|
||||
PrintUserMenuStr(buf, 1);
|
||||
sprintf(buf, " ÄÅÍÜÃÈ");
|
||||
sprintf(buf, " ÄÅÍÜÃÈ");
|
||||
PrintUserMenuStr(buf, 2);
|
||||
sprintf(buf, " ");
|
||||
PrintUserMenuStr(buf, 3);
|
||||
|
||||
@ -21,7 +21,7 @@ Qwerty11
|
||||
static OS_STK FtpTaskStk[TERM_TASK_STK_SIZE];
|
||||
char term_buffer[TERM_BUFFER_SIZE];
|
||||
|
||||
extern void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_data);
|
||||
extern void PrintEventJournalRecordFtp(TEventRecord *record, char *str_event, char *str_data);
|
||||
CPU_INT08U time_to_ftp = 0;
|
||||
|
||||
///
|
||||
@ -70,14 +70,41 @@ void FtpCheckTimeToSend(CPU_INT32U systime)
|
||||
// ÷òåíèå î÷åðåäíîé ñòðîêè äëÿ ñîçäàíèÿ ôàéëà csv ñ÷åò÷èêîâ
|
||||
int ReadFtpCountersString(int index, char *buf)
|
||||
{
|
||||
CPU_INT32U i;
|
||||
static const char header1[] = ";Ñîëÿðèé 1 Êîëëàòýí;Ñîëÿðèé 1 Óëüòðàôèîëåò;Ñîëÿðèé 1 Ìàêñèìàëüíûé;Ñîëÿðèé 2 Êîëëàòýí;Ñîëÿðèé 2 Óëüòðàôèîëåò;Ñîëÿðèé 2 Ìàêñèìàëüíûé;Ñîëÿðèé 3 Êîëëàòýí;Ñîëÿðèé 3 Óëüòðàôèîëåò;Ñîëÿðèé 3 Ìàêñèìàëüíûé\r\n";
|
||||
|
||||
static const char header1[] = "Æåòîíû;Êóïþðû, ðóá.;Ìîíåòû, ðóá;Íàëè÷íûå, ðóá.;Áàíê, ðóá.\r\n";
|
||||
static const char header2[] = "Æåòîíû;Êóïþðû, ðóá.;Ìîíåòû, ðóá;Íàëè÷íûå, ðóá.;Áàíê, ðóá.\r\n";
|
||||
|
||||
switch (index)
|
||||
{
|
||||
case 0:
|
||||
strcpy(buf, header1);
|
||||
break;
|
||||
case 1:
|
||||
GetDataStr(&CounterCoinOutDesc, (CPU_INT08U*)buf, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterCashDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterCoinDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterAllCashDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterBankDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, "\r\n");
|
||||
break;
|
||||
case 2:
|
||||
strcpy(buf, header2);
|
||||
break;
|
||||
case 3:
|
||||
GetDataStr(&CounterLongCoinOutDesc, (CPU_INT08U*)buf, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterLongCashDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterLongCoinDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterLongAllCashDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, ";");
|
||||
GetDataStr(&CounterLongBankDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
strcat(buf, "\r\n");
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@ -101,7 +128,7 @@ int ReadFtpLogString(int index, char *buf)
|
||||
sprintf(buf, "%d;", index);
|
||||
PrintTimeString(&buf[strlen(buf)], record.time);
|
||||
strcat(buf, ";");
|
||||
PrintEventJournalRecord(&record, &buf[strlen(buf)], &buf[128]);
|
||||
PrintEventJournalRecordFtp(&record, &buf[strlen(buf)], &buf[128]);
|
||||
strcat(buf, ";");
|
||||
strcpy(&buf[strlen(buf)], &buf[128]);
|
||||
strcat(buf, "\r\n");
|
||||
@ -134,17 +161,17 @@ int FtpUploadCsvReport(NET_IP_ADDR ip, CPU_INT32U id, char* login, char* pass, C
|
||||
return -2;
|
||||
}
|
||||
|
||||
// ñîçäàäèì ïóòü ê êàòàëîãó âûãðóçêè /solarium/00000001/
|
||||
res_ftp = ftpChangeWorkingDir(ftp_context, "solarium");
|
||||
// ñîçäàäèì ïóòü ê êàòàëîãó âûãðóçêè /changer/00000001/
|
||||
res_ftp = ftpChangeWorkingDir(ftp_context, "changer");
|
||||
if (res_ftp != 0)
|
||||
{
|
||||
res_ftp = ftpMakeDir(ftp_context, "solarium");
|
||||
res_ftp = ftpMakeDir(ftp_context, "changer");
|
||||
if (res_ftp != 0)
|
||||
{
|
||||
ftpClose(ftp_context);
|
||||
return -3;
|
||||
}
|
||||
res_ftp = ftpChangeWorkingDir(ftp_context, "solarium");
|
||||
res_ftp = ftpChangeWorkingDir(ftp_context, "changer");
|
||||
if (res_ftp != 0)
|
||||
{
|
||||
ftpClose(ftp_context);
|
||||
@ -254,7 +281,7 @@ int FtpUploadCsvReport(NET_IP_ADDR ip, CPU_INT32U id, char* login, char* pass, C
|
||||
return -6;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ÆÓÐÍÀË
|
||||
// èìÿ ôàéëà log_20191201_121005.csv
|
||||
if (flags & FTP_FLAG_SEND_LOGS)
|
||||
|
||||
@ -1738,7 +1738,7 @@ CPU_INT08U const *ErrorNumberList0[JOURNAL_EVENTS_COUNT] = {
|
||||
"Õîïïåð çàïîëíåí",
|
||||
"Âûäàíî",
|
||||
|
||||
"Îøèáêà õîïïåðà",
|
||||
"Õîïïåð îøèáêà äàò÷èêà",
|
||||
"Õîïïåð ïóñò",
|
||||
|
||||
"îøèáêà ñâÿçè ñ",
|
||||
@ -2451,7 +2451,7 @@ TDataDescStruct const CounterTimeDesc = {
|
||||
/*************************************
|
||||
Âûäàííûå æåòîíû
|
||||
*************************************/
|
||||
CPU_INT08U const CounterCoinOutName[] = "Æåòîíû,ðóá.";
|
||||
CPU_INT08U const CounterCoinOutName[] = "Æåòîíû";
|
||||
|
||||
TDataDescStruct const CounterCoinOutDesc = {
|
||||
DATA_DESC_VIEW, // òèï äåñêðèïòîðà
|
||||
@ -3822,6 +3822,33 @@ TDataDescStruct const RegimeHopperDesc = {
|
||||
0 // çíà÷åíèå ïî óìîë÷àíèþ
|
||||
};
|
||||
|
||||
/*************************************
|
||||
Âêëþ÷åíèå èãíîðèðîâàíèÿ îøèáîê õîïïåðà
|
||||
*************************************/
|
||||
TRangeValueULONG const DisableHopperErrorsRange = {0, 1};
|
||||
CPU_INT08U const DisableHopperErrorsName[] = "Èãíîðèð.îø.";
|
||||
CPU_INT08U const DisableHopperErrorsList_str0[] = "íåò";
|
||||
CPU_INT08U const DisableHopperErrorsList_str1[] = "äà";
|
||||
CPU_INT08U const *DisableHopperErrorsList[] = {DisableHopperErrorsList_str0, DisableHopperErrorsList_str1};
|
||||
|
||||
TDataDescStruct const DisableHopperErrorsDesc = {
|
||||
DATA_DESC_EDIT, // òèï äåñêðèïòîðà
|
||||
DATA_TYPE_ULONG, // òèï ïàðàìåòðà
|
||||
DATA_LOC_FRAM, // ðàñïîëîæåíèå ïàðàìåòðà
|
||||
DATA_NO_ARRAY, // ïðèçíàê ìàññèâà
|
||||
0, // ðàçìåð ìàññèâà
|
||||
0, // óêàçàòåëü íà äåñðèïòîð èíäåêñà ìàññèâà
|
||||
(void*)offsetof(TFramMap, DeviceConfig.hopperDisableErrors), // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
|
||||
(void*)&DisableHopperErrorsRange, // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
|
||||
NULL, // ôóíêöèÿ ïî èçìåíåíèþ
|
||||
sizeof(CPU_INT32U), // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
|
||||
DisableHopperErrorsName, // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
|
||||
DATA_IS_INDEX, // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
|
||||
DisableHopperErrorsList, // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
|
||||
DATA_INIT_DISABLE,
|
||||
0
|
||||
};
|
||||
|
||||
#ifdef CONFIG_FTP_CLIENT_ENABLE
|
||||
|
||||
/*************************************
|
||||
@ -4211,6 +4238,7 @@ const TDataDescArrayStruct AllDataArray[] =
|
||||
{&CommandV2Desc, "CommandV2Desc"},
|
||||
|
||||
{&HopperLevelDesc, "HopperLevelDesc"},
|
||||
{&DisableHopperErrorsDesc, "DisableHopperErrorsDesc"},
|
||||
|
||||
{NULL, ""}
|
||||
};
|
||||
|
||||
@ -104,6 +104,7 @@ typedef struct{
|
||||
CPU_INT32U hopperStopEngine;
|
||||
CPU_INT32U hopperSaveCredit;
|
||||
CPU_INT32U hopperButtonStart;
|
||||
CPU_INT32U hopperDisableErrors;
|
||||
|
||||
}TDeviceConfig;
|
||||
|
||||
@ -283,6 +284,7 @@ extern TDataDescStruct const HopperPulseLenDesc;
|
||||
extern TDataDescStruct const HopperPauseLenDesc;
|
||||
extern TDataDescStruct const HopperLevelDesc;
|
||||
extern TDataDescStruct const RegimeHopperDesc;
|
||||
extern TDataDescStruct const DisableHopperErrorsDesc;
|
||||
|
||||
extern TDataDescStruct const AcceptedBankMoneyDesc;
|
||||
extern TDataDescStruct const AcceptedBankMoneyCRC16Desc;
|
||||
|
||||
@ -1225,8 +1225,15 @@ const TMenuLine line_HopperMenu_5 = {
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLineArray arr_HopperMenuArray[] = {&line_HopperMenu_0, &line_HopperMenu_1, &line_HopperMenu_2, &line_HopperMenu_3, &line_HopperMenu_4, &line_HopperMenu_5, NULL};
|
||||
const TMenuPanel HopperSetupPanel[] = {arr_HopperMenuArray, NULL, 6, MENU_PANEL_STANDARD};
|
||||
const TMenuLine line_HopperMenu_6 = {
|
||||
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
|
||||
0, // äîï. ôëàãè
|
||||
(void*)&DisableHopperErrorsDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLineArray arr_HopperMenuArray[] = {&line_HopperMenu_0, &line_HopperMenu_1, &line_HopperMenu_2, &line_HopperMenu_3, &line_HopperMenu_4, &line_HopperMenu_5, &line_HopperMenu_6, NULL};
|
||||
const TMenuPanel HopperSetupPanel[] = {arr_HopperMenuArray, NULL, 7, MENU_PANEL_STANDARD};
|
||||
|
||||
/***********************************
|
||||
ÌÅÍÞ ÍÀÑÒÐÎÉÊÀ ÌÎÄÅÌÀ
|
||||
@ -1297,6 +1304,41 @@ char str_UserMenu_3[22] = "";
|
||||
|
||||
char str_buf[22];
|
||||
|
||||
void PrintUserMenuStrNew(char* str, CPU_INT08U n)
|
||||
{
|
||||
char *strptr;
|
||||
char *instr;
|
||||
// âûðîâíÿåì ïî öåíòðó äëÿ êðàñîòû
|
||||
|
||||
switch (n)
|
||||
{
|
||||
case 0:
|
||||
strptr = str_UserMenu_0;
|
||||
break;
|
||||
case 1:
|
||||
strptr = str_UserMenu_1;
|
||||
break;
|
||||
case 2:
|
||||
strptr = str_UserMenu_2;
|
||||
break;
|
||||
case 3:
|
||||
strptr = str_UserMenu_3;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
// íàéäåì íà÷àëî ñòðîêè, îòëè÷íîå îò ïðîáåëà
|
||||
instr = str;
|
||||
while (*instr==0x20) instr++;
|
||||
|
||||
memset(strptr, 0x20, 20);
|
||||
|
||||
int len = strlen(instr);
|
||||
if ((len >= 20) || ((10-len/2) < 0)) {strcpy(strptr, instr); return;}
|
||||
|
||||
strcpy(&strptr[10-len/2], instr);
|
||||
}
|
||||
|
||||
void PrintUserMenuStr(char* str, CPU_INT08U n)
|
||||
{
|
||||
@ -1501,7 +1543,7 @@ const TMenuPanel JournalIsReset[] = {JournalIsResetMenuArray, NULL, 4, MENU_PANE
|
||||
ÏÀÍÅËÜ ÂÍÅÑÅÍÈß ÄÅÍÅÃ
|
||||
***********************************/
|
||||
|
||||
const CPU_INT08U str_GetMoney_0[] = " Âíåñèòå äåíüãè";
|
||||
const CPU_INT08U str_GetMoney_0[] = " Âíåñèòå äåíüãè";
|
||||
|
||||
const TMenuLine line_GetMoneyMenu_0 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
@ -1926,6 +1968,69 @@ void PrintEventJournalRecord(TEventRecord *record)
|
||||
}
|
||||
}
|
||||
|
||||
void PrintEventJournalRecordFtp(TEventRecord *record, char *str_event, char *str_data)
|
||||
{
|
||||
if (record->event)
|
||||
{ // åñòü ñîáûòèå
|
||||
GetEventStr(str_event, record->event);
|
||||
if ((record->event == JOURNAL_EVENT_MONEY_NOTE) || (record->event == JOURNAL_EVENT_MONEY_COIN) || (record->event == JOURNAL_EVENT_MONEY_BANK))
|
||||
{
|
||||
sprintf(str_data, "%d ðóá.", record->data);
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_COIN_OUT)
|
||||
{
|
||||
sprintf(str_data, "%d æåòîíîâ.", record->data);
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_DEVICE_ON)
|
||||
{
|
||||
sprintf(str_data, "");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_PRINT_BILL)
|
||||
{
|
||||
sprintf(str_data, " ");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_PRINT_Z)
|
||||
{
|
||||
sprintf(str_data, "");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_PRINT_X)
|
||||
{
|
||||
sprintf(str_data, "");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_PRINT_BUF)
|
||||
{
|
||||
sprintf(str_data, "");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_CHANGE_MODE)
|
||||
{
|
||||
if (record->data == MODE_WORK) sprintf(str_data, "ðàáîòà");
|
||||
else sprintf(str_data, "íàñòðîéêà");
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_INCASSATION)
|
||||
{
|
||||
sprintf(str_data, "%u ðóá.", record->data);
|
||||
}
|
||||
else if (record->event == JOURNAL_EVENT_PASS_FAIL)
|
||||
{
|
||||
sprintf(str_data, "%u", record->data);
|
||||
}
|
||||
else if ((record->event == JOURNAL_EVENT_EMAIL_OK) || (record->event == JOURNAL_EVENT_EMAIL_FAIL))
|
||||
{
|
||||
sprintf(str_data, "");
|
||||
}
|
||||
else
|
||||
{
|
||||
GetDataItem(&JournalErrorNumberDesc0, (CPU_INT08U*)str_event, record->event);
|
||||
GetDataItem(&JournalErrorNumberDesc1, (CPU_INT08U*)str_data, record->event);
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // ïóñòàÿ çàïèñü
|
||||
sprintf(str_event, "ïóñòî");
|
||||
sprintf(str_data, "ïóñòî");
|
||||
}
|
||||
}
|
||||
|
||||
void OnEnterEventJournal(void)
|
||||
{
|
||||
TEventRecord record;
|
||||
|
||||
@ -58,7 +58,9 @@ extern const TMenuPanel ValidatorSetupPanel[];
|
||||
extern const TMenuPanel CanselCheckMenuPanel[];
|
||||
|
||||
extern void PrintUserMenuStr(char* str, CPU_INT08U n);
|
||||
extern void PrintUserMenuStrNew(char* str, CPU_INT08U n);
|
||||
extern void PrintEventJournalRecord(TEventRecord *record);
|
||||
extern void PrintEventJournalRecordFtp(TEventRecord *record, char *str_event, char *str_data);
|
||||
|
||||
extern char str_EventNumber[24];
|
||||
extern char str_EventData[24];
|
||||
|
||||
@ -674,7 +674,7 @@ void InitInputPorts()
|
||||
/*
|
||||
P0.24 MK_P8 управление хоппером
|
||||
P0.25 MK_P7 запрет банковского терминала
|
||||
P1.31 MK_P20 טלןףכ<EFBFBD>סם<EFBFBD>י ג<EFBFBD>ץמה ץמןןונא
|
||||
P1.31 MK_P20 запрет монетника
|
||||
*/
|
||||
|
||||
// настройка выходных ног управления
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _VERSION_H_
|
||||
#define _VERSION_H_
|
||||
|
||||
#define DEVICE_FW_VERSION "00.02"
|
||||
#define DEVICE_FW_VERSION "00.03"
|
||||
|
||||
|
||||
#endif // #ifndef _VERSION_H_
|
||||
@ -34,12 +34,12 @@
|
||||
|
||||
|
||||
<PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><ShowCodeCoverage>0</ShowCodeCoverage><ShowInstrProfiling>0</ShowInstrProfiling></Disassembly>
|
||||
<Find-in-Files><ColumnWidth0>470</ColumnWidth0><ColumnWidth1>67</ColumnWidth1><ColumnWidth2>806</ColumnWidth2></Find-in-Files><WATCH_1><expressions><item>error</item><item></item></expressions><col-names><item>Expression</item><item>Location</item><item>Type</item><item>Value</item></col-names><col-widths><item>100</item><item>150</item><item>100</item><item>100</item></col-widths></WATCH_1></Static>
|
||||
<Find-in-Files><ColumnWidth0>470</ColumnWidth0><ColumnWidth1>67</ColumnWidth1><ColumnWidth2>806</ColumnWidth2></Find-in-Files><WATCH_1><expressions><item>error</item><item/></expressions><col-names><item>Expression</item><item>Location</item><item>Type</item><item>Value</item></col-names><col-widths><item>100</item><item>150</item><item>100</item><item>100</item></col-widths><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></WATCH_1></Static>
|
||||
<Windows>
|
||||
|
||||
|
||||
|
||||
<Wnd0>
|
||||
<Wnd3>
|
||||
<Tabs>
|
||||
<Tab>
|
||||
<Identity>TabID-4454-14979</Identity>
|
||||
@ -55,7 +55,7 @@
|
||||
</Tab>
|
||||
<Tab><Identity>TabID-8358-20066</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs>
|
||||
|
||||
<SelectedTab>0</SelectedTab></Wnd0><Wnd2>
|
||||
<SelectedTab>0</SelectedTab></Wnd3><Wnd4>
|
||||
<Tabs>
|
||||
<Tab>
|
||||
<Identity>TabID-15203-14983</Identity>
|
||||
@ -67,20 +67,20 @@
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
<SelectedTab>0</SelectedTab></Wnd2><Wnd4><Tabs><Tab><Identity>TabID-18628-8519</Identity><TabName>Watch 1</TabName><Factory>WATCH_1</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-6062-17146</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>
|
||||
<SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-30338-11634</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>
|
||||
<Editor>
|
||||
|
||||
|
||||
|
||||
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>409</SelStart><SelEnd>409</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1144</SelStart><SelEnd>1159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1394</SelStart><SelEnd>1417</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.c</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>10861</SelStart><SelEnd>10861</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>273</SelStart><SelEnd>273</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>4189</YPos><SelStart>193572</SelStart><SelEnd>193572</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>197</YPos><SelStart>7335</SelStart><SelEnd>7353</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>219</SelStart><SelEnd>219</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1149</SelStart><SelEnd>1149</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>808</YPos><SelStart>41572</SelStart><SelEnd>41572</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>41</YPos><SelStart>2568</SelStart><SelEnd>2568</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>817</YPos><SelStart>26618</SelStart><SelEnd>26618</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>729</YPos><SelStart>19424</SelStart><SelEnd>19424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1365</YPos><SelStart>56947</SelStart><SelEnd>56947</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>16</YPos><SelStart>1746</SelStart><SelEnd>1768</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>4820</SelStart><SelEnd>4820</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>290</YPos><SelStart>8109</SelStart><SelEnd>8109</SelEnd></Tab><ActiveTab>18</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\tcpip\NIC\ETHER\LPC2368\net_nic.c</Filename><XPos>0</XPos><YPos>797</YPos><SelStart>42551</SelStart><SelEnd>42551</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>409</SelStart><SelEnd>409</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1144</SelStart><SelEnd>1159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1394</SelStart><SelEnd>1417</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>268</YPos><SelStart>9794</SelStart><SelEnd>9794</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2489</SelStart><SelEnd>2489</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>623</YPos><SelStart>22172</SelStart><SelEnd>22255</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>729</YPos><SelStart>19424</SelStart><SelEnd>19424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1365</YPos><SelStart>56947</SelStart><SelEnd>56947</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>91</SelStart><SelEnd>91</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>179</YPos><SelStart>4894</SelStart><SelEnd>4894</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>331</YPos><SelStart>15696</SelStart><SelEnd>15805</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\port\os_cpu_c.c</Filename><XPos>0</XPos><YPos>237</YPos><SelStart>9982</SelStart><SelEnd>9982</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>628</YPos><SelStart>18495</SelStart><SelEnd>18495</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>313</YPos><SelStart>8375</SelStart><SelEnd>8375</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu_a.s</Filename><XPos>0</XPos><YPos>89</YPos><SelStart>4888</SelStart><SelEnd>4888</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>4688</SelStart><SelEnd>4688</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2237</YPos><SelStart>104945</SelStart><SelEnd>104945</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\net_cfg.h</Filename><XPos>0</XPos><YPos>606</YPos><SelStart>36775</SelStart><SelEnd>36775</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\os_cfg.h</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1291</SelStart><SelEnd>1291</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1246</SelStart><SelEnd>1246</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>1149</SelStart><SelEnd>1149</SelEnd></Tab><ActiveTab>22</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1959</YPos><SelStart>78594</SelStart><SelEnd>78594</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Positions>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Top><Row0><Sizes><Toolbar-053529c8><key>iaridepm.enu1</key></Toolbar-053529c8></Sizes></Row0><Row1><Sizes><Toolbar-193ae738><key>debuggergui.enu1</key></Toolbar-193ae738></Sizes></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>458</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>634483</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>458</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>634483</sizeVertCY></Rect></Wnd4></Sizes></Row0><Row1><Sizes><Wnd5><Rect><Top>-2</Top><Left>196</Left><Bottom>458</Bottom><Right>396</Right><x>196</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>634483</sizeVertCY></Rect></Wnd5></Sizes></Row1></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>200</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>275862</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-054c29c8><key>iaridepm.enu1</key></Toolbar-054c29c8></Sizes></Row0><Row1><Sizes><Toolbar-15a7ff18><key>debuggergui.enu1</key></Toolbar-15a7ff18></Sizes></Row1></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>458</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>634483</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>458</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>634483</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>200</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>275862</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Project>
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ TriggerName=main
|
||||
LimitSize=0
|
||||
ByteLimit=50
|
||||
[DebugChecksum]
|
||||
Checksum=1862297616
|
||||
Checksum=181021228
|
||||
[Exceptions]
|
||||
StopOnUncaught=_ 0
|
||||
StopOnThrow=_ 0
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
|
||||
<Column0>218</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
<Column0>221</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
</Workspace>
|
||||
<Build>
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<Factory>Workspace</Factory>
|
||||
<Session>
|
||||
|
||||
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/data</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/menu</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/services</ExpandedNode></NodeDict></Session>
|
||||
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/OS</ExpandedNode><ExpandedNode>sk-mlpc2368/OS/app</ExpandedNode><ExpandedNode>sk-mlpc2368/OS/uc</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/menu</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/services</ExpandedNode></NodeDict></Session>
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
@ -64,14 +64,14 @@
|
||||
|
||||
|
||||
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>409</SelStart><SelEnd>409</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1144</SelStart><SelEnd>1159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1394</SelStart><SelEnd>1417</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.c</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>10861</SelStart><SelEnd>10861</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>273</SelStart><SelEnd>273</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>4189</YPos><SelStart>193572</SelStart><SelEnd>193572</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>197</YPos><SelStart>7335</SelStart><SelEnd>7353</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>219</SelStart><SelEnd>219</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1149</SelStart><SelEnd>1149</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>808</YPos><SelStart>41572</SelStart><SelEnd>41572</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>41</YPos><SelStart>2568</SelStart><SelEnd>2568</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>739</YPos><SelStart>29563</SelStart><SelEnd>29563</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>729</YPos><SelStart>19424</SelStart><SelEnd>19424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1365</YPos><SelStart>56947</SelStart><SelEnd>56947</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>16</YPos><SelStart>1746</SelStart><SelEnd>1768</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>4820</SelStart><SelEnd>4820</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>629</YPos><SelStart>13928</SelStart><SelEnd>13928</SelEnd></Tab><ActiveTab>18</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\tcpip\NIC\ETHER\LPC2368\net_nic.c</Filename><XPos>0</XPos><YPos>797</YPos><SelStart>42551</SelStart><SelEnd>42551</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>409</SelStart><SelEnd>409</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1144</SelStart><SelEnd>1159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1394</SelStart><SelEnd>1417</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>268</YPos><SelStart>9794</SelStart><SelEnd>9794</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2489</SelStart><SelEnd>2489</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>623</YPos><SelStart>22172</SelStart><SelEnd>22255</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>729</YPos><SelStart>19424</SelStart><SelEnd>19424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1365</YPos><SelStart>56947</SelStart><SelEnd>56947</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>91</SelStart><SelEnd>91</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>179</YPos><SelStart>4894</SelStart><SelEnd>4894</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>331</YPos><SelStart>15696</SelStart><SelEnd>15805</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\port\os_cpu_c.c</Filename><XPos>0</XPos><YPos>237</YPos><SelStart>9982</SelStart><SelEnd>9982</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>628</YPos><SelStart>18495</SelStart><SelEnd>18495</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>313</YPos><SelStart>8375</SelStart><SelEnd>8375</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu_a.s</Filename><XPos>0</XPos><YPos>89</YPos><SelStart>4888</SelStart><SelEnd>4888</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\ftp_app.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>4688</SelStart><SelEnd>4688</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2237</YPos><SelStart>104945</SelStart><SelEnd>104945</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\net_cfg.h</Filename><XPos>0</XPos><YPos>606</YPos><SelStart>36775</SelStart><SelEnd>36775</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\os_cfg.h</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1291</SelStart><SelEnd>1291</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1246</SelStart><SelEnd>1246</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>1149</SelStart><SelEnd>1149</SelEnd></Tab><ActiveTab>22</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1959</YPos><SelStart>78594</SelStart><SelEnd>78594</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
|
||||
<Positions>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Top><Row0><Sizes><Toolbar-053529c8><key>iaridepm.enu1</key></Toolbar-053529c8></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>521</Bottom><Right>309</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>227672</sizeVertCX><sizeVertCY>721379</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>159</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>161</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>222069</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>275862</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-054c29c8><key>iaridepm.enu1</key></Toolbar-054c29c8></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>444</Bottom><Right>312</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>229868</sizeVertCX><sizeVertCY>615172</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>236</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>238</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>328276</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>275862</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
8327
sk-mlpc2368.dep
8327
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -1513,7 +1513,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>changer0_02.hex</state>
|
||||
<state>changer0_03.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
@ -1567,7 +1567,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkOutputFile</name>
|
||||
<state>version0_02.out</state>
|
||||
<state>version0_03.out</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkDebugInfoEnable</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user