dimoniche/Moyka
1
0
Fork 0
mirror of https://github.com/dimoniche/Moyka.git synced 2026-01-29 17:33:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

изменения

Browse Source
This commit is contained in:
dimoniche 2019-06-19 01:29:26 +03:00
parent a9763ced9c
commit 7d5cfd5417
13 changed files with 4831 additions and 2639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
PROJECT/app/app_serv.c
View File

@ -189,27 +189,20 @@ void UserAppTask(void *p_arg)
{
drawPostInfo[post] = 1;
LED_OK_ON();
CheckFiscalStatus();
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû
GetData(&PrintTimeoutAfterDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if(print_timeout)
{
// åñëè óêàçàí òàéìàóò îáíóëåíèÿ äåíåã - ïðîñòî èõ îáíóëÿåì
if (labs(OSTimeGet() - money_timestamp[post]) > 1000UL * print_timeout)
{
SetAcceptedMoney(0, post);
UserPrintThanksMenu(post);
RefreshMenu();
OSTimeDly(1000);
LED_OK_OFF();
}
}
}
else
{
drawPostInfo[post] = 0;
LED_OK_OFF();
}
}
@ -262,7 +255,7 @@ void UserAppTask(void *p_arg)
GetData(&CashPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
money = /*cpp * 10*/ GetResetCashCount(number_post);
money = cpp * GetResetCashCount(number_post);
accmoney = GetAcceptedMoney(number_post);
accmoney += money;
@ -332,6 +325,19 @@ void UserAppTask(void *p_arg)
break;
}
break;
case EVENT_STOP_MONEY_POST1:
case EVENT_STOP_MONEY_POST2:
case EVENT_STOP_MONEY_POST3:
case EVENT_STOP_MONEY_POST4:
case EVENT_STOP_MONEY_POST5:
case EVENT_STOP_MONEY_POST6:
case EVENT_STOP_MONEY_VACUUM1:
case EVENT_STOP_MONEY_VACUUM2:
if (GetMode() == MODE_WORK) //
{
}
break;
case EVENT_CASH_PRINT_CHECK_POST1:
case EVENT_CASH_PRINT_CHECK_POST2:
@ -379,10 +385,28 @@ void UserAppTask(void *p_arg)
}
break;
/*case EVENT_KEY_F1:
PostUserEvent(EVENT_CASH_INSERTED_POST1);
case EVENT_KEY_F1:
FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
FIO4CLR_bit.P4_28 = 1;
OSTimeDly(50);
FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
FIO4CLR_bit.P4_28 = 1;
OSTimeDly(50);
FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
FIO4CLR_bit.P4_28 = 1;
OSTimeDly(50);
FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
FIO4CLR_bit.P4_28 = 1;
OSTimeDly(50);
FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
FIO4CLR_bit.P4_28 = 1;
break;
case EVENT_KEY_F2:
/*case EVENT_KEY_F2:
PostUserEvent(EVENT_CASH_INSERTED_POST2);
break;
case EVENT_KEY_F3:

9
PROJECT/app/app_serv.h
View File

@ -54,6 +54,15 @@ enum{
EVENT_CASH_INSERTED_POST5,
EVENT_CASH_INSERTED_POST6,
EVENT_STOP_MONEY_POST1,
EVENT_STOP_MONEY_POST2,
EVENT_STOP_MONEY_POST3,
EVENT_STOP_MONEY_POST4,
EVENT_STOP_MONEY_POST5,
EVENT_STOP_MONEY_POST6,
EVENT_STOP_MONEY_VACUUM1,
EVENT_STOP_MONEY_VACUUM2,
EVENT_CASH_PRINT_CHECK_POST1,
EVENT_CASH_PRINT_CHECK_POST2,
EVENT_CASH_PRINT_CHECK_POST3,

110
PROJECT/data/datadesc.c
View File

@ -665,6 +665,113 @@ TDataDescStruct const CashPerPulseDesc = {
10 // çíà÷åíèå ïî óìîë÷àíèþ
};
void OnChangeLevel()
{
CPU_INT32U level1, level2, level3;
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
if(post < COUNT_POST) GetData(&CashLevelDesc, &level1, post, DATA_FLAG_DIRECT_INDEX);
GetData(&CoinLevelDesc, &level2, post, DATA_FLAG_DIRECT_INDEX);
GetData(&SignalStopMoneyLevelDesc, &level3, post, DATA_FLAG_DIRECT_INDEX);
SetLevelParam(level1, level2, level3, post);
}
}
/*************************************
Уровень сигнала купюрника
*************************************/
TRangeValueULONG const LevelRange = {0, 1};
CPU_INT08U const LevelName[] = "Уровень";
CPU_INT08U const Level_str0[] = "LOW";
CPU_INT08U const Level_str1[] = "HIGH";
CPU_INT08U const *LevelList[] = {Level_str0, Level_str1};
TDataDescStruct const CashLevelDesc = {
DATA_DESC_EDIT, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // размер массива
&CashIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.CashLevel), // указатель на переменную или адрес FRAM
(void*)&LevelRange, // указатель на границы параметра
OnChangeLevel, // функция по изменению
sizeof(CPU_INT32U), // смещение между элементами в массиве
LevelName, // указатель на строку названия параметра
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
};
/*************************************
Уровень сигнала монетника
*************************************/
TDataDescStruct const CoinLevelDesc = {
DATA_DESC_EDIT, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST + COUNT_VACUUM, // размер массива
&CoinIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.CoinLevel), // указатель на переменную или адрес FRAM
(void*)&LevelRange, // указатель на границы параметра
OnChangeLevel, // функция по изменению
sizeof(CPU_INT32U), // смещение между элементами в массиве
LevelName, // указатель на строку названия параметра
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
};
/*************************************
Уровень сигнала окончания внесения денег
*************************************/
CPU_INT08U const SignalStopLevelName[] = "Старт мойки ";
TDataDescStruct const SignalStopMoneyLevelDesc = {
DATA_DESC_EDIT, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST + COUNT_VACUUM, // размер массива
&SignalIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.SignalLevel), // указатель на переменную или адрес FRAM
(void*)&LevelRange, // указатель на границы параметра
OnChangeLevel, // функция по изменению
sizeof(CPU_INT32U), // смещение между элементами в массиве
SignalStopLevelName, // указатель на строку названия параметра
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
};
/*************************************
Уровень сигнала печати чека
*************************************/
CPU_INT08U const SignalPrintLevelName[] = "Печать чека";
CPU_INT08U const *SignalLevelList[] = {Level_str1, Level_str0};
TDataDescStruct const SignalPrintLevelDesc = {
DATA_DESC_VIEW, // тип дескриптора
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // размер массива
&SignalIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.SignalLevel), // указатель на переменную или адрес FRAM
(void*)&LevelRange, // указатель на границы параметра
NULL, // функция по изменению
sizeof(CPU_INT32U), // смещение между элементами в массиве
SignalPrintLevelName, // указатель на строку названия параметра
DATA_IS_INDEX, // признак индексного параметра (список строк)
SignalLevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
};
/*************************************
Âêëþ÷åíèå ÔÐ
@ -2419,6 +2526,9 @@ const TDataDescArrayStruct AllDataArray[] =
{&EnableSignalDesc, "EnableSignalDesc"},
{&SignalPulseDesc, "SignalPulseDesc"},
{&CashLevelDesc, "CashLevelDesc"},
{&CoinLevelDesc, "CoinLevelDesc"},
{&SignalStopMoneyLevelDesc, "SignalStopMoneyLevelDesc"},
{NULL, ""}
};

9
PROJECT/data/datadesc.h
View File

@ -40,6 +40,10 @@ typedef struct{
CPU_INT32U PrintTimeout;
CPU_INT32U PrintTimeoutAfter;
CPU_INT32U CashLevel[COUNT_POST + COUNT_VACUUM]; // óðîâåíü ñèãíàëà êóïþðíèêà
CPU_INT32U CoinLevel[COUNT_POST + COUNT_VACUUM]; // óðîâåíü ñèãíàëà ìîíåòíèêà
CPU_INT32U SignalLevel[COUNT_POST + COUNT_VACUUM]; // óðîâåíü ñèãíàëà ñèãíàëà ïå÷àòè
CPU_INT32U PrintMode;
CPU_INT32U DeviceId;
@ -149,6 +153,7 @@ extern TDataDescStruct const CashPulseLenDesc;
extern TDataDescStruct const CashPauseLenDesc;
extern void OnChangeCashPulseLen();
extern void OnChangeSinalPulseLen();
extern void OnChangeLevel();
extern TDataDescStruct const PrintModeDesc;
extern TDataDescStruct const PrintTimeoutAfterDesc;
@ -165,4 +170,8 @@ extern TDataDescStruct const SignalIndexDesc;
extern TDataDescStruct const EnableSignalDesc;
extern TDataDescStruct const SignalPulseDesc;
extern TDataDescStruct const CashLevelDesc;
extern TDataDescStruct const CoinLevelDesc;
extern TDataDescStruct const SignalPrintLevelDesc;
extern TDataDescStruct const SignalStopMoneyLevelDesc;
#endif //#ifndef _DATADESC_H_

88
PROJECT/menu/menudesc.c
View File

@ -748,13 +748,27 @@ const TMenuLine line_SignalMenu_2 = {
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_SignalMenu_3 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&SignalStopMoneyLevelDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_SignalMenu_4 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&SignalPrintLevelDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
void OnEnterSignalMenu(void)
{
CoinIndex = 0;
}
const TMenuLineArray arr_SignalMenuArray[] = {&line_SignalMenu_0, &line_SignalMenu_1, &line_SignalMenu_2, NULL};
const TMenuPanel SignalSetupPanel[] = {arr_SignalMenuArray, OnEnterSignalMenu, 3, MENU_PANEL_STANDARD};
const TMenuLineArray arr_SignalMenuArray[] = {&line_SignalMenu_0, &line_SignalMenu_1, &line_SignalMenu_2, &line_SignalMenu_3, &line_SignalMenu_4, NULL};
const TMenuPanel SignalSetupPanel[] = {arr_SignalMenuArray, OnEnterSignalMenu, 5, MENU_PANEL_STANDARD};
/***********************************
@ -881,13 +895,20 @@ const TMenuLine line_CoinMenu_2 = {
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_CoinMenu_3 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&CoinLevelDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
void OnEnterCoinMenu(void)
{
CoinIndex = 0;
}
const TMenuLineArray arr_CoinMenuArray[] = {&line_CoinMenu_0, &line_CoinMenu_1, &line_CoinMenu_2, NULL};
const TMenuPanel CoinSetupPanel[] = {arr_CoinMenuArray, OnEnterCoinMenu, 3, MENU_PANEL_STANDARD};
const TMenuLineArray arr_CoinMenuArray[] = {&line_CoinMenu_0, &line_CoinMenu_1, &line_CoinMenu_2, &line_CoinMenu_3, NULL};
const TMenuPanel CoinSetupPanel[] = {arr_CoinMenuArray, OnEnterCoinMenu, 4, MENU_PANEL_STANDARD};
/***********************************
ÌÅÍÞ ÍÀÑÒÐÎÉÊÀ ÊÓÏÞÐÎÏÐÈÅÌÍÈÊÎÂ
@ -935,66 +956,15 @@ const TMenuLine line_CashMenu_5 = {
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLineArray arr_ValidatorMenuArray[] = {&line_CashMenu_0, &line_CashMenu_1, /*&line_CashMenu_2,*/ &line_CashMenu_3, &line_CashMenu_4, &line_CashMenu_5, NULL};
const TMenuPanel ValidatorSetupPanel[] = {arr_ValidatorMenuArray, OnEnterCoinMenu, 5, MENU_PANEL_STANDARD};
/***********************************
ÌÅÍÞ ÍÀÑÒÐÎÉÊÀ ÌÎÄÅÌÀ
***********************************/
const CPU_INT08U str_ModemMenu_0[] = " ÍÀÑÒÐÎéÊÈ ÌÎÄÅÌÀ";
const TMenuLine line_ModemMenu_0 = {
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
MENU_FIXED_LINE, // äîï. ôëàãè
(void*)str_ModemMenu_0, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_1 = {
const TMenuLine line_CashMenu_6 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&EnableModemDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
(void*)&CashLevelDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_2 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&ModemStatusDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_3 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&StatSendHourMinDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_4 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&EnableEmailJournalSendDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_5 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&DeviceIDDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLine line_ModemMenu_6 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)&SendTestEmailDesc, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
NULL // ïàíåëü äëÿ ïåðåõîäà
};
const TMenuLineArray arr_ModemMenuArray[] = {&line_ModemMenu_0, &line_ModemMenu_1, &line_ModemMenu_2, &line_ModemMenu_3, &line_ModemMenu_4, &line_ModemMenu_5, &line_ModemMenu_6, NULL};
const TMenuPanel ModemSetupPanel[] = {arr_ModemMenuArray, NULL, 7, MENU_PANEL_STANDARD};
const TMenuLineArray arr_ValidatorMenuArray[] = {&line_CashMenu_0, &line_CashMenu_1, /*&line_CashMenu_2,*/ &line_CashMenu_3, &line_CashMenu_4, &line_CashMenu_5, &line_CashMenu_6, NULL};
const TMenuPanel ValidatorSetupPanel[] = {arr_ValidatorMenuArray, OnEnterCoinMenu, 6, MENU_PANEL_STANDARD};
/***********************************
ÇÀÑÒÀÂÊÀ ÄËß ÊËÈÅÍÒÀ

136
PROJECT/services/coin.c
View File

@ -23,6 +23,10 @@ static CPU_INT32U pend_cash_timestamp[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U signal_pulse[COUNT_POST + COUNT_VACUUM];
static char pend_signal_counter[COUNT_POST + COUNT_VACUUM];
CPU_INT32U cashLevel[COUNT_POST + COUNT_VACUUM];
CPU_INT32U coinLevel[COUNT_POST + COUNT_VACUUM];
CPU_INT32U SignalLevel[COUNT_POST + COUNT_VACUUM];
void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
{
#if OS_CRITICAL_METHOD == 3
@ -44,6 +48,18 @@ void SetSignalPulseParam(CPU_INT32U pulse, CPU_INT32U post)
OS_EXIT_CRITICAL();
}
void SetLevelParam(CPU_INT32U level1, CPU_INT32U level2, CPU_INT32U level3, CPU_INT32U post)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
if(post < COUNT_POST) cashLevel[post] = level1;
coinLevel[post] = level2;
SignalLevel[post] = level3;
OS_EXIT_CRITICAL();
}
void CoinTask(void *p_arg)
{
CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
@ -230,103 +246,103 @@ void InitCoin(void)
CPU_INT32U input_register()
{
CPU_INT32U input = 0xFFFFFFFF;
CPU_INT32U input = 0;
if (!FIO1PIN_bit.P1_20)
if (FIO1PIN_bit.P1_20)
{
CLRBIT(input, 0);
SETBIT(input, 0);
}
if (!FIO1PIN_bit.P1_21)
if (FIO1PIN_bit.P1_21)
{
CLRBIT(input, 1);
SETBIT(input, 1);
}
if (!FIO4PIN_bit.P4_28)
if (FIO4PIN_bit.P4_28)
{
CLRBIT(input, 2);
SETBIT(input, 2);
}
if (!FIO1PIN_bit.P1_19)
if (FIO1PIN_bit.P1_19)
{
CLRBIT(input, 3);
SETBIT(input, 3);
}
if (!FIO1PIN_bit.P1_18)
if (FIO1PIN_bit.P1_18)
{
CLRBIT(input, 4);
SETBIT(input, 4);
}
if (!FIO0PIN_bit.P0_4)
if (FIO0PIN_bit.P0_4)
{
CLRBIT(input, 5);
SETBIT(input, 5);
}
if (!FIO3PIN_bit.P3_25)
if (FIO3PIN_bit.P3_25)
{
CLRBIT(input, 6);
SETBIT(input, 6);
}
if (!FIO3PIN_bit.P3_26)
if (FIO3PIN_bit.P3_26)
{
CLRBIT(input, 7);
SETBIT(input, 7);
}
if (!FIO1PIN_bit.P1_28)
if (FIO1PIN_bit.P1_28)
{
CLRBIT(input, 8);
SETBIT(input, 8);
}
if (!FIO0PIN_bit.P0_26)
if (FIO0PIN_bit.P0_26)
{
CLRBIT(input, 9);
SETBIT(input, 9);
}
if (!FIO0PIN_bit.P0_25)
if (FIO0PIN_bit.P0_25)
{
CLRBIT(input, 10);
SETBIT(input, 10);
}
if (!FIO1PIN_bit.P1_27)
if (FIO1PIN_bit.P1_27)
{
CLRBIT(input, 11);
SETBIT(input, 11);
}
if (!FIO0PIN_bit.P0_9)
if (FIO0PIN_bit.P0_9)
{
CLRBIT(input, 12);
SETBIT(input, 12);
}
if (!FIO2PIN_bit.P2_2)
if (FIO2PIN_bit.P2_2)
{
CLRBIT(input, 13);
SETBIT(input, 13);
}
if (!FIO1PIN_bit.P1_26)
if (FIO1PIN_bit.P1_26)
{
CLRBIT(input, 14);
SETBIT(input, 14);
}
if (!FIO0PIN_bit.P0_7)
if (FIO0PIN_bit.P0_7)
{
CLRBIT(input, 15);
SETBIT(input, 15);
}
if (!FIO0PIN_bit.P0_8)
if (FIO0PIN_bit.P0_8)
{
CLRBIT(input, 16);
SETBIT(input, 16);
}
if (!FIO0PIN_bit.P0_0)
if (FIO0PIN_bit.P0_0)
{
CLRBIT(input, 17);
SETBIT(input, 17);
}
if (!FIO0PIN_bit.P0_5)
if (FIO0PIN_bit.P0_5)
{
CLRBIT(input, 18);
SETBIT(input, 18);
}
if (!FIO0PIN_bit.P0_6)
if (FIO0PIN_bit.P0_6)
{
CLRBIT(input, 19);
SETBIT(input, 19);
}
if (!FIO1PIN_bit.P1_25)
if (FIO1PIN_bit.P1_25)
{
CLRBIT(input, 20);
SETBIT(input, 20);
}
if (!FIO0PIN_bit.P0_10)
if (FIO0PIN_bit.P0_10)
{
CLRBIT(input, 21);
SETBIT(input, 21);
}
return input;
}
CPU_INT32U input_event = 0xFFFFFFFF;
CPU_INT32U prev_input = 0xFFFFFFFF;
CPU_INT32U curr_input = 0xFFFFFFFF;
CPU_INT32U input_event = 0;
CPU_INT32U prev_input = 0;
CPU_INT32U curr_input = 0;
void InputCapture_ISR(void)
{
@ -343,7 +359,7 @@ void InputCapture_ISR(void)
// êóïþðîïðèåìíèê 1
if(TSTBIT(input_event, 0))
{
if (FIO1PIN_bit.P1_20)
if ((!FIO1PIN_bit.P1_20 && cashLevel[0]) || (FIO1PIN_bit.P1_20 && !cashLevel[0]))
{ // ïðèøåë çàäíèé ôðîíò
CPU_INT32U cr=T3CR;
cr -= period_cash[0];
@ -364,7 +380,7 @@ void InputCapture_ISR(void)
// ìîíåòîïðèåìíèê 1
if(TSTBIT(input_event, 1))
{
if (FIO1PIN_bit.P1_21)
if ((!FIO1PIN_bit.P1_21 && coinLevel[0]) || (FIO1PIN_bit.P1_21 && !coinLevel[0]))
{ // ïðèøåë çàäíèé ôðîíò
if ((T3CR-period[0]) > COIN_IMP_MIN_LEN)
{
@ -380,8 +396,8 @@ void InputCapture_ISR(void)
// ñèãíàë ïå÷àòè ÷åêà 1
if(TSTBIT(input_event, 2))
{
if (FIO4PIN_bit.P4_28)
{ // ïðèøåë çàäíèé ôðîíò
if ((FIO4PIN_bit.P4_28 && SignalLevel[0]) || (!FIO4PIN_bit.P4_28 && !SignalLevel[0]))
{
CPU_INT32U cr=T3CR;
cr -= period_signal[0];
@ -389,12 +405,21 @@ void InputCapture_ISR(void)
{
pend_signal_counter[0] = 1;
}
period_signal[0] = T3CR;
}
else
{ // ïðèøåë ïåðåäíèé ôðîíò
period_signal[0] = T3CR;
{
CPU_INT32U cr=T3CR;
cr -= period_signal[0];
if (cr > (signal_pulse[0] - COIN_IMP_SPAN))
{
pend_signal_counter[0] = 0;
}
period_signal[0] = T3CR;
}
}
// ïîñò 2
@ -776,6 +801,7 @@ void InitImpInput (void)
OnChangeCashPulseLen();
OnChangeSinalPulseLen();
OnChangeLevel();
OS_ENTER_CRITICAL();
@ -796,7 +822,7 @@ void InitImpInput (void)
// ñèãíàë ïå÷àòè ÷åêà ïîñò 1
PINSEL9_bit.P4_28 = 0;
PINMODE9_bit.P4_28 = 0;
FIO4DIR_bit.P4_28 = 0;
FIO4DIR_bit.P4_28 = 1;
FIO4MASK_bit.P4_28 = 0;
// êóïþðîïðèåìíèê 2

2
PROJECT/services/coin.h
View File

@ -16,7 +16,7 @@ extern CPU_INT32U GetCashCount(int index);
extern CPU_INT32U GetResetCashCount(int index);
extern void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post);
extern void SetSignalPulseParam(CPU_INT32U pulse, CPU_INT32U post);
extern void SetLevelParam(CPU_INT32U level1, CPU_INT32U level2, CPU_INT32U level3, CPU_INT32U post);
#define BIT(bit) (1UL << (bit))
#define SETBIT(Val,bit) ((Val) |= BIT(bit))

22
settings/sk-mlpc2368.dbgdt
View File

@ -33,8 +33,8 @@
<DisasmHistory/>
<ShowCodeCoverage>0</ShowCodeCoverage><ShowInstrProfiling>0</ShowInstrProfiling></Disassembly>
</Static>
<PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><ShowCodeCoverage>0</ShowCodeCoverage><ShowInstrProfiling>0</ShowInstrProfiling></Disassembly>
<WATCH_1><expressions><item>curr_input</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>133</item></col-widths><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>QuickWatch</Factory></Window></Windows></PreferedWindows></WATCH_1><QuickWatch><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>WATCH_1</Factory></Window></Windows></PreferedWindows><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><QWatchHistory/></QuickWatch></Static>
<Windows>
@ -55,7 +55,7 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd3><Wnd4>
<SelectedTab>0</SelectedTab></Wnd3><Wnd5>
<Tabs>
<Tab>
<Identity>TabID-5416-14108</Identity>
@ -67,30 +67,20 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd4><Wnd5>
<Tabs>
<Tab>
<Identity>TabID-16165-14111</Identity>
<TabName>Disassembly</TabName>
<Factory>Disassembly</Factory>
<Session/>
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd5></Windows>
<SelectedTab>0</SelectedTab></Wnd5><Wnd6><Tabs><Tab><Identity>TabID-6183-21426</Identity><TabName>Watch 1</TabName><Factory>WATCH_1</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd6><Wnd7><Tabs><Tab><Identity>TabID-8548-2328</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd7></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>66</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>157</YPos><SelStart>4537</SelStart><SelEnd>4537</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>133</YPos><SelStart>6348</SelStart><SelEnd>6348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>93</YPos><SelStart>2419</SelStart><SelEnd>2441</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>1007</SelStart><SelEnd>1007</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>29</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>319</YPos><SelStart>10711</SelStart><SelEnd>10711</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>135</YPos><SelStart>5568</SelStart><SelEnd>5568</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>51</SelStart><SelEnd>51</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>29</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><ActiveTab>9</ActiveTab></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\menu\menu.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>1424</SelStart><SelEnd>1424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>85</YPos><SelStart>4578</SelStart><SelEnd>4589</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>20</YPos><SelStart>665</SelStart><SelEnd>665</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1536</SelStart><SelEnd>1564</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>390</YPos><SelStart>11708</SelStart><SelEnd>11708</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>396</YPos><SelStart>16025</SelStart><SelEnd>16025</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>3057</SelStart><SelEnd>3070</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1413</YPos><SelStart>60999</SelStart><SelEnd>60999</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>73</YPos><SelStart>1618</SelStart><SelEnd>1618</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>9426</SelStart><SelEnd>9426</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>70</SelStart><SelEnd>70</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>333</YPos><SelStart>6695</SelStart><SelEnd>6695</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>1747</SelStart><SelEnd>1747</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>126</YPos><SelStart>4563</SelStart><SelEnd>4563</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>151</YPos><SelStart>3796</SelStart><SelEnd>3796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1040</YPos><SelStart>27086</SelStart><SelEnd>27086</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>7515</SelStart><SelEnd>7517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\bsp\iolpc2368.h</Filename><XPos>0</XPos><YPos>3988</YPos><SelStart>104075</SelStart><SelEnd>104075</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\bsp\bsp.c</Filename><XPos>0</XPos><YPos>452</YPos><SelStart>19992</SelStart><SelEnd>19992</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1361</YPos><SelStart>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\console_cmd.c</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>4832</SelStart><SelEnd>4832</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\port\os_cpu_a.asm</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>5732</SelStart><SelEnd>5732</SelEnd></Tab><ActiveTab>27</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-04462d18><key>iaridepm.enu1</key></Toolbar-04462d18></Sizes></Row0><Row1><Sizes><Toolbar-19e66ef0><key>debuggergui.enu1</key></Toolbar-19e66ef0></Sizes></Row1></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>684</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>721346</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>684</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>721346</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>200</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>210305</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-03423360><key>iaridepm.enu1</key></Toolbar-03423360></Sizes></Row0><Row1><Sizes><Toolbar-14614690><key>debuggergui.enu1</key></Toolbar-14614690></Sizes></Row1><Row2><Sizes><Toolbar-14613df8><key>armjlink.enu1</key></Toolbar-14613df8></Sizes></Row2></Top><Left><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>660</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>696109</sizeVertCY></Rect></Wnd5></Sizes></Row0></Left><Right><Row0><Sizes><Wnd6><Rect><Top>-2</Top><Left>-2</Left><Bottom>660</Bottom><Right>302</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>237500</sizeVertCX><sizeVertCY>696109</sizeVertCY></Rect></Wnd6></Sizes></Row0><Row1><Sizes><Wnd7><Rect><Top>-2</Top><Left>300</Left><Bottom>660</Bottom><Right>500</Right><x>300</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>696109</sizeVertCY></Rect></Wnd7></Sizes></Row1></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>200</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>210305</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Project>

8
settings/sk-mlpc2368.dni
View File

@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
Checksum=1393967486
Checksum=-1718622406
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0
@ -150,12 +150,12 @@ UseAuto=0
TypeViolation=1
UnspecRange=1
ActionState=1
[watch_formats]
Fmt0={W}0:curr_input 4 0
[Disassemble mode]
mode=0
[Breakpoints2]
Bp0=_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\services\coin.c}.242.4" 0 0 1 "" 0 "" 0
Bp1=_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\services\coin.c}.590.4" 0 0 1 "" 0 "" 0
Count=2
Count=0
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""

10
settings/sk-mlpc2368.wsdt
View File

@ -20,7 +20,7 @@
<Column0>162</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Find-in-Files><ColumnWidth0>440</ColumnWidth0><ColumnWidth1>62</ColumnWidth1><ColumnWidth2>754</ColumnWidth2></Find-in-Files><TerminalIO/></Static>
<Find-in-Files><ColumnWidth0>440</ColumnWidth0><ColumnWidth1>62</ColumnWidth1><ColumnWidth2>754</ColumnWidth2></Find-in-Files><TerminalIO/><Debug-Log><ColumnWidth0>22</ColumnWidth0><ColumnWidth1>1219</ColumnWidth1></Debug-Log></Static>
<Windows>
@ -32,7 +32,7 @@
<Factory>Build</Factory>
<Session/>
</Tab>
<Tab><Identity>TabID-28963-15244</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs>
<Tab><Identity>TabID-28963-15244</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-3677-8150</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
@ -42,7 +42,7 @@
<Factory>Workspace</Factory>
<Session>
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/app</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/data</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/libs</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/menu</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/services</ExpandedNode></NodeDict></Session>
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/app</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/data</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers/keyboard</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/libs</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/menu</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/services</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
@ -52,14 +52,14 @@
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>1424</SelStart><SelEnd>1424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>85</YPos><SelStart>4578</SelStart><SelEnd>4589</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>20</YPos><SelStart>665</SelStart><SelEnd>665</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1536</SelStart><SelEnd>1564</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>390</YPos><SelStart>11708</SelStart><SelEnd>11708</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>396</YPos><SelStart>16025</SelStart><SelEnd>16025</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>3057</SelStart><SelEnd>3070</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1413</YPos><SelStart>60999</SelStart><SelEnd>60999</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>73</YPos><SelStart>1618</SelStart><SelEnd>1618</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>9426</SelStart><SelEnd>9426</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>70</SelStart><SelEnd>70</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>42</YPos><SelStart>1870</SelStart><SelEnd>1870</SelEnd></Tab><ActiveTab>16</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>251</YPos><SelStart>7511</SelStart><SelEnd>7511</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>126</YPos><SelStart>4563</SelStart><SelEnd>4563</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>151</YPos><SelStart>3796</SelStart><SelEnd>3796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1040</YPos><SelStart>27086</SelStart><SelEnd>27086</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>7515</SelStart><SelEnd>7517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\bsp\iolpc2368.h</Filename><XPos>0</XPos><YPos>787</YPos><SelStart>16986</SelStart><SelEnd>16986</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$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>20</YPos><SelStart>665</SelStart><SelEnd>665</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>43</YPos><SelStart>1736</SelStart><SelEnd>1736</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>390</YPos><SelStart>11708</SelStart><SelEnd>11708</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>3057</SelStart><SelEnd>3070</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>731</YPos><SelStart>31919</SelStart><SelEnd>31939</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>688</SelStart><SelEnd>702</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>656</YPos><SelStart>29508</SelStart><SelEnd>29508</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>9426</SelStart><SelEnd>9426</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>697</SelStart><SelEnd>697</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>386</YPos><SelStart>8788</SelStart><SelEnd>8788</SelEnd></Tab><ActiveTab>14</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>375</YPos><SelStart>12385</SelStart><SelEnd>13040</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>25</YPos><SelStart>1363</SelStart><SelEnd>1363</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>151</YPos><SelStart>3796</SelStart><SelEnd>3796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1040</YPos><SelStart>27086</SelStart><SelEnd>27086</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>7515</SelStart><SelEnd>7517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>470</SelStart><SelEnd>470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>85</YPos><SelStart>4701</SelStart><SelEnd>4701</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>14</YPos><SelStart>928</SelStart><SelEnd>928</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1359</YPos><SelStart>56869</SelStart><SelEnd>56869</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-03923a58><key>iaridepm.enu1</key></Toolbar-03923a58></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>504</Bottom><Right>253</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>146</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210072</sizeHorzCY><sizeVertCX>199219</sizeVertCX><sizeVertCY>728058</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>146</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>148</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>212950</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>210072</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-03423360><key>iaridepm.enu1</key></Toolbar-03423360></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>760</Bottom><Right>253</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>146</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>153523</sizeHorzCY><sizeVertCX>199219</sizeVertCX><sizeVertCY>801262</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>146</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>148</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>155626</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>153523</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

39
settings/sk-mlpc2368_Flash Positive.jlink Normal file
View File

@ -0,0 +1,39 @@
[BREAKPOINTS]
ForceImpTypeAny = 0
ShowInfoWin = 1
EnableFlashBP = 2
BPDuringExecution = 0
[CFI]
CFISize = 0x00
CFIAddr = 0x00
[CPU]
MonModeVTableAddr = 0xFFFFFFFF
MonModeDebug = 0
MaxNumAPs = 0
LowPowerHandlingMode = 0
OverrideMemMap = 0
AllowSimulation = 1
ScriptFile=""
[FLASH]
CacheExcludeSize = 0x00
CacheExcludeAddr = 0x00
MinNumBytesFlashDL = 0
SkipProgOnCRCMatch = 1
VerifyDownload = 1
AllowCaching = 1
EnableFlashDL = 2
Override = 0
Device="ARM7"
[GENERAL]
WorkRAMSize = 0x00
WorkRAMAddr = 0x00
RAMUsageLimit = 0x00
[SWO]
SWOLogFile=""
[MEM]
RdOverrideOrMask = 0x00
RdOverrideAndMask = 0xFFFFFFFF
RdOverrideAddr = 0xFFFFFFFF
WrOverrideOrMask = 0x00
WrOverrideAndMask = 0xFFFFFFFF
WrOverrideAddr = 0xFFFFFFFF

6967
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff

8
sk-mlpc2368.ewd
View File

@ -1799,7 +1799,7 @@
</option>
<option>
<name>MemFile</name>
<state></state>
<state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\iolpc2368.ddf</state>
</option>
<option>
<name>RunToEnable</name>
@ -1839,11 +1839,11 @@
</option>
<option>
<name>OCDynDriverList</name>
<state>ARMSIM_ID</state>
<state>JLINK_ID</state>
</option>
<option>
<name>OCLastSavedByProductVersion</name>
<state></state>
<state>6.21.1.52845</state>
</option>
<option>
<name>OCDownloadAttachToProgram</name>
@ -1871,7 +1871,7 @@
</option>
<option>
<name>FlashLoadersV3</name>
<state></state>
<state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512k2.board</state>
</option>
<option>
<name>OCImagesSuppressCheck1</name>