Исправления вывода на экран

PROJECT/app/app_serv.c

@@ -796,7 +796,7 @@ void UserPrintMoneyMenu(void)
         {
           LED_on();
           if (time >= maxtime*60) sprintf(&buf[strlen(buf)], "ĚŔĘŃ.ŃĹŔÍŃ");
-          else sprintf(&buf[strlen(buf)], "ÀÏÏ.ÃÎÒÎÂ");
+          else sprintf(&buf[strlen(buf)], "ÀÏÏÀÐÀÒ ÃÎÒÎÂ");
         }
       else
         {
@@ -1088,18 +1088,18 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
             case CHANNEL_STATE_EMPTY:
               break;
             case CHANNEL_STATE_PAUSE_BEFORE:
-              sprintf(buf, "ÄÎ ÂÊË.ËÀÌÏ:");
+              sprintf(buf, "ÍÀ×ÀËÎ ÑÅÀÍÑÀ:");
               break;
             case CHANNEL_STATE_WORK:
-              sprintf(buf, "ÄÎ ÎÊÎÍ.ÇÀÃÀÐÀ:");
+              sprintf(buf, "ÈÄÅÒ ÑÅÀÍÑ ÇÀÃÀÐÀ:");
               break;
             case CHANNEL_STATE_PAUSE_AFTER:
-              sprintf(buf, "ÄÎ ÎÊÎÍ.ÂÅÍÒÈË:");
+              sprintf(buf, "ÂÅÍÒÈËßÖÈß:");
               break;
           }
           PrintUserMenuStr(buf, 2);
 
-          PrintSecToHourMinSec(buf, GetChannelsTimeForFree(recentchannel));
+          PrintSecToMinSec(buf, GetChannelsTimeForFree(recentchannel));
           PrintUserMenuStr(buf, 3);
         }
       else
@@ -1155,13 +1155,13 @@ CPU_INT32U GetChannelsTimeForFree(CPU_INT08U ch)
         case CHANNEL_STATE_EMPTY:
           break;
         case CHANNEL_STATE_PAUSE_BEFORE:
-          res = payedtime;
+          res = beforetime;
           break;
         case CHANNEL_STATE_WORK:
-          res = aftertime;
+          res = payedtime;
           break;
         case CHANNEL_STATE_PAUSE_AFTER:
-          res = ChannelsCounters[ch];
+          res = aftertime;
           break;      
       }
 

PROJECT/version.h

@@ -1,7 +1,7 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define   DEVICE_FW_VERSION   "03.42"
+#define   DEVICE_FW_VERSION   "03.43"
 
 
 #endif // #ifndef _VERSION_H_

settings/solarium.Flash.cspy.bat

@@ -0,0 +1,40 @@
+@REM This batch file has been generated by the IAR Embedded Workbench
+@REM C-SPY Debugger, as an aid to preparing a command line for running
+@REM the cspybat command line utility using the appropriate settings.
+@REM
+@REM Note that this file is generated every time a new debug session
+@REM is initialized, so you may want to move or rename the file before
+@REM making changes.
+@REM
+@REM You can launch cspybat by typing the name of this batch file followed
+@REM by the name of the debug file (usually an ELF/DWARF or UBROF file).
+@REM
+@REM Read about available command line parameters in the C-SPY Debugging
+@REM Guide. Hints about additional command line parameters that may be
+@REM useful in specific cases:
+@REM   --download_only   Downloads a code image without starting a debug
+@REM                     session afterwards.
+@REM   --silent          Omits the sign-on message.
+@REM   --timeout         Limits the maximum allowed execution time.
+@REM 
+
+
+@echo off 
+
+if not "%~1" == "" goto debugFile 
+
+@echo on 
+
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium\settings\solarium.Flash.general.xcl" --backend -f "C:\git_work\solarium\settings\solarium.Flash.driver.xcl" 
+
+@echo off 
+goto end 
+
+:debugFile 
+
+@echo on 
+
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium\settings\solarium.Flash.general.xcl" "--debug_file=%~1" --backend -f "C:\git_work\solarium\settings\solarium.Flash.driver.xcl" 
+
+@echo off 
+:end

settings/solarium.Flash.cspy.ps1

