почти последние исправления

This commit is contained in:
dimoniche 2019-08-06 22:27:27 +03:00
parent a88e674556
commit 46590d83f3
7 changed files with 67 additions and 80 deletions

View File

@ -22,16 +22,13 @@
CPU_INT32U SystemTime;
CPU_INT32U money_timestamp[COUNT_POST + COUNT_VACUUM];
CPU_INT08U ChannelsState[COUNT_POST + COUNT_VACUUM];
//CPU_INT08U ChannelsState[COUNT_POST + COUNT_VACUUM];
#define CHANNEL_STATE_FREE 0
#define CHANNEL_STATE_BUSY 1
#define CHANNEL_STATE_DISABLED 2
CPU_INT32U ChannelsCounters[COUNT_POST + COUNT_VACUUM];
//CPU_INT32U ChannelsCounters[COUNT_POST + COUNT_VACUUM];
CPU_INT32U ChannelsPayedTime[COUNT_POST + COUNT_VACUUM];
CPU_INT32U incas_bill_nom_counter[24];
CPU_INT32U incas_common_bill_counter;
#define USER_QUERY_LEN 64
OS_STK UserTaskStk[USER_TASK_STK_SIZE];
@ -86,8 +83,7 @@ void AddOutPulses(int count, int len_ms)
#endif
int drawPostInfo[COUNT_POST + COUNT_VACUUM] = {0,0,0,0,0,0,0,0};
int currentPosition = 0;
static int currentPosition = 0;
typedef enum {
@ -98,15 +94,14 @@ typedef enum {
} washStateEnum;
washStateEnum wash_State[COUNT_POST + COUNT_VACUUM] = {waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney};
static washStateEnum wash_State[COUNT_POST + COUNT_VACUUM] = {waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney, waitMoney};
int countSecWait[COUNT_POST + COUNT_VACUUM] = {0, 0, 0, 0, 0, 0, 0, 0};
CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
CPU_INT32U cash_enable[COUNT_POST];
CPU_INT32U bank_enable[COUNT_POST];
CPU_INT32U enable_signal[COUNT_POST];
CPU_INT32U fiscal_enable;
static int countSecWait[COUNT_POST + COUNT_VACUUM] = {0, 0, 0, 0, 0, 0, 0, 0};
static CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U cash_enable[COUNT_POST];
static CPU_INT32U bank_enable[COUNT_POST];
static CPU_INT32U enable_signal[COUNT_POST];
static CPU_INT32U fiscal_enable;
void DrawMenu(void)
{
@ -230,9 +225,6 @@ void UserAppTask(void *p_arg)
if (accmoney > 0)
{
// åñòü ïðèíÿòûå äåíüãè
drawPostInfo[post] = 1;
if(wash_State[post] != washing)
{
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû, íî íå â ðåæèìå ìîéêè
@ -253,10 +245,6 @@ void UserAppTask(void *p_arg)
money_timestamp[post] = OSTimeGet();
}
}
else
{
drawPostInfo[post] = 0;
}
if(countSecWait[post])
{
@ -679,10 +667,10 @@ void UserStartupFunc(void)
OSTaskCreate(UserAppTask, (void *)0, (OS_STK *)&UserTaskStk[USER_TASK_STK_SIZE-1], USER_TASK_PRIO);
}
InitConsole();
//InitConsole();
#ifdef BOARD_CENTRAL_CFG
InitHostApp();
//InitHostApp();
#endif
SystemTime = GetTimeSec();
@ -723,6 +711,14 @@ void UserPrintMoneyMenu(int post)
strcpy(buf, " ");
PrintUserMenuStr(buf, 0);
accmoney = GetAcceptedMoney(post) + GetAcceptedBankMoney(post);
if((wash_State[post] == waitMoney) && (accmoney > 0))
{
// åñëè áûëà ïåðåçàãðóçêà è åñòü äåíüãè - ñðàçó ïåðåõîäèì íà îæèäàíèå äåíåã
wash_State[post] = insertMoney;
}
if(wash_State[post] == waitMoney)
{
sprintf(buf, " Âíåñèòå äåíüãè");
@ -733,8 +729,6 @@ void UserPrintMoneyMenu(int post)
}
else if(wash_State[post] == insertMoney)
{
accmoney = GetAcceptedMoney(post) + GetAcceptedBankMoney(post);
sprintf(buf, " Âíåñèòå äåíüãè");
PrintUserMenuStr(buf, 1);
@ -757,7 +751,7 @@ void UserPrintMoneyMenu(int post)
sprintf(buf, " ");
PrintUserMenuStr(buf, 2);
}
if(post < COUNT_POST)
sprintf(buf, " Ïîñò %d", post + 1);
else if(post < COUNT_POST + COUNT_VACUUM)

View File

@ -5,13 +5,10 @@
#define CONSOLE_TCP_DEFAULT_PORT 10000
extern CPU_INT32U incas_bill_nom_counter[24];
extern CPU_INT32U incas_common_bill_counter;
#define KBRD_TASK_STK_SIZE 128
#define USER_TASK_STK_SIZE 384
#define USER_TASK_STK_SIZE 512
#define MENU_TASK_STK_SIZE 384
#define COIN_TASK_STK_SIZE 128
#define COIN_TASK_STK_SIZE 384
#define VALIDATOR_TASK_STK_SIZE 384
#define FISCAL_TASK_STK_SIZE 384
#define MODEM_TASK_STK_SIZE 768

View File

@ -30,7 +30,7 @@ CPU_INT08U const CoinPulseLenName[] = "
void OnChangeCoinPulseLen()
{
CPU_INT32U pulse, pause;
for(int post = 0; post < COUNT_POST; post++)
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
GetData(&CoinPulseLenDesc, &pulse, post, DATA_FLAG_DIRECT_INDEX);
GetData(&CoinPauseLenDesc, &pause, post, DATA_FLAG_DIRECT_INDEX);
@ -43,7 +43,7 @@ TDataDescStruct const CoinPulseLenDesc = {
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // размер массива
COUNT_POST + COUNT_VACUUM, // размер массива
&CoinIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, coin_pulse_len), // указатель на переменную или адрес FRAM
(void*)&CoinPulseLenRange, // указатель на границы параметра
@ -137,7 +137,7 @@ TDataDescStruct const CoinPauseLenDesc = {
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // размер массива
COUNT_POST + COUNT_VACUUM, // размер массива
&CoinIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, coin_pause_len), // указатель на переменную или адрес FRAM
(void*)&CoinPauseLenRange, // указатель на границы параметра
@ -250,7 +250,7 @@ TDataDescStruct const EnableValidatorDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableValidatorList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -274,7 +274,7 @@ TDataDescStruct const EnableBankDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableValidatorList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -503,7 +503,7 @@ TDataDescStruct const EnableSignalDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableSignalList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1
0
};
/*************************************
@ -627,7 +627,7 @@ TDataDescStruct const CoinPerPulseDesc = {
DATA_NO_INDEX, // признак индексного параметра (список строк)
NULL, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
10 // значение по умолчанию
};
/*************************************
@ -817,7 +817,7 @@ TDataDescStruct const PrintTimeoutAfterDesc = {
DATA_NO_INDEX, // признак индексного параметра (список строк)
NULL, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
60 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -935,7 +935,7 @@ TDataDescStruct const CashLevelDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -956,7 +956,7 @@ TDataDescStruct const BankLevelDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -977,7 +977,7 @@ TDataDescStruct const CoinLevelDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
LevelList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1 // значение по умолчанию
0 // значение по умолчанию
};
/*************************************
@ -1049,7 +1049,7 @@ TDataDescStruct const EnableFiscalDesc = {
DATA_IS_INDEX, // признак индексного параметра (список строк)
EnableFiscalList, // указатель на список строк для индексного параметра
DATA_INIT_DISABLE,
1
0
};
/*************************************

View File

@ -11,9 +11,9 @@ OS_STK CoinTaskStk[COIN_TASK_STK_SIZE];
void InitImpInput(void);
CPU_INT32U CoinImpCounter[COUNT_POST + COUNT_VACUUM];
CPU_INT32U CashImpCounter[COUNT_POST + COUNT_VACUUM];
CPU_INT32U BankImpCounter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U CoinImpCounter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U CashImpCounter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U BankImpCounter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U coin_pulse[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U coin_pause[COUNT_POST + COUNT_VACUUM];
@ -35,12 +35,12 @@ static char pend_upsignal_counter[COUNT_POST + COUNT_VACUUM];
static char pend_downsignal_counter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U pend_signal_timestamp[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];
CPU_INT32U bankLevel[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U cashLevel[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U coinLevel[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U SignalLevel[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U bankLevel[COUNT_POST + COUNT_VACUUM];
void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
void SetCoinPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
@ -51,7 +51,7 @@ void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
OS_EXIT_CRITICAL();
}
void SetCoinPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
@ -101,22 +101,22 @@ void SetLevelParam(CPU_INT32U level1, CPU_INT32U level2, CPU_INT32U level3, CPU_
OS_EXIT_CRITICAL();
}
static CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U cash_enable[COUNT_POST];
static CPU_INT32U enable_signal[COUNT_POST];
static CPU_INT32U bank_enable[COUNT_POST];
static CPU_INT32U last_coin_count[COUNT_POST];
static CPU_INT32U last_coin_time[COUNT_POST];
static CPU_INT32U last_cash_count[COUNT_POST];
static CPU_INT32U last_cash_time[COUNT_POST];
static CPU_INT32U last_bank_count[COUNT_POST];
static CPU_INT32U last_bank_time[COUNT_POST];
void CoinTask(void *p_arg)
{
CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
CPU_INT32U cash_enable[COUNT_POST];
CPU_INT32U enable_signal[COUNT_POST];
CPU_INT32U bank_enable[COUNT_POST];
CPU_INT32U last_coin_count[COUNT_POST];
CPU_INT32U last_coin_time[COUNT_POST];
CPU_INT32U last_cash_count[COUNT_POST];
CPU_INT32U last_cash_time[COUNT_POST];
CPU_INT32U last_bank_count[COUNT_POST];
CPU_INT32U last_bank_time[COUNT_POST];
CPU_INT32U last_settings_time = 0;
while(1)
@ -532,9 +532,9 @@ CPU_INT32U input_register()
return input;
}
CPU_INT32U input_event = 0;
CPU_INT32U prev_input = 0;
CPU_INT32U curr_input = 0;
static CPU_INT32U input_event = 0;
static CPU_INT32U prev_input = 0;
static CPU_INT32U curr_input = 0;
void InputCapture_ISR(void)
{
@ -1262,6 +1262,8 @@ void InitInputPorts()
else PINMODE0_bit.P0_1 = 0;
FIO0DIR_bit.P0_1 = 0;
FIO0MASK_bit.P0_1 = 0;
prev_input = curr_input = input_register();
}
// èíèöèàëèçàöèÿ èìïóëüñíûõ âõîäîâ
@ -1311,8 +1313,6 @@ void InitImpInput (void)
VICINTENABLE = (1 << VIC_TIMER3);
T3IR = 0xFF;
prev_input = curr_input = input_register();
OS_EXIT_CRITICAL();
}

View File

@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
Checksum=-853996095
Checksum=839030362
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0

View File

@ -18,7 +18,7 @@
<Column0>202</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>157</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/><Debug-Log><ColumnWidth0>22</ColumnWidth0><ColumnWidth1>1219</ColumnWidth1></Debug-Log></Static>
<Windows>
@ -52,14 +52,14 @@
<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\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\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\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2091</SelStart><SelEnd>2091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>3764</SelStart><SelEnd>3785</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>503</SelStart><SelEnd>526</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</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>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1151</YPos><SelStart>46280</SelStart><SelEnd>46280</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>369</YPos><SelStart>11593</SelStart><SelEnd>11593</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>695</YPos><SelStart>18058</SelStart><SelEnd>18058</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>390</YPos><SelStart>12067</SelStart><SelEnd>12067</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</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\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>3540</SelStart><SelEnd>3540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>15135</SelStart><SelEnd>15135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2214</YPos><SelStart>99560</SelStart><SelEnd>99560</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>962</YPos><SelStart>23411</SelStart><SelEnd>23416</SelEnd></Tab><ActiveTab>22</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>429</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3102</SelStart><SelEnd>3102</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>299</SelStart><SelEnd>299</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$\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\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\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\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1151</YPos><SelStart>46280</SelStart><SelEnd>46280</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>698</YPos><SelStart>22654</SelStart><SelEnd>22654</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>695</YPos><SelStart>18058</SelStart><SelEnd>18058</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>390</YPos><SelStart>11771</SelStart><SelEnd>11771</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>3540</SelStart><SelEnd>3540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>15135</SelStart><SelEnd>15135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>24</YPos><SelStart>1308</SelStart><SelEnd>1308</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>42</YPos><SelStart>2813</SelStart><SelEnd>2813</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>429</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3102</SelStart><SelEnd>3102</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>547</SelStart><SelEnd>561</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>777</SelStart><SelEnd>777</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>4402</SelStart><SelEnd>4402</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>236</SelStart><SelEnd>248</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>87</YPos><SelStart>1659</SelStart><SelEnd>1659</SelEnd></Tab><ActiveTab>23</ActiveTab><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-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>710</Bottom><Right>293</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>230469</sizeVertCX><sizeVertCY>748686</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>198</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>208202</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>710</Bottom><Right>248</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>748686</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>198</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>208202</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

View File

@ -862,10 +862,6 @@
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
<file> 64 18 7 9 45 10 78 1 11 50 88 68 51 80 71 48 84 92 16 61 30 12 22 38 40 52 43 91 77 83 67 65 56 89 46 62 59</file>
</tool>
<tool>
<name>ICCARM</name>
<file> 64 18 7 9 45 10 78 1 11 50 88 68 51 80 71 48 84 92 16 61 30 12 22 38 40 52 43 91 77 83 67 65 56 89 46 62 59</file>