mirror of
https://github.com/dimoniche/Moyka.git
synced 2026-01-29 17:33:33 +03:00
аннулирование чека
This commit is contained in:
parent
03c107e597
commit
cc3571d387
@ -524,6 +524,13 @@ void UserAppTask(void *p_arg)
|
||||
GoToPreviousMenu();
|
||||
}
|
||||
}
|
||||
else if (GetCurrentMenu() == CanselCheckMenuPanel)
|
||||
{
|
||||
int res = CanselFiscalBill();
|
||||
SaveEventRecord(0, JOURNAL_EVENT_PRINT_X, res);
|
||||
CheckFiscalStatus();
|
||||
GoToPreviousMenu();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -944,3 +944,35 @@ int FiscPrintContinue(CPU_INT32U pass, CPU_INT08U* err)
|
||||
return FISC_OK;
|
||||
}
|
||||
|
||||
// Àäìèí.îòìåíà ÷åêà
|
||||
int FiscCanselBill(CPU_INT32U pass, CPU_INT08U* err)
|
||||
{
|
||||
CPU_INT08U* rxdat;
|
||||
CPU_INT08U len;
|
||||
|
||||
memcpy(&fisc_buf[0], (CPU_INT08U*)&pass, 4);
|
||||
|
||||
if (FiscSendCommand(FISC_CANSEL_BILL, fisc_buf, 4) != FISC_OK)
|
||||
{
|
||||
return FISC_ERR;
|
||||
}
|
||||
|
||||
if (FiscReceiveAnswer(&rxdat, &len, FISC_ANSWER_TIMEOUT) != FISC_OK)
|
||||
{
|
||||
return FISC_ERR;
|
||||
}
|
||||
|
||||
*err = rxdat[1];
|
||||
|
||||
if (3 != len)
|
||||
{
|
||||
return FISC_ERR;
|
||||
}
|
||||
|
||||
if ((rxdat[0] != FISC_CANSEL_BILL) || (rxdat[1] != 0))
|
||||
{
|
||||
return FISC_ERR;
|
||||
}
|
||||
|
||||
return FISC_OK;
|
||||
}
|
||||
|
||||
@ -59,6 +59,7 @@ extern CPU_INT08U FiscalState;
|
||||
|
||||
#define FISC_MAKE_SELL 0x80
|
||||
#define FISC_CLOSE_BILL 0x85
|
||||
#define FISC_CANSEL_BILL 0x88
|
||||
|
||||
#define FISC_EXTENDED_CMD 0xFF
|
||||
|
||||
@ -362,4 +363,6 @@ extern int FiscMakeSellV2(CPU_INT32U pass, CPU_INT64U *count, CPU_INT64U *price,
|
||||
extern int FiscCloseBillV2(CPU_INT32U pass, CPU_INT64U *cash, CPU_INT08U taxsys, char* text, CPU_INT08U* err);
|
||||
extern int FiscCloseBillV2Online(CPU_INT32U pass, CPU_INT64U *cash, CPU_INT08U taxsys, char* text, CPU_INT08U* err);
|
||||
|
||||
extern int FiscCanselBill(CPU_INT32U pass, CPU_INT08U* err);
|
||||
|
||||
#endif //#ifndef _FISCAL_H_
|
||||
|
||||
@ -1171,6 +1171,7 @@ const CPU_INT08U str_ReportMenu_0[] = "
|
||||
const CPU_INT08U str_ReportMenu_1[] = "X-îò÷åò";
|
||||
const CPU_INT08U str_ReportMenu_2[] = "Îò÷åò î çàêð.ñìåíû";
|
||||
const CPU_INT08U str_ReportMenu_3[] = "Z-îò÷åò èç áóôåðà";
|
||||
const CPU_INT08U str_ReportMenu_4[] = "Àííóëèðîâàíèå ÷åêà";
|
||||
|
||||
const TMenuLine line_ReportMenu_0 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
@ -1201,6 +1202,13 @@ const TMenuLine line_ReportMenu_3 = {
|
||||
};
|
||||
*/
|
||||
|
||||
const TMenuLine line_ReportMenu_4 = {
|
||||
MENU_LINE_GOTO_MENU, // òèï ïóíêòà ìåíþ
|
||||
0, // äîï. ôëàãè
|
||||
(void*)str_ReportMenu_4, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
(void*)&CanselCheckMenuPanel // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
void OnEnterReportsPanel(void)
|
||||
{
|
||||
CPU_INT32U enable;
|
||||
@ -1213,8 +1221,8 @@ void OnEnterReportsPanel(void)
|
||||
FlagForPrintReport = 0;
|
||||
}
|
||||
|
||||
const TMenuLineArray arr_ReportMenuArray[] = {&line_ReportMenu_0, &line_ReportMenu_1, &line_ReportMenu_2, /*&line_ReportMenu_3,*/ NULL};
|
||||
const TMenuPanel ReportMenuPanel[] = {arr_ReportMenuArray, OnEnterReportsPanel, 3, MENU_PANEL_STANDARD};
|
||||
const TMenuLineArray arr_ReportMenuArray[] = {&line_ReportMenu_0, &line_ReportMenu_1, &line_ReportMenu_2, /*&line_ReportMenu_3,*/ &line_ReportMenu_4, NULL};
|
||||
const TMenuPanel ReportMenuPanel[] = {arr_ReportMenuArray, OnEnterReportsPanel, 4, MENU_PANEL_STANDARD};
|
||||
|
||||
/***********************************
|
||||
ÌÅÍÞ ÏÅ×ÀÒÜ X-ÎÒ×ÅÒÀ
|
||||
@ -1339,6 +1347,44 @@ const TMenuLine line_bufReportMenu_3 = {
|
||||
const TMenuLineArray arr_bufReportMenuArray[] = {&line_bufReportMenu_0, &line_bufReportMenu_1, &line_bufReportMenu_2, &line_xReportMenu_3, NULL};
|
||||
const TMenuPanel bufReportMenuPanel[] = {arr_bufReportMenuArray, OnEnterZXReportPanel, 4, MENU_PANEL_STATIC};
|
||||
|
||||
/***********************************
|
||||
ÌÅÍÞ ÀÍÍÓËÈÐÎÂÀÍÈÅ ×ÅÊÀ
|
||||
***********************************/
|
||||
const CPU_INT08U str_CanselCheckMenu_0[] = " ";
|
||||
const CPU_INT08U str_CanselCheckMenu_1[] = " Àííóëèðîâaòü ÷åê?";
|
||||
const CPU_INT08U str_CanselCheckMenu_2[] = " ";
|
||||
|
||||
const TMenuLine line_CanselCheckMenu_0 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
MENU_FIXED_LINE, // äîï. ôëàãè
|
||||
(void*)str_CanselCheckMenu_0, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLine line_CanselCheckMenu_1 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
0, // äîï. ôëàãè
|
||||
(void*)str_CanselCheckMenu_1, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLine line_CanselCheckMenu_2 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
0, // äîï. ôëàãè
|
||||
(void*)str_CanselCheckMenu_2, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLine line_CanselCheckMenu_3 = {
|
||||
MENU_LINE_STRING, // òèï ïóíêòà ìåíþ
|
||||
0, // äîï. ôëàãè
|
||||
(void*)str_xReportMenu_3, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
|
||||
NULL // ïàíåëü äëÿ ïåðåõîäà
|
||||
};
|
||||
|
||||
const TMenuLineArray arr_CanselCheckMenuArray[] = {&line_CanselCheckMenu_0, &line_CanselCheckMenu_1, &line_CanselCheckMenu_2, &line_CanselCheckMenu_3, NULL};
|
||||
const TMenuPanel CanselCheckMenuPanel[] = {arr_CanselCheckMenuArray, OnEnterZXReportPanel, 4, MENU_PANEL_STATIC};
|
||||
|
||||
/***********************************
|
||||
ÌÅÍÞ ÔÐ ÎÒÊËÞ×ÅÍ
|
||||
***********************************/
|
||||
|
||||
@ -50,6 +50,7 @@ extern const TMenuPanel bufReportMenuPanel[];
|
||||
extern const TMenuPanel ValidatorSetupPanel[];
|
||||
extern const TMenuPanel BankSetupPanel[];
|
||||
extern const TMenuPanel WashStatMenuPanel[];
|
||||
extern const TMenuPanel CanselCheckMenuPanel[];
|
||||
|
||||
extern void PrintUserMenuStr(char* str, CPU_INT08U n);
|
||||
extern void PrintEventJournalRecord(TEventRecord *record);
|
||||
|
||||
@ -1114,3 +1114,26 @@ int GetFirstCriticalFiscalError(CPU_INT08U *err)
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
// îòìåíà ÷åêà
|
||||
int CanselFiscalBill(void)
|
||||
{
|
||||
CPU_INT08U err;
|
||||
|
||||
FPend();
|
||||
|
||||
if (CheckFiscalStatus() < 0)
|
||||
{
|
||||
FPost();
|
||||
return -100;
|
||||
}
|
||||
|
||||
if (FiscCanselBill(DEFAULT_PASS, &err) != FISC_OK)
|
||||
{
|
||||
FPost();
|
||||
return -101;
|
||||
}
|
||||
|
||||
FPost();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -26,5 +26,6 @@ extern void FReportPost(void);
|
||||
extern CPU_INT16U FReportTest(void);
|
||||
extern int CheckFiscalStatus();
|
||||
extern int ConnectFiscalFast(void);
|
||||
extern int CanselFiscalBill(void);
|
||||
|
||||
#endif //#ifndef _FR_H_
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _VERSION_H_
|
||||
#define _VERSION_H_
|
||||
|
||||
#define DEVICE_FW_VERSION "02.08"
|
||||
#define DEVICE_FW_VERSION "02.09"
|
||||
|
||||
|
||||
#endif // #ifndef _VERSION_H_
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
|
||||
<Column0>178</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
<Column0>195</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
</Workspace>
|
||||
<Disassembly>
|
||||
<col-names>
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
|
||||
|
||||
<Wnd0>
|
||||
<Wnd1>
|
||||
<Tabs>
|
||||
<Tab>
|
||||
<Identity>TabID-27436-14105</Identity>
|
||||
@ -55,7 +55,7 @@
|
||||
</Tab>
|
||||
<Tab><Identity>TabID-20970-6658</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs>
|
||||
|
||||
<SelectedTab>0</SelectedTab></Wnd0><Wnd2>
|
||||
<SelectedTab>0</SelectedTab></Wnd1><Wnd3>
|
||||
<Tabs>
|
||||
<Tab>
|
||||
<Identity>TabID-5416-14108</Identity>
|
||||
@ -67,20 +67,20 @@
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
<SelectedTab>0</SelectedTab></Wnd2></Windows>
|
||||
<SelectedTab>0</SelectedTab></Wnd3></Windows>
|
||||
<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\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</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\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>663</YPos><SelStart>21796</SelStart><SelEnd>21796</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1742</YPos><SelStart>77566</SelStart><SelEnd>77566</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>7972</SelStart><SelEnd>7972</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>35</YPos><SelStart>978</SelStart><SelEnd>978</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>239</SelStart><SelEnd>239</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2031</SelStart><SelEnd>2059</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>70</SelStart><SelEnd>70</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>129</YPos><SelStart>4906</SelStart><SelEnd>4906</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\app\app_serv.c</Filename><XPos>0</XPos><YPos>209</YPos><SelStart>4885</SelStart><SelEnd>4885</SelEnd></Tab><ActiveTab>18</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fram\fram.c</Filename><XPos>0</XPos><YPos>96</YPos><SelStart>2256</SelStart><SelEnd>2256</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1441</YPos><SelStart>57674</SelStart><SelEnd>57674</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>240</YPos><SelStart>6982</SelStart><SelEnd>6982</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>271</YPos><SelStart>13623</SelStart><SelEnd>13623</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>910</YPos><SelStart>24201</SelStart><SelEnd>24201</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>629</YPos><SelStart>16946</SelStart><SelEnd>16946</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\data\datadesc.c</Filename><XPos>0</XPos><YPos>2745</YPos><SelStart>120285</SelStart><SelEnd>120285</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>800</YPos><SelStart>32102</SelStart><SelEnd>32102</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>151</YPos><SelStart>5516</SelStart><SelEnd>5516</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>71</YPos><SelStart>484</SelStart><SelEnd>484</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>4666</SelStart><SelEnd>4675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>248</YPos><SelStart>6724</SelStart><SelEnd>6724</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>449</SelStart><SelEnd>449</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>688</SelStart><SelEnd>702</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>238</SelStart><SelEnd>238</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>540</SelStart><SelEnd>540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1616</SelStart><SelEnd>1864</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>601</SelStart><SelEnd>601</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>30</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><ActiveTab>14</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\tcpip\NIC\ETHER\LPC2368\net_nic.c</Filename><XPos>0</XPos><YPos>794</YPos><SelStart>42561</SelStart><SelEnd>42561</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-02fb3140><key>iaridepm.enu1</key></Toolbar-02fb3140></Sizes></Row0><Row1><Sizes><Toolbar-20731b30><key>debuggergui.enu1</key></Toolbar-20731b30><Toolbar-20731bf8><key>armjlink.enu1</key></Toolbar-20731bf8></Sizes></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>714</Bottom><Right>252</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>383</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>402734</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>752892</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>168</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>170</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>178759</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>402734</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-047f29c8><key>iaridepm.enu1</key></Toolbar-047f29c8></Sizes></Row0><Row1><Sizes><Toolbar-172103c8><key>debuggergui.enu1</key></Toolbar-172103c8></Sizes></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>528</Bottom><Right>269</Right><x>-2</x><y>-2</y><xscreen>271</xscreen><yscreen>292</yscreen><sizeHorzCX>198389</sizeHorzCX><sizeHorzCY>402759</sizeHorzCY><sizeVertCX>198389</sizeVertCX><sizeVertCY>731034</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>128</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>130</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>179310</sizeHorzCY><sizeVertCX>198389</sizeVertCX><sizeVertCY>402759</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Project>
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ Count=0
|
||||
Enabled=0
|
||||
ShowSource=1
|
||||
[DebugChecksum]
|
||||
Checksum=-1836948852
|
||||
Checksum=-1206261715
|
||||
[Exceptions]
|
||||
StopOnUncaught=_ 0
|
||||
StopOnThrow=_ 0
|
||||
@ -152,6 +152,9 @@ UnspecRange=1
|
||||
ActionState=1
|
||||
[watch_formats]
|
||||
Fmt0={W}0:curr_input 4 0
|
||||
[Trace1]
|
||||
Enabled=0
|
||||
ShowSource=1
|
||||
[Log file]
|
||||
LoggingEnabled=_ 0
|
||||
LogFile=_ ""
|
||||
@ -159,14 +162,11 @@ Category=_ 0
|
||||
[TermIOLog]
|
||||
LoggingEnabled=_ 0
|
||||
LogFile=_ ""
|
||||
[Trace1]
|
||||
Enabled=0
|
||||
ShowSource=1
|
||||
[CallStackLog]
|
||||
Enabled=0
|
||||
[DriverProfiling]
|
||||
Enabled=0
|
||||
Mode=1
|
||||
Mode=0
|
||||
Graph=0
|
||||
Symbiont=0
|
||||
[Disassemble mode]
|
||||
|
||||
@ -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/fram</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>
|
||||
<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/fiscal</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/drivers/fram</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$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>785</YPos><SelStart>35249</SelStart><SelEnd>35249</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>728</YPos><SelStart>29628</SelStart><SelEnd>29628</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>147</YPos><SelStart>5541</SelStart><SelEnd>5541</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>71</YPos><SelStart>484</SelStart><SelEnd>484</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>4666</SelStart><SelEnd>4675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>299</SelStart><SelEnd>299</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>234</YPos><SelStart>7140</SelStart><SelEnd>7140</SelEnd></Tab><ActiveTab>7</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>449</SelStart><SelEnd>449</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>688</SelStart><SelEnd>702</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>158</SelStart><SelEnd>158</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>540</SelStart><SelEnd>540</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\data\datadesc.c</Filename><XPos>0</XPos><YPos>2262</YPos><SelStart>100469</SelStart><SelEnd>100490</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>103</YPos><SelStart>3722</SelStart><SelEnd>3884</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1097</YPos><SelStart>29062</SelStart><SelEnd>29062</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>63</YPos><SelStart>4023</SelStart><SelEnd>4023</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>286</SelStart><SelEnd>382</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>498</YPos><SelStart>18748</SelStart><SelEnd>18748</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>449</SelStart><SelEnd>449</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>688</SelStart><SelEnd>702</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>238</SelStart><SelEnd>238</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>540</SelStart><SelEnd>540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>421</YPos><SelStart>11546</SelStart><SelEnd>11558</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>155</SelStart><SelEnd>155</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>30</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>936</YPos><SelStart>25210</SelStart><SelEnd>25210</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2545</SelStart><SelEnd>2545</SelEnd></Tab><ActiveTab>15</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>459</YPos><SelStart>13186</SelStart><SelEnd>13188</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$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>2116</SelStart><SelEnd>2116</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1353</YPos><SelStart>55754</SelStart><SelEnd>55754</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>927</SelStart><SelEnd>927</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-02894c70><key>iaridepm.enu1</key></Toolbar-02894c70></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>743</Bottom><Right>288</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>110</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>112130</sizeHorzCY><sizeVertCX>226563</sizeVertCX><sizeVertCY>759429</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>193</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>195</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>198777</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-054f1310><key>iaridepm.enu1</key></Toolbar-054f1310></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>736</Bottom><Right>288</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>110</yscreen><sizeHorzCX>156250</sizeHorzCX><sizeHorzCY>112130</sizeHorzCY><sizeVertCX>226563</sizeVertCX><sizeVertCY>752294</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>200</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>202</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>205912</sizeHorzCY><sizeVertCX>156250</sizeVertCX><sizeVertCY>112130</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
9372
sk-mlpc2368.dep
9372
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -1512,7 +1512,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>version2_08.hex</state>
|
||||
<state>version2_09.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user