аннулирование чека добавлено

This commit is contained in:
Dmitriy 2023-01-15 11:38:59 +03:00
parent 8285d09ab9
commit e9d5a016bc
13 changed files with 5238 additions and 3582 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
Flash
*.o
*.pbd
*.pbi

View File

@ -39,7 +39,7 @@ static void FreeModem(void)
}
// çàïèñü ñòðîêè â ìîäåì
static void ModemWriteStr(char const *str)
void ModemWriteStr(char const *str)
{
while (*str != 0)
{

Binary file not shown.

View File

@ -482,6 +482,13 @@ void UserAppTask(void *p_arg)
ClrFiscalErrorByCode(FR_ERROR_CODE_4D);
}
}
else if (GetCurrentMenu() == CanselCheckMenuPanel)
{
int res = CanselFiscalBill();
SaveEventRecord(0, JOURNAL_EVENT_PRINT_X, res);
CheckFiscalStatus();
GoToPreviousMenu();
}
break;
}

View File

@ -1375,7 +1375,7 @@ const TMenuLine line_ReportMenu_3 = {
MENU_LINE_GOTO_MENU, // òèï ïóíêòà ìåíþ
0, // äîï. ôëàãè
(void*)str_ReportMenu_3, // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
(void*)&bufReportMenuPanel // 镟礤朦 潆<> 镥疱躅溧
(void*)&CanselCheckMenuPanel // ïàíåëü äëÿ ïåðåõîäà
};
@ -1517,6 +1517,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};
/***********************************
ÌÅÍÞ ÔÐ ÎÒÊËÞ×ÅÍ
***********************************/

View File

@ -51,6 +51,7 @@ extern const TMenuPanel JournalEmptyMenuPanel[];
extern const TMenuPanel ChannelCountersPanel[];
extern const TMenuPanel CommonCountersPanel[];
extern const TMenuPanel bufReportMenuPanel[];
extern const TMenuPanel CanselCheckMenuPanel[];
extern void PrintUserMenuStr(char* str, CPU_INT08U n);
extern void PrintEventJournalRecord(TEventRecord *record);

View File

@ -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_

View File

