удалил лишнее

This commit is contained in:
dimoniche 2019-06-03 00:44:27 +03:00
parent c6472e9efc
commit 17e8233316
7 changed files with 37 additions and 119 deletions

View File

@ -21,7 +21,7 @@
//#define _DEBUG_MONEY
CPU_INT32U SystemTime;
CPU_INT32U money_timestamp[COUNT_POST];
CPU_INT32U money_timestamp[COUNT_POST + COUNT_VACUUM];
CPU_INT08U EnabledChannelsNum;
CPU_INT08U RecentChannel;
CPU_INT08U UserMenuState;
@ -94,7 +94,6 @@ void AddOutPulses(int count, int len_ms)
void UserAppTask(void *p_arg)
{
CPU_INT32U print_timeout;
CPU_INT32U print_mode;
CPU_INT32U accmoney;
int event;
CPU_BOOLEAN dontRedraw = DEF_FALSE;
@ -102,22 +101,6 @@ void UserAppTask(void *p_arg)
#ifdef BOARD_CENTRAL_CFG
static CPU_INT08U fr_conn_ctr = 0;
// {
// CPU_INT32U m=0;
// GetData(&AcceptedMoneyDesc, &m, 0, DATA_FLAG_DIRECT_INDEX);
// if (m)
// {
// EnabledChannelsNum = 0;
// for (CPU_INT08U i=0; i<CHANNELS_NUM; i++)
// {
// CPU_INT32U en = 0;
// GetData(&EnableChannelDesc, &en, i, DATA_FLAG_DIRECT_INDEX);
// if (en) {EnabledChannelsNum++;}
// }
// UserMenuState = USER_STATE_ACCEPT_MONEY;
// }
// }
incassation = 0;
was_critical_error = 0;
@ -183,7 +166,7 @@ void UserAppTask(void *p_arg)
dontRedraw = DEF_FALSE;
for(int post = 0; post < COUNT_POST; post++)
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
accmoney = GetAcceptedMoney(post);
@ -196,42 +179,9 @@ void UserAppTask(void *p_arg)
LED_OK_ON();
CheckFiscalStatus();
GetData(&PrintModeDesc, &print_mode, 0, DATA_FLAG_SYSTEM_INDEX);
if (print_mode == 0)
{
// åñëè íàñòðîåíà ïå÷àòü ÏÎ ÒÀÉÌÀÓÒÓ
GetData(&PrintTimeoutDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if (labs(OSTimeGet() - money_timestamp[post]) > 1000UL * print_timeout)
{
UserPrintPrintBillMenu(post);
RefreshMenu();
// íàïå÷àòàåì ÷åê
if (IsFiscalConnected())
{
if (PrintFiscalBill(accmoney) == 0)
{
SaveEventRecord(RecentChannel, JOURNAL_EVENT_PRINT_BILL, GetTimeSec());
}
}
IncCounter(RecentChannel, ChannelsPayedTime[RecentChannel], accmoney);
SetAcceptedMoney(0, post);
OSTimeDly(1000);
// ïîâåñèì ìåíþ "ÑÏÀÑÈÁÎ"
if (IsFiscalConnected())
{
UserPrintThanksMenu(post);
RefreshMenu();
}
OSTimeDly(1000);
LED_OK_OFF();
}
}
else if (print_mode == 1)
{
// åñëè íàñòðîåíà ïå÷àòü ÏÎ ÊÍÎÏÊÅ, æäåì òàéìàóò îòìåíû
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû
GetData(&PrintTimeoutAfterDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if (labs(OSTimeGet() - money_timestamp[post]) > 1000UL * print_timeout)
{
@ -269,6 +219,8 @@ void UserAppTask(void *p_arg)
case EVENT_COIN_INSERTED_POST4:
case EVENT_COIN_INSERTED_POST5:
case EVENT_COIN_INSERTED_POST6:
case EVENT_COIN_INSERTED_VACUUM1:
case EVENT_COIN_INSERTED_VACUUM2:
{
CPU_INT32U cpp = 1;
CPU_INT32U money, accmoney;
@ -381,48 +333,6 @@ void UserAppTask(void *p_arg)
RefreshMenu();
break;
}
// --------------------------
// íàõîäèìñÿ â ðàáî÷åì ðåæèìå
// --------------------------
GetData(&PrintModeDesc, &print_mode, 0, DATA_FLAG_SYSTEM_INDEX);
for(int post = 0; post < COUNT_POST; post++)
{
if (print_mode == 1)
{
// ïîëüçîâàòåëü âíåñ äåíüãè è íàæàë ÑÒÀÐÒ + ðåæèì ïå÷àòè ÏÎ ÊÍÎÏÊÅ
CPU_INT32U accmoney = GetAcceptedMoney(post);
if (accmoney > 0)
{
UserPrintPrintBillMenu(post);
RefreshMenu();
// íàïå÷àòàåì ÷åê
if (IsFiscalConnected())
{
if (PrintFiscalBill(accmoney) == 0)
{
SaveEventRecord(RecentChannel, JOURNAL_EVENT_PRINT_BILL, GetTimeSec());
}
}
IncCounter(RecentChannel, ChannelsPayedTime[RecentChannel], accmoney);
SetAcceptedMoney(0, post);
OSTimeDly(1000);
// ïîâåñèì ìåíþ "ÑÏÀÑÈÁÎ"
if (IsFiscalConnected())
{
UserPrintThanksMenu(post);
RefreshMenu();
}
OSTimeDly(1000);
LED_OK_OFF();
}
}
}
break;
case EVENT_CASH_PRINT_CHECK_POST1:
@ -433,6 +343,7 @@ void UserAppTask(void *p_arg)
case EVENT_CASH_PRINT_CHECK_POST6:
case EVENT_CASH_PRINT_CHECK_VACUUM1:
case EVENT_CASH_PRINT_CHECK_VACUUM2:
if (GetMode() == MODE_WORK) // ïå÷àòàåì òîëüêî â ðàáî÷åì ðåæèìå
{
int number_post = event - EVENT_CASH_PRINT_CHECK_POST1;
@ -453,7 +364,7 @@ void UserAppTask(void *p_arg)
}
}
//IncCounter(RecentChannel, ChannelsPayedTime[RecentChannel], accmoney);
IncCounter(RecentChannel, ChannelsPayedTime[RecentChannel], accmoney);
SetAcceptedMoney(0, number_post);
OSTimeDly(1000);
@ -469,12 +380,16 @@ void UserAppTask(void *p_arg)
}
}
break;
case EVENT_KEY_F1:
PostUserEvent(EVENT_CASH_INSERTED_POST1);
break;
case EVENT_KEY_F2:
PostUserEvent(EVENT_CASH_INSERTED_POST2);
break;
case EVENT_KEY_F3:
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1);
break;
#endif
default:
break;
@ -599,8 +514,10 @@ void UserPrintMoneyMenu(int post)
if(post < COUNT_POST)
sprintf(buf, " Ïîñò %d", post + 1);
else
else if(post < COUNT_POST + COUNT_VACUUM)
sprintf(buf, "Ïûëåñîñ %d", post + 1 - COUNT_POST);
else
sprintf(buf, " ");
PrintUserMenuStr(buf, 3);
}