@@ -0,0 +1,31 @@
+param([String]$debugfile = "");
+
+# This powershell file has been generated by the IAR Embedded Workbench
+# C - SPY Debugger, as an aid to preparing a command line for running
+# the cspybat command line utility using the appropriate settings.
+#
+# Note that this file is generated every time a new debug session
+# is initialized, so you may want to move or rename the file before
+# making changes.
+#
+# You can launch cspybat by typing Powershell.exe -File followed by the name of this batch file, followed
+# by the name of the debug file (usually an ELF / DWARF or UBROF file).
+#
+# Read about available command line parameters in the C - SPY Debugging
+# Guide. Hints about additional command line parameters that may be
+# useful in specific cases :
+#   --download_only   Downloads a code image without starting a debug
+#                     session afterwards.
+#   --silent          Omits the sign - on message.
+#   --timeout         Limits the maximum allowed execution time.
+#
+
+
+if ($debugfile -eq "")
+{
+& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium\settings\solarium.Flash.general.xcl" --backend -f "C:\git_work\solarium\settings\solarium.Flash.driver.xcl" 
+}
+else
+{
+& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium\settings\solarium.Flash.general.xcl" --debug_file=$debugfile --backend -f "C:\git_work\solarium\settings\solarium.Flash.driver.xcl" 
+}

settings/solarium.Flash.driver.xcl

@@ -0,0 +1,25 @@
+"--endian=little" 
+
+"--cpu=ARM7TDMI-S" 
+
+"--fpu=None" 
+
+"-p" 
+
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\CONFIG\debugger\NXP\LPC2368.ddf" 
+
+"--drv_verify_download" 
+
+"--semihosting" 
+
+"--device=LPC2368" 
+
+"--drv_communication=USB0" 
+
+"--drv_interface_speed=adaptive" 
+
+"--jlink_reset_strategy=0,9" 
+
+
+
+

settings/solarium.Flash.general.xcl

@@ -0,0 +1,15 @@
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armPROC.dll" 
+
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll" 
+
+"C:\git_work\solarium\Flash\Exe\solarium.out" 
+
+--plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll" 
+
+--device_macro="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\config\debugger\NXP\LPC23xx.dmac" 
+
+--flash_loader="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\config\flashloader\NXP\FlashNXPLPC512K2.board" 
+
+
+
+

settings/solarium.crun

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<crun>
+    <version>1</version>
+    <filter_entries>
+        <filter index="0" type="default">
+            <type>*</type>
+            <start_file>*</start_file>
+            <end_file>*</end_file>
+            <action_debugger>0</action_debugger>
+            <action_log>1</action_log>
+        </filter>
+    </filter_entries>
+</crun>

settings/solarium.dnx

