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

очередные правки

Browse Source
This commit is contained in:
dimoniche 2019-07-04 00:05:41 +03:00
parent 8568d3527e
commit f271646d86
5 changed files with 85 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
PROJECT/app/app_serv.c
View File

@ -173,47 +173,34 @@ void UserAppTask(void *p_arg)
break;
}
// åñëè åñòü îøèáêè, íå ðàáîòàåì
if (TstCriticalErrors())
{
UserPrintErrorMenu();
RefreshMenu();
// âûêëþ÷èì ïðèåì äåíåã
if (was_critical_error == 0)
{
CoinDisable();
was_critical_error = 1;
}
break;
}
// âêëþ÷èì çàíîâî ïðèåì äåíåã, åñëè áûëà îøèáêà
if (was_critical_error)
{
was_critical_error = 0;
break;
}
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
accmoney = GetAcceptedMoney(post);
if (accmoney > 0)
{
// åñòü ïðèíÿòûå äåíüãè
drawPostInfo[post] = 1;
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû
GetData(&PrintTimeoutAfterDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if(print_timeout)
if(wash_State[post] != washing)
{
// åñëè óêàçàí òàéìàóò îáíóëåíèÿ äåíåã - ïðîñòî èõ îáíóëÿåì
if (labs(OSTimeGet() - money_timestamp[post]) > 1000UL * print_timeout)
// ïå÷àòü ïî âíåøíåìó ñèãíàëó, æäåì òàéìàóò îòìåíû, íî íå â ðåæèìå ìîéêè
GetData(&PrintTimeoutAfterDesc, &print_timeout, 0, DATA_FLAG_SYSTEM_INDEX);
if(print_timeout)
{
SetAcceptedMoney(0, post);
wash_State[post] = waitMoney;
// åñëè óêàçàí òàéìàóò îáíóëåíèÿ äåíåã - ïðîñòî èõ îáíóëÿåì
if (labs(OSTimeGet() - money_timestamp[post]) > 1000UL * print_timeout)
{
SetAcceptedMoney(0, post);
wash_State[post] = waitMoney;
}
}
}
else
{
// â ðåæèìå ìîéêè ïðîäëåâàåì îæèäàíèå
money_timestamp[post] = OSTimeGet();
}
}
else
{
@ -232,6 +219,27 @@ void UserAppTask(void *p_arg)
// ïðèíèìàåì äåíüãè
DrawMenu();
// åñëè åñòü îøèáêè, íå ðàáîòàåì
if (TstCriticalErrors())
{
UserPrintErrorMenu();
RefreshMenu();
// âûêëþ÷èì ïðèåì äåíåã
if (was_critical_error == 0)
{
was_critical_error = 1;
}
break;
}
// âêëþ÷èì çàíîâî ïðèåì äåíåã, åñëè áûëà îøèáêà
if (was_critical_error)
{
was_critical_error = 0;
break;
}
break;
case EVENT_MODE_CHANGE:
@ -365,7 +373,12 @@ void UserAppTask(void *p_arg)
if (GetMode() == MODE_WORK) //
{
int number_post = event - EVENT_STOP_MONEY_POST1;
wash_State[number_post] = washing;
accmoney = GetAcceptedMoney(number_post);
if (accmoney > 0)
{
wash_State[number_post] = washing;
}
}
break;
@ -382,9 +395,18 @@ void UserAppTask(void *p_arg)
int number_post = event - EVENT_WAIT_CASH_PRINT_CHECK_POST1;
int count_delay = 0;
// çàïóñòèì çàäåðæêó ïå÷àòè ÷åêà
GetData(&PrintTimeoutDesc, &count_delay, number_post, DATA_FLAG_DIRECT_INDEX);
countSecWait[number_post] = count_delay;
accmoney = GetAcceptedMoney(number_post);
if (accmoney > 0)
{
// çàïóñòèì çàäåðæêó ïå÷àòè ÷åêà
GetData(&PrintTimeoutDesc, &count_delay, number_post, DATA_FLAG_DIRECT_INDEX);
countSecWait[number_post] = count_delay;
// åñëè çàäåðæêè íåò - ñðàçó ïå÷àòàåì
if(countSecWait[number_post] == 0) PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1 + number_post);
wash_State[number_post] = printCheck;
}
}
break;
@ -435,8 +457,8 @@ void UserAppTask(void *p_arg)
break;
case EVENT_KEY_F1:
testMoney = 100;
PostUserEvent(EVENT_CASH_INSERTED_POST1);
//testMoney = 100;
//PostUserEvent(EVENT_CASH_INSERTED_POST1);
/*FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
@ -459,10 +481,10 @@ void UserAppTask(void *p_arg)
FIO4CLR_bit.P4_28 = 1;*/
break;
case EVENT_KEY_F2:
PostUserEvent(EVENT_STOP_MONEY_POST1);
//PostUserEvent(EVENT_STOP_MONEY_POST1);
break;
case EVENT_KEY_F3:
PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1);
//PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST1);
break;
#endif
default:
@ -594,6 +616,14 @@ void UserPrintMoneyMenu(int post)
sprintf(buf, " ");
PrintUserMenuStr(buf, 2);
}
else if(wash_State[post] == printCheck)
{
sprintf(buf, "Îæèäàíèå ïå÷àòè");
PrintUserMenuStr(buf, 1);
sprintf(buf, " ");
PrintUserMenuStr(buf, 2);
}
if(post < COUNT_POST)
sprintf(buf, " Ïîñò %d", post + 1);

