новые символы меню

.gitignore

@@ -0,0 +1,4 @@
+
+*.o
+*.pbd
+*.o

Flash/Obj/solarium.pbd

@@ -1,43 +0,0 @@
-This is an internal working file generated by the Source Browser.
-23:49 56s
-C:\work\solarium\Flash\Obj\CCRSProtocol.pbi
-C:\work\solarium\Flash\Obj\app.pbi
-C:\work\solarium\Flash\Obj\app_serv.pbi
-C:\work\solarium\Flash\Obj\bsp.pbi
-C:\work\solarium\Flash\Obj\coin.pbi
-C:\work\solarium\Flash\Obj\control.pbi
-C:\work\solarium\Flash\Obj\crc16.pbi
-C:\work\solarium\Flash\Obj\data.pbi
-C:\work\solarium\Flash\Obj\datadesc.pbi
-C:\work\solarium\Flash\Obj\fiscal.pbi
-C:\work\solarium\Flash\Obj\fr.pbi
-C:\work\solarium\Flash\Obj\fram.pbi
-C:\work\solarium\Flash\Obj\journal.pbi
-C:\work\solarium\Flash\Obj\keyboard.pbi
-C:\work\solarium\Flash\Obj\lcd.pbi
-C:\work\solarium\Flash\Obj\lib_mem.pbi
-C:\work\solarium\Flash\Obj\lib_str.pbi
-C:\work\solarium\Flash\Obj\menu.pbi
-C:\work\solarium\Flash\Obj\menudesc.pbi
-C:\work\solarium\Flash\Obj\mode.pbi
-C:\work\solarium\Flash\Obj\modem.pbi
-C:\work\solarium\Flash\Obj\modem_task.pbi
-C:\work\solarium\Flash\Obj\os_core.pbi
-C:\work\solarium\Flash\Obj\os_cpu_c.pbi
-C:\work\solarium\Flash\Obj\os_dbg.pbi
-C:\work\solarium\Flash\Obj\os_dcc.pbi
-C:\work\solarium\Flash\Obj\os_flag.pbi
-C:\work\solarium\Flash\Obj\os_mbox.pbi
-C:\work\solarium\Flash\Obj\os_mem.pbi
-C:\work\solarium\Flash\Obj\os_mutex.pbi
-C:\work\solarium\Flash\Obj\os_q.pbi
-C:\work\solarium\Flash\Obj\os_sem.pbi
-C:\work\solarium\Flash\Obj\os_task.pbi
-C:\work\solarium\Flash\Obj\os_time.pbi
-C:\work\solarium\Flash\Obj\os_tmr.pbi
-C:\work\solarium\Flash\Obj\spi.pbi
-C:\work\solarium\Flash\Obj\time.pbi
-C:\work\solarium\Flash\Obj\uart0.pbi
-C:\work\solarium\Flash\Obj\uart1.pbi
-C:\work\solarium\Flash\Obj\uart2.pbi
-C:\work\solarium\Flash\Obj\validator.pbi

PROJECT/menu/menu.h

@@ -11,12 +11,15 @@
 #define SYMB_GO_UP    0x87
 #define SYMB_GO_DOWN  0x86
 
-#define SYMB_RIGHT_ARROW  0x13
+#ifdef CONFIG_LCD_1602A
-#define SYMB_DESC_MARK    0x84
+	#define SYMB_RIGHT_ARROW  '>'
-#define SYMB_IND_MARK     0x85
+#else
-#define SYMB_POINT_MARK   0xDF
+	#define SYMB_RIGHT_ARROW  '>' //0x13
-
+#endif
 