@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<settings>
+    <JLinkDriver>
+        <WatchCond>_ 0</WatchCond>
+        <Watch0>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch0>
+        <Watch1>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch1>
+        <LeaveTargetRunning>_ 0</LeaveTargetRunning>
+        <CStepIntDis>_ 0</CStepIntDis>
+    </JLinkDriver>
+    <DebugChecksum>
+        <Checksum>-1867077700</Checksum>
+    </DebugChecksum>
+    <DisAssemblyWindow>
+        <NumStates>_ 1</NumStates>
+        <State_1>_ 1</State_1>
+    </DisAssemblyWindow>
+    <InstructionProfiling>
+        <Enabled>_ 0</Enabled>
+    </InstructionProfiling>
+    <CodeCoverage>
+        <Enabled>_ 0</Enabled>
+    </CodeCoverage>
+    <Profiling>
+        <Enabled>0</Enabled>
+    </Profiling>
+    <StackPlugin>
+        <Enabled>1</Enabled>
+        <OverflowWarningsEnabled>1</OverflowWarningsEnabled>
+        <WarningThreshold>90</WarningThreshold>
+        <SpWarningsEnabled>1</SpWarningsEnabled>
+        <WarnHow>0</WarnHow>
+        <UseTrigger>1</UseTrigger>
+        <TriggerName>main</TriggerName>
+        <LimitSize>0</LimitSize>
+        <ByteLimit>50</ByteLimit>
+    </StackPlugin>
+    <Breakpoints>
+        <Count>0</Count>
+    </Breakpoints>
+    <TraceHelper>
+        <Enabled>0</Enabled>
+        <ShowSource>1</ShowSource>
+    </TraceHelper>
+    <InterruptLog>
+        <LogEnabled>0</LogEnabled>
+        <SumEnabled>0</SumEnabled>
+        <GraphEnabled>0</GraphEnabled>
+        <ShowTimeLog>1</ShowTimeLog>
+        <ShowTimeSum>1</ShowTimeSum>
+        <SumSortOrder>0</SumSortOrder>
+    </InterruptLog>
+    <Stack>
+        <FillEnabled>0</FillEnabled>
+        <OverflowWarningsEnabled>1</OverflowWarningsEnabled>
+        <WarningThreshold>90</WarningThreshold>
+        <SpWarningsEnabled>1</SpWarningsEnabled>
+        <WarnLogOnly>1</WarnLogOnly>
+        <UseTrigger>1</UseTrigger>
+        <TriggerName>main</TriggerName>
+        <LimitSize>0</LimitSize>
+        <ByteLimit>50</ByteLimit>
+    </Stack>
+    <Interrupts>
+        <Enabled>1</Enabled>
+    </Interrupts>
+    <MemoryMap>
+        <Enabled>0</Enabled>
+        <Base>0</Base>
+        <UseAuto>0</UseAuto>
+        <TypeViolation>1</TypeViolation>
+        <UnspecRange>1</UnspecRange>
+        <ActionState>1</ActionState>
+    </MemoryMap>
+    <Trace1>
+        <Enabled>0</Enabled>
+        <ShowSource>1</ShowSource>
+    </Trace1>
+    <Exceptions>
+        <StopOnUncaught>_ 0</StopOnUncaught>
+        <StopOnThrow>_ 0</StopOnThrow>
+    </Exceptions>
+    <CallStack>
+        <ShowArgs>0</ShowArgs>
+    </CallStack>
+    <Disassembly>
+        <MixedMode>1</MixedMode>
+    </Disassembly>
+    <struct_types>
+        <Fmt0>TFiscShortStatus-Mode	4	0</Fmt0>
+        <Fmt1>TFiscShortStatus-OperatorNumber	4	0</Fmt1>
+        <Fmt2>TFiscShortStatus-SubMode	4	0</Fmt2>
+    </struct_types>
+    <array_types>
+        <Fmt0>CPU_INT32U[8]	4	0</Fmt0>
+    </array_types>
+    <Log_file>
+        <LoggingEnabled>_ 0</LoggingEnabled>
+        <LogFile>_ ""</LogFile>
+        <Category>_ 0</Category>
+    </Log_file>
+    <TermIOLog>
+        <LoggingEnabled>_ 0</LoggingEnabled>
+        <LogFile>_ ""</LogFile>
+    </TermIOLog>
+    <CallStackLog>
+        <Enabled>0</Enabled>
+    </CallStackLog>
+    <DriverProfiling>
+        <Enabled>0</Enabled>
+        <Mode>0</Mode>
+        <Graph>0</Graph>
+        <Symbiont>0</Symbiont>
+    </DriverProfiling>
+    <Disassemble_mode>
+        <mode>0</mode>
+    </Disassemble_mode>
+    <PlDriver>
+        <MemConfigValue>C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\CONFIG\debugger\NXP\LPC2368.ddf</MemConfigValue>
+    </PlDriver>
+    <ArmDriver>
+        <EnableCache>0</EnableCache>
+    </ArmDriver>
+    <DisassembleMode>
+        <mode>0</mode>
+    </DisassembleMode>
+    <Breakpoints2>
+        <Count>0</Count>
+    </Breakpoints2>
+    <Aliases>
+        <Count>0</Count>
+        <SuppressDialog>0</SuppressDialog>
+    </Aliases>
+</settings>

solarium.ewp

@@ -650,7 +650,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>solarium_3_42.hex</state>
+                    <state>solarium_3_43.hex</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>
@@ -668,7 +668,7 @@
             <data>
                 <extensions></extensions>
                 <cmdline></cmdline>
-                <hasPrio>208</hasPrio>
+                <hasPrio>128</hasPrio>
                 <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>