Changeset 72

Timestamp:

10/23/10 12:36:15 (14 years ago)

Author:

phil

Message:

- switched baud rate to 2400 (try to minimize errors)
- corrected binary coded hex number conversion algorithm for yield calculation

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (3 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (2 diffs)
• webserver/example/EnergyMeters/Source/serial.c (modified) (1 diff)

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs

@@ -21 +21 @@
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;FreeRTOS.org Source" name="unnamed" />
- </Project>
- <Register1>
@@ -40 +41 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
+   <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
+   <Watchpoint linenumber="547" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint evalMode="2" linenumber="312" numelements="10" evalType="0" radix="16" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint linenumber="547" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-  </Watches>
- </Watch1>
@@ -55 +56 @@
- </Watch3>
- <Watch4>
-
+
+
+
-   <Watchpoint evalMode="2" linenumber="677" numelements="6" evalType="0" radix="16" name="dayRxYield" expression="dayRxYield" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="1231" radix="16" name="currentCharValue" expression="currentCharValue" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint evalMode="2" linenumber="678" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-2" linenumber="699" numelements="21" evalType="0" radix="-1" name="yield_day_rsp" expression="yield_day_rsp
+1" linenumber="1231" evalType="1" radix="-1" name="srcDataStart" expression="srcDataStart
-   <Watchpoint linenumber="667" radix="16" name="rxYieldChkSum" expression="rxYieldChkSum" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="673" radix="-1" name="currentChannel" expression="currentChannel" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint evalMode="2" linenumber="1290" numelements="13" evalType="0" radix="-1" name="req_day_yield" expression="req_day_yield" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-  </Watches>
- </Watch4>
- <Files>
-662" path="D:\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="637
+1216" path="D:\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="1205
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\repo\webserver\example\EnergyMeters\Source\EnergyMeters\MetersIncludes.h" y="36" path="D:\repo\webserver\example\EnergyMeters\Source\EnergyMeters\MetersIncludes.h" left="0" selected="0" name="unnamed" top="11" />
-9
-16
+7
+20
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\repo\webserver\example\EnergyMeters\Source\queue.c" y="799" path="D:\repo\webserver\example\EnergyMeters\Source\queue.c" left="0" selected="0" name="unnamed" top="781" />
-128" path="D:\repo\webserver\example\EnergyMeters\Source\tasks.c" left="0" selected="0" name="unnamed" top="1104
+897" path="D:\repo\webserver\example\EnergyMeters\Source\tasks.c" left="0" selected="0" name="unnamed" top="1879
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="287" path="D:\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="0" name="unnamed" top="269" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="2" debugPath="D:\repo\webserver\example\EnergyMeters\Source\serial.c" y="225" path="D:\repo\webserver\example\EnergyMeters\Source\serial.c" left="0" selected="0" name="unnamed" top="209" />
- </Files>
- <ARMCrossStudioWindow activeProject="EnergyMetersEmbedded" autoConnectTarget="Segger J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" />

webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c

@@ -929 +929 @@
-{
-
-576
+24
-  unsigned int divisor = get_uart_clk(3, OSCILLATOR_CLOCK_FREQUENCY) / (16 * baud);
-
@@ -1203 +1203 @@
-                                    )
-{
+  unsigned char currentChar;
+  unsigned char conversionError = 0;
-
-  unsigned char x;
-  int resultValue = 0; /* initial value */
-  unsigned char round = 0; /* which digit? 0 = LSB */
-unsigned char
+int
-
-  /* go through the bytes backwards (least significant to most significant) */
-  for (x = lastSrcByte; x >= firstSrcByte; x--)
-  {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    resultValue = resultValue + (currentCharValue << (4 * round));
-
-    round++;
-  } /* for */
+
+  /* if a conversion error occurred, nullify the result */
+  if (conversionError == 1)
+  {
+      resultValue = 0xFFFF;
+  }
-
-  return resultValue;

webserver/example/EnergyMeters/Source/serial.c

@@ -224 +224 @@
-
-
-576
+24
-  unsigned int divisor = get_uart_clk(3, OSCILLATOR_CLOCK_FREQUENCY) / (16 * baud);
-