10
PROJECT/menu/menu.h
View File

@ -11,12 +11,10 @@
#define SYMB_GO_UP 0x87
#define SYMB_GO_DOWN 0x86
#define SYMB_RIGHT_ARROW 0x13
#define SYMB_DESC_MARK 0x84
#define SYMB_IND_MARK 0x85
#define SYMB_POINT_MARK 0xDF
#define SYMB_RIGHT_ARROW 0x3E
#define SYMB_DESC_MARK 0x3E
#define SYMB_IND_MARK 0x3C
#define SYMB_POINT_MARK 0x3E
// ñòðóêòóðà îïèñàíèÿ ïóíêòà ìåíþ
typedef struct{

14
PROJECT/services/coin.c
View File

@ -86,10 +86,14 @@ void CoinTask(void *p_arg)
last_settings_time = OSTimeGet();
}
OSTimeDly(1);
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
for(int i = 0; i < COUNT_POST + COUNT_VACUUM; i++)
{
OSTimeDly(1);
if (enable_coin[i])
{
if (GetCoinCount(i))
@ -103,6 +107,7 @@ void CoinTask(void *p_arg)
GetResetCoinCount(i);
}
OS_ENTER_CRITICAL();
if (enable_signal[i])
{
if (pend_upsignal_counter[i])
@ -124,15 +129,12 @@ void CoinTask(void *p_arg)
}
}
}
OS_EXIT_CRITICAL();
if (!cash_enable[i]) {GetResetCashCount(i); continue;}
if(i >= COUNT_POST) continue;
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
if (pend_cash_counter[i])
{
// èìïóëüñû èíêðåìåíòèðóåì òîëüêî ïîñëå âûäåðæêè ïàóçû

6
settings/sk-mlpc2368.dni
View File

@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
Checksum=-216480961
Checksum=-1687745374
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0
@ -155,9 +155,7 @@ Fmt0={W}0:curr_input 4 0
[Disassemble mode]
mode=0
[Breakpoints2]
Bp0=_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\services\coin.c}.113.21" 0 0 1 "" 0 "" 0
Bp1=_ 1 "EMUL_CODE" "{$PROJ_DIR$\PROJECT\services\coin.c}.122.21" 0 0 1 "" 0 "" 0
Count=2
Count=0
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""

8
settings/sk-mlpc2368.wsdt
View File

@ -18,7 +18,7 @@
<Column0>162</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>168</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>
@ -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/drivers/keyboard</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/drivers/lcd</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$\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\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\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>588</YPos><SelStart>26252</SelStart><SelEnd>26268</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\menu\menudesc.c</Filename><XPos>0</XPos><YPos>840</YPos><SelStart>34199</SelStart><SelEnd>34199</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>369</YPos><SelStart>8127</SelStart><SelEnd>8127</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>239</YPos><SelStart>7451</SelStart><SelEnd>7451</SelEnd></Tab><ActiveTab>14</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>1464</SelStart><SelEnd>1464</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>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>61</YPos><SelStart>2239</SelStart><SelEnd>2239</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\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\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>588</YPos><SelStart>26252</SelStart><SelEnd>26268</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\menu\menudesc.c</Filename><XPos>0</XPos><YPos>840</YPos><SelStart>34199</SelStart><SelEnd>34199</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>100</YPos><SelStart>3701</SelStart><SelEnd>3701</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>428</YPos><SelStart>13162</SelStart><SelEnd>13162</SelEnd></Tab><ActiveTab>14</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>1464</SelStart><SelEnd>1464</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.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\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\app\app_serv.h</Filename><XPos>0</XPos><YPos>61</YPos><SelStart>2239</SelStart><SelEnd>2239</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>162</YPos><SelStart>4548</SelStart><SelEnd>4548</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\lcd\lcd.c</Filename><XPos>0</XPos><YPos>286</YPos><SelStart>6953</SelStart><SelEnd>6953</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>292</SelStart><SelEnd>292</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-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>628</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>662461</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>278</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>280</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>294427</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>153523</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>715</Bottom><Right>259</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>146</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>153523</sizeHorzCY><sizeVertCX>203906</sizeVertCX><sizeVertCY>753943</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>191</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>193</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>202944</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>153523</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>