+#define SYMB_DESC_MARK    '>'//0x84
+#define SYMB_IND_MARK     '<'//0x85
+#define SYMB_POINT_MARK   '*'//0xDF
 
 // ñòðóêòóðà îïèñàíèÿ ïóíêòà ìåíþ
 typedef struct{

PROJECT/version.h

@@ -1,7 +1,7 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define   DEVICE_FW_VERSION   "03.31"
+#define   DEVICE_FW_VERSION   "03.32"
 
 
 #endif // #ifndef _VERSION_H_

settings/solarium.dni

@@ -3,7 +3,7 @@ WatchCond=_ 0
 Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
 Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
 [DebugChecksum]
-Checksum=-1172248610
+Checksum=-1843354447
 [DisAssemblyWindow]
 NumStates=_ 1
 State 1=_ 1

settings/solarium.wsdt

@@ -37,7 +37,7 @@
             <Factory>Workspace</Factory>
             <Session>
               
-            <NodeDict><ExpandedNode>solarium</ExpandedNode><ExpandedNode>solarium/DRIVERS</ExpandedNode><ExpandedNode>solarium/DRIVERS/keyboard</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/DRIVERS/keyboard</ExpandedNode><ExpandedNode>solarium/DRIVERS/lcd</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>
         
@@ -63,14 +63,14 @@
       
       
       
-    <Pane><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\app_serv.c</Filename><XPos>0</XPos><YPos>631</YPos><SelStart>23337</SelStart><SelEnd>23337</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>360</YPos><SelStart>18127</SelStart><SelEnd>18127</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\fr.c</Filename><XPos>0</XPos><YPos>687</YPos><SelStart>18119</SelStart><SelEnd>18119</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2204</YPos><SelStart>103470</SelStart><SelEnd>103470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>54</YPos><SelStart>2473</SelStart><SelEnd>2473</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>6570</SelStart><SelEnd>6570</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1821</YPos><SelStart>36630</SelStart><SelEnd>36630</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>706</SelStart><SelEnd>706</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\coin.c</Filename><XPos>0</XPos><YPos>136</YPos><SelStart>2836</SelStart><SelEnd>2836</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\modem\modem.c</Filename><XPos>0</XPos><YPos>143</YPos><SelStart>3692</SelStart><SelEnd>3692</SelEnd></Tab><ActiveTab>10</ActiveTab><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></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\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\app_serv.c</Filename><XPos>0</XPos><YPos>194</YPos><SelStart>3860</SelStart><SelEnd>3860</SelEnd></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\DRIVERS\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>360</YPos><SelStart>18127</SelStart><SelEnd>18127</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\fr.c</Filename><XPos>0</XPos><YPos>687</YPos><SelStart>18119</SelStart><SelEnd>18119</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2204</YPos><SelStart>103470</SelStart><SelEnd>103470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>54</YPos><SelStart>2473</SelStart><SelEnd>2473</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>6570</SelStart><SelEnd>6570</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1821</YPos><SelStart>36630</SelStart><SelEnd>36630</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>706</SelStart><SelEnd>706</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\service\coin.c</Filename><XPos>0</XPos><YPos>136</YPos><SelStart>2836</SelStart><SelEnd>2836</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>0</YPos><SelStart>167</SelStart><SelEnd>167</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>43</YPos><SelStart>897</SelStart><SelEnd>897</SelEnd></Tab><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></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-0577faf0><key>iaridepm.enu1</key></Toolbar-0577faf0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>482</Bottom><Right>290</Right><x>-2</x><y>-2</y><xscreen>160</xscreen><yscreen>0</yscreen><sizeHorzCX>117130</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>213763</sizeVertCX><sizeVertCY>667586</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>200</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>117130</sizeVertCX><sizeVertCY>0</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-051129c8><key>iaridepm.enu1</key></Toolbar-051129c8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>482</Bottom><Right>290</Right><x>-2</x><y>-2</y><xscreen>160</xscreen><yscreen>0</yscreen><sizeHorzCX>117130</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>213763</sizeVertCX><sizeVertCY>667586</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>200</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>117130</sizeVertCX><sizeVertCY>0</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>
 

solarium.ewp

@@ -585,7 +585,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>solarium_3_31.hex</state>
+          <state>solarium_3_32.hex</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>