@ -1,47 +1,236 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml version="1.0"?>
<Project>
<Desktop>
<Static>
<Debug-Log>
<PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Find-in-Files</Factory></Window><Window><Factory>Breakpoints</Factory></Window></Windows></PreferedWindows><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1222</ColumnWidth1></Debug-Log>
<PreferedWindows>
<Position>3</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows>
<Window>
<Factory>Find-in-Files</Factory>
</Window>
<Window>
<Factory>Breakpoints</Factory>
</Window>
</Windows>
</PreferedWindows>
<ColumnWidth0>20</ColumnWidth0>
<ColumnWidth1>1222</ColumnWidth1>
</Debug-Log>
<Build>
<ColumnWidth0>20</ColumnWidth0><ColumnWidth1>916</ColumnWidth1><ColumnWidth2>244</ColumnWidth2><ColumnWidth3>61</ColumnWidth3><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Breakpoints</Factory></Window><Window><Factory>Find-in-Files</Factory></Window></Windows></PreferedWindows></Build>
<ColumnWidth0>20</ColumnWidth0>
<ColumnWidth1>916</ColumnWidth1>
<ColumnWidth2>244</ColumnWidth2>
<ColumnWidth3>61</ColumnWidth3>
<PreferedWindows>
<Position>3</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows>
<Window>
<Factory>Debug-Log</Factory>
</Window>
<Window>
<Factory>Breakpoints</Factory>
</Window>
<Window>
<Factory>Find-in-Files</Factory>
</Window>
</Windows>
</PreferedWindows>
</Build>
<Workspace>
<ColumnWidths>
<Column0>211</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>211</Column0>
<Column1>27</Column1>
<Column2>27</Column2>
<Column3>27</Column3>
</ColumnWidths>
</Workspace>
<Disassembly>
<PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow><InstrProfShow>0</InstrProfShow><col-names><item>Disassembly</item><item>_I0</item></col-names><col-widths><item>500</item><item>20</item></col-widths><DisasmHistory/><ShowCodeCoverage>0</ShowCodeCoverage><ShowInstrProfiling>0</ShowInstrProfiling></Disassembly>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<MixedMode>1</MixedMode>
<CodeCovShow>0</CodeCovShow>
<InstrProfShow>0</InstrProfShow>
<col-names>
<item>Disassembly</item>
<item>_I0</item>
</col-names>
<col-widths>
<item>500</item>
<item>20</item>
</col-widths>
<DisasmHistory />
<ShowCodeCoverage>0</ShowCodeCoverage>
<ShowInstrProfiling>0</ShowInstrProfiling>
</Disassembly>
<Watch>
<Format>
<struct_types><Fmt><Key>TRangeValueULONG-Max</Key><Value>3</Value></Fmt><Fmt><Key>TVariant32-Val32U</Key><Value>4</Value></Fmt></struct_types>
<watch_formats><Fmt><Key>{W}Watch-0:state</Key><Value>4</Value></Fmt><Fmt><Key>{W}Watch-0:ulIndex</Key><Value>3</Value></Fmt></watch_formats>
<struct_types>
<Fmt>
<Key>TRangeValueULONG-Max</Key>
<Value>3</Value>
</Fmt>
<Fmt>
<Key>TVariant32-Val32U</Key>
<Value>4</Value>
</Fmt>
</struct_types>
<watch_formats>
<Fmt>
<Key>{W}Watch-0:state</Key>
<Value>4</Value>
</Fmt>
<Fmt>
<Key>{W}Watch-0:ulIndex</Key>
<Value>3</Value>
</Fmt>
</watch_formats>
</Format>
<PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>139</Column0><Column1>313</Column1><Column2>100</Column2><Column3>100</Column3></Watch>
<QuickWatch><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>100</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><col-names><item>Expression</item><item>Location</item><item>Type</item><item>Value</item></col-names><col-widths><item>233</item><item>150</item><item>100</item><item>237</item></col-widths><QWatchHistory><item>FiscFullStatus</item><item>FiscShortStatus</item></QWatchHistory></QuickWatch><Find-in-Files><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Breakpoints</Factory></Window></Windows></PreferedWindows><ColumnWidth0>350</ColumnWidth0><ColumnWidth1>50</ColumnWidth1><ColumnWidth2>601</ColumnWidth2></Find-in-Files><TerminalIO><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><InputSource>1</InputSource><InputMode>10</InputMode><Filename>$PROJ_DIR$\TermIOInput.txt</Filename><InputEcho>1</InputEcho><ShowReset>0</ShowReset></TerminalIO><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Find-in-Files</Factory></Window></Windows></PreferedWindows></Breakpoints><Statics><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Locals</Factory></Window></Windows></PreferedWindows><Column0>100</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3></Statics><Locals><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>100</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><col-names><item>Location</item><item>Type</item><item>Value</item><item>Variable</item></col-names><col-widths><item>150</item><item>100</item><item>181</item><item>168</item></col-widths></Locals></Static>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<Column0>139</Column0>
<Column1>313</Column1>
<Column2>100</Column2>
<Column3>100</Column3>
</Watch>
<QuickWatch>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<Column0>100</Column0>
<Column1>100</Column1>
<Column2>100</Column2>
<Column3>100</Column3>
<col-names>
<item>Expression</item>
<item>Location</item>
<item>Type</item>
<item>Value</item>
</col-names>
<col-widths>
<item>233</item>
<item>150</item>
<item>100</item>
<item>237</item>
</col-widths>
<QWatchHistory>
<item>FiscFullStatus</item>
<item>FiscShortStatus</item>
</QWatchHistory>
</QuickWatch>
<Find-in-Files>
<PreferedWindows>
<Position>3</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows>
<Window>
<Factory>Debug-Log</Factory>
</Window>
<Window>
<Factory>Breakpoints</Factory>
</Window>
</Windows>
</PreferedWindows>
<ColumnWidth0>350</ColumnWidth0>
<ColumnWidth1>50</ColumnWidth1>
<ColumnWidth2>601</ColumnWidth2>
</Find-in-Files>
<TerminalIO>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<InputSource>1</InputSource>
<InputMode>10</InputMode>
<Filename>$PROJ_DIR$\TermIOInput.txt</Filename>
<InputEcho>1</InputEcho>
<ShowReset>0</ShowReset>
</TerminalIO>
<Memory>
<PreferedWindows>
<Position>3</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<FindDirection>1</FindDirection>
<FindAsHex>0</FindAsHex>
</Memory>
<Breakpoints>
<PreferedWindows>
<Position>3</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows>
<Window>
<Factory>Debug-Log</Factory>
</Window>
<Window>
<Factory>Find-in-Files</Factory>
</Window>
</Windows>
</PreferedWindows>
</Breakpoints>
<Statics>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows>
<Window>
<Factory>Locals</Factory>
</Window>
</Windows>
</PreferedWindows>
<Column0>100</Column0>
<Column1>100</Column1>
<Column2>100</Column2>
<Column3>100</Column3>
</Statics>
<Locals>
<PreferedWindows>
<Position>2</Position>
<ScreenPosX>0</ScreenPosX>
<ScreenPosY>0</ScreenPosY>
<Windows />
</PreferedWindows>
<Column0>100</Column0>
<Column1>100</Column1>
<Column2>100</Column2>
<Column3>100</Column3>
<col-names>
<item>Location</item>
<item>Type</item>
<item>Value</item>
<item>Variable</item>
</col-names>
<col-widths>
<item>150</item>
<item>100</item>
<item>181</item>
<item>168</item>
</col-widths>
</Locals>
</Static>
<Windows>
<Wnd0>
<Tabs>
<Tab>
@ -49,26 +238,322 @@
<TabName>Workspace</TabName>
<Factory>Workspace</Factory>
<Session>
<NodeDict><ExpandedNode>solarium</ExpandedNode><ExpandedNode>solarium/DRIVERS</ExpandedNode><ExpandedNode>solarium/PROJECT</ExpandedNode><ExpandedNode>solarium/PROJECT/app</ExpandedNode><ExpandedNode>solarium/PROJECT/data</ExpandedNode><ExpandedNode>solarium/PROJECT/menu</ExpandedNode><ExpandedNode>solarium/PROJECT/service</ExpandedNode></NodeDict></Session>
<NodeDict>
<ExpandedNode>solarium</ExpandedNode>
<ExpandedNode>solarium/DRIVERS</ExpandedNode>
<ExpandedNode>solarium/PROJECT</ExpandedNode>
<ExpandedNode>solarium/PROJECT/app</ExpandedNode>
<ExpandedNode>solarium/PROJECT/data</ExpandedNode>
<ExpandedNode>solarium/PROJECT/menu</ExpandedNode>
<ExpandedNode>solarium/PROJECT/service</ExpandedNode>
</NodeDict>
</Session>
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd0><Wnd2><Tabs><Tab><Identity>TabID-23366-6968</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-1787-14946</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab><Tab><Identity>TabID-31768-15979</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2></Windows>
<SelectedTab>0</SelectedTab>
</Wnd0>
<Wnd2>
<Tabs>
<Tab>
<Identity>TabID-23366-6968</Identity>
<TabName>Debug Log</TabName>
<Factory>Debug-Log</Factory>
<Session />
</Tab>
<Tab>
<Identity>TabID-1787-14946</Identity>
<TabName>Breakpoints</TabName>
<Factory>Breakpoints</Factory>
</Tab>
<Tab>
<Identity>TabID-31768-15979</Identity>
<TabName>Find in Files</TabName>
<Factory>Find-in-Files</Factory>
<Session />
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab>
</Wnd2>
</Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\coin.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>982</SelStart><SelEnd>992</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\modem\modem.c</Filename><XPos>0</XPos><YPos>143</YPos><SelStart>3321</SelStart><SelEnd>3321</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\modem_task.c</Filename><XPos>0</XPos><YPos>462</YPos><SelStart>15080</SelStart><SelEnd>15080</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\keyboard\keyboard.c</Filename><XPos>0</XPos><YPos>129</YPos><SelStart>2822</SelStart><SelEnd>2822</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>21</YPos><SelStart>854</SelStart><SelEnd>873</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>1</YPos><SelStart>590</SelStart><SelEnd>590</SelEnd></Tab><ActiveTab>5</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\lcd\lcd.c</Filename><XPos>0</XPos><YPos>9</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\lcd\symtab.h</Filename><XPos>0</XPos><YPos>253</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\lcd\lcd.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>406</SelStart><SelEnd>406</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.c</Filename><XPos>0</XPos><YPos>176</YPos><SelStart>1865</SelStart><SelEnd>1865</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>575</YPos><SelStart>22600</SelStart><SelEnd>22600</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\validator.c</Filename><XPos>0</XPos><YPos>253</YPos><SelStart>9825</SelStart><SelEnd>9825</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\app\journal.c</Filename><XPos>0</XPos><YPos>184</YPos><SelStart>4367</SelStart><SelEnd>4367</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\fr.c</Filename><XPos>0</XPos><YPos>607</YPos><SelStart>16346</SelStart><SelEnd>16365</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>840</YPos><SelStart>21887</SelStart><SelEnd>21887</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>360</YPos><SelStart>18263</SelStart><SelEnd>18263</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>416</SelStart><SelEnd>416</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>1963</YPos><SelStart>91825</SelStart><SelEnd>91825</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>12</YPos><SelStart>808</SelStart><SelEnd>808</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>90</YPos><SelStart>3905</SelStart><SelEnd>3936</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>6311</SelStart><SelEnd>6311</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>958</YPos><SelStart>39421</SelStart><SelEnd>39421</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>29</YPos><SelStart>1564</SelStart><SelEnd>1564</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\service\coin.c</Filename>
<XPos>0</XPos>
<YPos>28</YPos>
<SelStart>982</SelStart>
<SelEnd>992</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\modem\modem.c</Filename>
<XPos>0</XPos>
<YPos>143</YPos>
<SelStart>3321</SelStart>
<SelEnd>3321</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\app\modem_task.c</Filename>
<XPos>0</XPos>
<YPos>462</YPos>
<SelStart>15080</SelStart>
<SelEnd>15080</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\keyboard\keyboard.c</Filename>
<XPos>0</XPos>
<YPos>129</YPos>
<SelStart>2822</SelStart>
<SelEnd>2822</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename>
<XPos>0</XPos>
<YPos>21</YPos>
<SelStart>854</SelStart>
<SelEnd>873</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\OS\app\app.c</Filename>
<XPos>0</XPos>
<YPos>1</YPos>
<SelStart>590</SelStart>
<SelEnd>590</SelEnd>
</Tab>
<ActiveTab>5</ActiveTab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\lcd\lcd.c</Filename>
<XPos>0</XPos>
<YPos>9</YPos>
<SelStart>0</SelStart>
<SelEnd>0</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\lcd\symtab.h</Filename>
<XPos>0</XPos>
<YPos>253</YPos>
<SelStart>0</SelStart>
<SelEnd>0</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\lcd\lcd.h</Filename>
<XPos>0</XPos>
<YPos>3</YPos>
<SelStart>0</SelStart>
<SelEnd>0</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\menu\menu.h</Filename>
<XPos>0</XPos>
<YPos>0</YPos>
<SelStart>406</SelStart>
<SelEnd>406</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\app\control.c</Filename>
<XPos>0</XPos>
<YPos>176</YPos>
<SelStart>1865</SelStart>
<SelEnd>1865</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename>
<XPos>0</XPos>
<YPos>575</YPos>
<SelStart>22600</SelStart>
<SelEnd>22600</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\service\validator.c</Filename>
<XPos>0</XPos>
<YPos>253</YPos>
<SelStart>9825</SelStart>
<SelEnd>9825</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\app\journal.c</Filename>
<XPos>0</XPos>
<YPos>184</YPos>
<SelStart>4367</SelStart>
<SelEnd>4367</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\service\fr.c</Filename>
<XPos>0</XPos>
<YPos>607</YPos>
<SelStart>16346</SelStart>
<SelEnd>16365</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.c</Filename>
<XPos>0</XPos>
<YPos>840</YPos>
<SelStart>21887</SelStart>
<SelEnd>21887</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.h</Filename>
<XPos>0</XPos>
<YPos>360</YPos>
<SelStart>18263</SelStart>
<SelEnd>18263</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\service\fr.h</Filename>
<XPos>0</XPos>
<YPos>0</YPos>
<SelStart>416</SelStart>
<SelEnd>416</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename>
<XPos>0</XPos>
<YPos>1963</YPos>
<SelStart>91825</SelStart>
<SelEnd>91825</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename>
<XPos>0</XPos>
<YPos>12</YPos>
<SelStart>808</SelStart>
<SelEnd>808</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\app\journal.h</Filename>
<XPos>0</XPos>
<YPos>90</YPos>
<SelStart>3905</SelStart>
<SelEnd>3936</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename>
<XPos>0</XPos>
<YPos>170</YPos>
<SelStart>6311</SelStart>
<SelEnd>6311</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename>
<XPos>0</XPos>
<YPos>958</YPos>
<SelStart>39421</SelStart>
<SelEnd>39421</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename>
<XPos>0</XPos>
<YPos>29</YPos>
<SelStart>1564</SelStart>
<SelEnd>1564</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-048629c8><key>iaridepm.enu1</key></Toolbar-048629c8><Toolbar-048af288><key>debuggergui.enu1</key></Toolbar-048af288></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>484</Bottom><Right>302</Right><x>-2</x><y>-2</y><xscreen>213</xscreen><yscreen>206</yscreen><sizeHorzCX>155930</sizeHorzCX><sizeHorzCY>284138</sizeHorzCY><sizeVertCX>222548</sizeVertCX><sizeVertCY>670345</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>198</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>273103</sizeHorzCY><sizeVertCX>155930</sizeVertCX><sizeVertCY>273103</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top>
<Row0>
<Sizes>
<Toolbar-048629c8>
<key>iaridepm.enu1</key>
</Toolbar-048629c8>
<Toolbar-048af288>
<key>debuggergui.enu1</key>
</Toolbar-048af288>
</Sizes>
</Row0>
</Top>
<Left>
<Row0>
<Sizes>
<Wnd0>
<Rect>
<Top>-2</Top>
<Left>-2</Left>
<Bottom>484</Bottom>
<Right>302</Right>
<x>-2</x>
<y>-2</y>
<xscreen>213</xscreen>
<yscreen>206</yscreen>
<sizeHorzCX>155930</sizeHorzCX>
<sizeHorzCY>284138</sizeHorzCY>
<sizeVertCX>222548</sizeVertCX>
<sizeVertCY>670345</sizeVertCY>
</Rect>
</Wnd0>
</Sizes>
</Row0>
</Left>
<Right>
<Row0>
<Sizes />
</Row0>
</Right>
<Bottom>
<Row0>
<Sizes>
<Wnd2>
<Rect>
<Top>-2</Top>
<Left>-2</Left>
<Bottom>196</Bottom>
<Right>1368</Right>
<x>-2</x>
<y>-2</y>
<xscreen>1370</xscreen>
<yscreen>198</yscreen>
<sizeHorzCX>1002928</sizeHorzCX>
<sizeHorzCY>273103</sizeHorzCY>
<sizeVertCX>155930</sizeVertCX>
<sizeVertCY>273103</sizeVertCY>
</Rect>
</Wnd2>
</Sizes>
</Row0>
</Bottom>
<Float>
<Sizes />
</Float>
</Positions>
</Desktop>
<WindowStorage />
</Project>

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<project>
<fileVersion>2</fileVersion>
<fileVersion>3</fileVersion>
<configuration>
<name>Flash</name>
<toolchain>
@ -12,9 +11,13 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>21</version>
<version>33</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>BrowseInfoPath</name>
<state>Flash\BrowseInfo</state>
</option>
<option>
<name>ExePath</name>
<state>Flash\Exe</state>
@ -27,42 +30,22 @@
<name>ListPath</name>
<state>Flash\List</state>
</option>
<option>
<name>Variant</name>
<version>19</version>
<state>1</state>
</option>
<option>
<name>GEndianMode</name>
<state>0</state>
</option>
<option>
<name>Input variant</name>
<version>3</version>
<state>1</state>
</option>
<option>
<name>Input description</name>
<state>Full formatting.</state>
</option>
<option>
<name>Output variant</name>
<version>2</version>
<state>1</state>
<state>Full formatting, without multibyte support.</state>
</option>
<option>
<name>Output description</name>
<state>Full formatting.</state>
<state>Full formatting, without multibyte support.</state>
</option>
<option>
<name>GOutputBinary</name>
<state>0</state>
</option>
<option>
<name>FPU</name>
<version>2</version>
<state>0</state>
</option>
<option>
<name>OGCoreOrChip</name>
<state>1</state>
@ -87,15 +70,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>6.21.1.52845</state>
</option>
<option>
<name>GeneralEnableMisra</name>
<state>0</state>
</option>
<option>
<name>GeneralMisraVerbose</name>
<state>0</state>
<state>9.10.1.36322</state>
</option>
<option>
<name>OGChipSelectEditMenu</name>
@ -117,32 +92,13 @@
<name>GenStdoutInterface</name>
<state>0</state>
</option>
<option>
<name>GeneralMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
<option>
<name>GeneralMisraVer</name>
<state>0</state>
</option>
<option>
<name>GeneralMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GFPUCoreSlave</name>
<version>19</version>
<state>1</state>
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>19</version>
<version>29</version>
<state>1</state>
</option>
<option>
@ -153,15 +109,109 @@
<name>OGUseCmsisDspLib</name>
<state>0</state>
</option>
<option>
<name>GRuntimeLibThreads</name>
<state>0</state>
</option>
<option>
<name>CoreVariant</name>
<version>29</version>
<state>1</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>LPC2368 NXP LPC2368</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NrRegs</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NEON</name>
<state>0</state>
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>29</version>
<state>1</state>
</option>
<option>
<name>OGCMSISPackSelectDevice</name>
</option>
<option>
<name>OgLibHeap</name>
<state>0</state>
</option>
<option>
<name>OGLibAdditionalLocale</name>
<state>0</state>
</option>
<option>
<name>OGPrintfVariant</name>
<version>0</version>
<state>1</state>
</option>
<option>
<name>OGPrintfMultibyteSupport</name>
<state>0</state>
</option>
<option>
<name>OGScanfVariant</name>
<version>0</version>
<state>1</state>
</option>
<option>
<name>OGScanfMultibyteSupport</name>
<state>0</state>
</option>
<option>
<name>GenLocaleTags</name>
<state></state>
</option>
<option>
<name>GenLocaleDisplayOnly</name>
<state></state>
</option>
<option>
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>OGAarch64Abi</name>
<state>0</state>
</option>
<option>
<name>OG_32_64Device</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>28</version>
<version>37</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CCOptimizationNoSizeConstraints</name>
<state>0</state>
</option>
<option>
<name>CCDefines</name>
<state></state>
@ -225,7 +275,7 @@
<option>
<name>CCAllowList</name>
<version>1</version>
<state>0000000</state>
<state>00000000</state>
</option>
<option>
<name>CCDebugInfo</name>
@ -259,10 +309,6 @@
<name>CCRequirePrototypes</name>
<state>0</state>
</option>
<option>
<name>CCMultibyteSupport</name>
<state>0</state>
</option>
<option>
<name>CCDiagWarnAreErr</name>
<state>0</state>
@ -287,10 +333,6 @@
<name>PreInclude</name>
<state></state>
</option>
<option>
<name>CompilerMisraOverride</name>
<state>0</state>
</option>
<option>
<name>CCIncludePath2</name>
<state>$PROJ_DIR$\OS\app</state>
@ -320,10 +362,6 @@
<name>CCCodeSection</name>
<state>.text</state>
</option>
<option>
<name>IInterwork2</name>
<state>1</state>
</option>
<option>
<name>IProcessorMode2</name>
<state>1</state>
@ -341,16 +379,6 @@
<name>CCOptLevelSlave</name>
<state>0</state>
</option>
<option>
<name>CompilerMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
<option>
<name>CompilerMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>CCPosIndRopi</name>
<state>0</state>
@ -375,18 +403,6 @@
<name>IccAllowVLA</name>
<state>0</state>
</option>
<option>
<name>IccCppDialect</name>
<state>1</state>
</option>
<option>
<name>IccExceptions</name>
<state>1</state>
</option>
<option>
<name>IccRTTI</name>
<state>1</state>
</option>
<option>
<name>IccStaticDestr</name>
<state>1</state>
@ -403,13 +419,58 @@
<name>IccFloatSemantics</name>
<state>0</state>
</option>
<option>
<name>CCNoLiteralPool</name>
<state>0</state>
</option>
<option>
<name>CCOptStrategySlave</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>CCGuardCalls</name>
<state>1</state>
</option>
<option>
<name>CCEncSource</name>
<state>0</state>
</option>
<option>
<name>CCEncOutput</name>
<state>0</state>
</option>
<option>
<name>CCEncOutputBom</name>
<state>1</state>
</option>
<option>
<name>CCEncInput</name>
<state>0</state>
</option>
<option>
<name>IccExceptions2</name>
<state>0</state>
</option>
<option>
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
<option>
<name>CCStackProtection</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>AARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>8</version>
<version>11</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -537,10 +598,6 @@
<name>AOutputFile</name>
<state>$FILE_BNAME$.o</state>
</option>
<option>
<name>AMultibyteSupport</name>
<state>0</state>
</option>
<option>
<name>ALimitErrorsCheck</name>
<state>0</state>
@ -565,6 +622,14 @@
<name>AExtraOptionsV2</name>
<state></state>
</option>
<option>
<name>AsmNoLiteralPool</name>
<state>0</state>
</option>
<option>
<name>PreInclude</name>
<state></state>
</option>
</data>
</settings>
<settings>
@ -576,7 +641,7 @@
<debug>1</debug>
<option>
<name>OOCOutputFormat</name>
<version>2</version>
<version>3</version>
<state>1</state>
</option>
<option>
@ -585,7 +650,7 @@
</option>
<option>
<name>OOCOutputFile</name>
<state>solarium_3_36.hex</state>
<state>solarium_3_37.hex</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
@ -603,13 +668,10 @@
<data>
<extensions></extensions>
<cmdline></cmdline>
<hasPrio>224</hasPrio>
<buildSequence>inputOutputBased</buildSequence>
</data>
</settings>
<settings>
<name>BICOMP</name>
<archiveVersion>0</archiveVersion>
<data/>
</settings>
<settings>
<name>BUILDACTION</name>
<archiveVersion>1</archiveVersion>
@ -622,17 +684,13 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>13</version>
<version>25</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>IlinkLibIOConfig</name>
<state>1</state>
</option>
<option>
<name>XLinkMisraHandler</name>
<state>0</state>
</option>
<option>
<name>IlinkInputFileSlave</name>
<state>0</state>
@ -790,10 +848,6 @@
<name>CrcAlign</name>
<state>1</state>
</option>
<option>
<name>CrcAlgo</name>
<state>1</state>
</option>
<option>
<name>CrcPoly</name>
<state>0x11021</state>
@ -884,6 +938,104 @@
<name>IlinkOptForceVfe</name>
<state>0</state>
</option>
<option>
<name>IlinkStackAnalysisEnable</name>
<state>0</state>
</option>
<option>
<name>IlinkStackControlFile</name>
<state></state>
</option>
<option>
<name>IlinkStackCallGraphFile</name>
<state></state>
</option>
<option>
<name>CrcAlgorithm</name>
<version>1</version>
<state>1</state>
</option>
<option>
<name>CrcUnitSize</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>IlinkThreadsSlave</name>
<state>1</state>
</option>
<option>
<name>IlinkLogCallGraph</name>
<state>0</state>
</option>
<option>
<name>IlinkIcfFile_AltDefault</name>
<state></state>
</option>
<option>
<name>IlinkEncInput</name>
<state>0</state>
</option>
<option>
<name>IlinkEncOutput</name>
<state>0</state>
</option>
<option>
<name>IlinkEncOutputBom</name>
<state>1</state>
</option>
<option>
<name>IlinkHeapSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>solarium_import_lib.o</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state></state>
</option>
<option>
<name>IlinkLogCrtRoutineSelection</name>
<state>0</state>
</option>
<option>
<name>IlinkLogFragmentInfo</name>
<state>0</state>
</option>
<option>
<name>IlinkLogInlining</name>
<state>0</state>
</option>
<option>
<name>IlinkLogMerging</name>
<state>0</state>
</option>
<option>
<name>IlinkDemangle</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
@ -907,11 +1059,6 @@
</option>
</data>
</settings>
<settings>
<name>BILINK</name>
<archiveVersion>0</archiveVersion>
<data/>
</settings>
</configuration>
<group>
<name>DRIVERS</name>
@ -1238,5 +1385,3 @@
</file>
</group>
</project>

Binary file not shown.