View File

@ -29,6 +29,9 @@ typedef struct{
#define JOURNAL_EVENT_MONEY_COIN_POST4 10 // событие получения монеты (кол-во рублей) пост 4
#define JOURNAL_EVENT_MONEY_COIN_POST5 11 // событие получения монеты (кол-во рублей) пост 5
#define JOURNAL_EVENT_MONEY_COIN_POST6 12 // событие получения монеты (кол-во рублей) пост 6
// здесь добавить еще два события от пылесосов
//#define JOURNAL_EVENT_MONEY_COIN_VACUUM1 13 // событие получения монеты (кол-во рублей) пылесос 1
//#define JOURNAL_EVENT_MONEY_COIN_VACUUM1 14 // событие получения монеты (кол-во рублей) пылесос 2
#define JOURNAL_EVENT_START_SESSION 13 // событие начала сеанса
#define JOURNAL_EVENT_END_SESSION 14 // событие конца сеанса

View File

@ -622,7 +622,7 @@ TDataDescStruct const EnableCoinDesc = {
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // ðàçìåð ìàññèâà
COUNT_POST+ + COUNT_VACUUM,// ðàçìåð ìàññèâà
&CoinIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.EnableCoinAcceptor), // указатель на переменную или адрес FRAM
(void*)&EnableCoinRange, // указатель на границы параметра
@ -646,7 +646,7 @@ TDataDescStruct const CoinPerPulseDesc = {
DATA_TYPE_ULONG, // тип параметра
DATA_LOC_FRAM, // расположение параметра
DATA_IS_ARRAY, // признак массива
COUNT_POST, // ðàçìåð ìàññèâà
COUNT_POST+COUNT_VACUUM, // ðàçìåð ìàññèâà
&CoinIndexDesc, // указатель на десриптор индекса массива
(void*)offsetof(TFramMap, DeviceConfig.CoinPerPulse), // указатель на переменную или адрес FRAM
(void*)&CoinPerPulseRange, // указатель на границы параметра

View File

@ -60,18 +60,16 @@ typedef struct{
}TChannelConfig;
// ñòðóêòóðà êîíôèãóðàöèè àïïàðàòóðû
typedef struct{
CPU_INT32U EnableValidator[COUNT_POST];
CPU_INT32U EnableCoinAcceptor[COUNT_POST];
CPU_INT32U EnableValidator[COUNT_POST + COUNT_VACUUM];
CPU_INT32U EnableCoinAcceptor[COUNT_POST + COUNT_VACUUM];
CPU_INT32U EnableModem;
CPU_INT32U EnableFiscal;
CPU_INT32U EnableFiscalDayClear;
CPU_INT32U ServiceName;
CPU_INT32U CoinPerPulse[COUNT_POST]; // öåíà èìïóëüñà ìîíåòîïðèåìíèêà
CPU_INT32U CoinPerPulse[COUNT_POST + COUNT_VACUUM]; // öåíà èìïóëüñà ìîíåòîïðèåìíèêà
CPU_INT32U BillFormat;
CPU_INT32U DisableFiscalErrors; // îòêëþ÷åíèå ðåàêöèè íà îøèáêè ÔÐ
@ -82,8 +80,8 @@ typedef struct{
CPU_INT32U ClearJournalAfterSend;
CPU_INT32U StatSendHourMin;
CPU_INT32U CashMode[COUNT_POST];
CPU_INT32U CashPerPulse[COUNT_POST]; // öåíà èìïóëüñà êóïþðíèêà
CPU_INT32U CashMode[COUNT_POST + COUNT_VACUUM];
CPU_INT32U CashPerPulse[COUNT_POST + COUNT_VACUUM]; // öåíà èìïóëüñà êóïþðíèêà
CPU_INT32U PrintTimeout;
CPU_INT32U PrintTimeoutAfter;

View File

@ -50,8 +50,8 @@ typedef struct
CPU_INT08U manual_service_flag[4];
char manual_service_name[32];
CPU_INT32U cash_pulse_len[COUNT_POST];
CPU_INT32U cash_pause_len[COUNT_POST];
CPU_INT32U cash_pulse_len[COUNT_POST + COUNT_VACUUM];
CPU_INT32U cash_pause_len[COUNT_POST + COUNT_VACUUM];
CPU_INT32U TaxFormat;
CPU_INT32U SubjSell;

View File

@ -12,13 +12,13 @@ OS_STK CoinTaskStk[COIN_TASK_STK_SIZE];
void InitImpInput(void);
CPU_INT32U CoinImpCounter[COUNT_POST + COUNT_VACUUM];
CPU_INT32U CashImpCounter[COUNT_POST];
CPU_INT32U CashImpCounter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U cash_pulse = 5000;
static CPU_INT32U cash_pause = 2000;
static char pend_cash_counter[COUNT_POST];
static CPU_INT32U pend_cash_timestamp[COUNT_POST];
static char pend_cash_counter[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U pend_cash_timestamp[COUNT_POST + COUNT_VACUUM];
void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause)
{
@ -36,8 +36,8 @@ void CoinTask(void *p_arg)
CPU_INT32U enable_coin;
CPU_INT32U cash_mode;
CPU_INT32U cash_enable;
CPU_INT32U last_cash_count[COUNT_POST];
CPU_INT32U last_cash_time[COUNT_POST];
CPU_INT32U last_cash_count[COUNT_POST + COUNT_VACUUM];
CPU_INT32U last_cash_time[COUNT_POST + COUNT_VACUUM];
CPU_INT32U last_settings_time = 0;
while(1)
@ -179,7 +179,7 @@ CPU_INT32U GetResetCashCount(int index)
// èíèöèàëèçàöèÿ ìîíåòîïðèåìíèêà
void InitCoin(void)
{
for(int i = 0; i < COUNT_POST; i++)
for(int i = 0; i < COUNT_POST + COUNT_VACUUM; i++)
{
CoinImpCounter[i] = 0;
CashImpCounter[i] = 0;
@ -193,8 +193,8 @@ void InitCoin(void)
void InputCapture_ISR(void)
{
static CPU_INT32U period[COUNT_POST + 2];
static CPU_INT32U period_cash[COUNT_POST];
static CPU_INT32U period[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U period_cash[COUNT_POST + COUNT_VACUUM];
static CPU_INT32U T3CR = 0;
// íàðàùèâàåì òèêè

View File

@ -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$\PROJECT\app\control.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>49</SelStart><SelEnd>49</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>378</YPos><SelStart>10205</SelStart><SelEnd>10205</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$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2603</YPos><SelStart>122054</SelStart><SelEnd>122054</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>206</YPos><SelStart>6049</SelStart><SelEnd>6049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>29</YPos><SelStart>1530</SelStart><SelEnd>1530</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>92</YPos><SelStart>2345</SelStart><SelEnd>2345</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$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>328</YPos><SelStart>9146</SelStart><SelEnd>9146</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>257</SelStart><SelEnd>269</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1809</YPos><SelStart>71012</SelStart><SelEnd>71012</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\app\app_serv.c</Filename><XPos>0</XPos><YPos>679</YPos><SelStart>18098</SelStart><SelEnd>18098</SelEnd></Tab><ActiveTab>13</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>192</YPos><SelStart>1009</SelStart><SelEnd>1009</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>259</YPos><SelStart>8192</SelStart><SelEnd>8192</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>4</YPos><SelStart>414</SelStart><SelEnd>414</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>1710</SelStart><SelEnd>1740</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>17</YPos><SelStart>1678</SelStart><SelEnd>1678</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\menu\menu.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>1424</SelStart><SelEnd>1424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>49</SelStart><SelEnd>49</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>378</YPos><SelStart>10205</SelStart><SelEnd>10205</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$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2608</YPos><SelStart>122035</SelStart><SelEnd>122035</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>206</YPos><SelStart>6049</SelStart><SelEnd>6049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>29</YPos><SelStart>1530</SelStart><SelEnd>1530</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>92</YPos><SelStart>2345</SelStart><SelEnd>2345</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$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>328</YPos><SelStart>9146</SelStart><SelEnd>9146</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>257</SelStart><SelEnd>269</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1809</YPos><SelStart>71012</SelStart><SelEnd>71012</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\app\app_serv.c</Filename><XPos>0</XPos><YPos>496</YPos><SelStart>15112</SelStart><SelEnd>15112</SelEnd></Tab><ActiveTab>13</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>370</YPos><SelStart>4087</SelStart><SelEnd>4087</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>259</YPos><SelStart>8192</SelStart><SelEnd>8192</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>38</YPos><SelStart>1011</SelStart><SelEnd>1011</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>1277</SelStart><SelEnd>1304</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>8</YPos><SelStart>1607</SelStart><SelEnd>1607</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-04462d18><key>iaridepm.enu1</key></Toolbar-04462d18></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>742</Bottom><Right>253</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>199219</sizeVertCX><sizeVertCY>782334</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>164</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>166</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>174553</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>210305</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-04462d18><key>iaridepm.enu1</key></Toolbar-04462d18></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>253</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>210305</sizeHorzCY><sizeVertCX>199219</sizeVertCX><sizeVertCY>624606</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>314</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>316</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>332282</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>210305</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>