Changeset 35 for webserver/example

Timestamp:

01/03/10 11:19:00 (15 years ago)

Author:

phil

Message:

first round now works

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (3 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (10 diffs)

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

@@ -3 +3 @@
- <Bookmarks/>
- <Breakpoints>
-108
+335
- </Breakpoints>
- <ExecutionCountWindow/>
@@ -42 +42 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
-
+
+
-   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-
-
+
-  </Watches>
- </Watch1>
@@ -58 +58 @@
- <Watch4>
-  <Watches active="1" update="Five Seconds" >
-86" radix="16" name="compareBuf" expression="compareBuf
-linenumber="197" radix="16" name="compareBufMask" expression="compareBufMask
-197" radix="16" name="compareBuf" expression="compareBuf
-linenumber="211" radix="16" name="numRxBytes" expression="numRxBytes
-linenumber="211" radix="16" name="numRxBytes" expression="numRxBytes
-evalMode="2" linenumber="375" numelements="6" evalType="0" radix="-1" name="chanWatt" expression="chanWatt
-evalMode="2" linenumber="414" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3
-1" radix="-1" name="lengthCompare" expression="lengthCompare
-evalMode="2" linenumber="375" numelements="6" evalType="0" radix="-1" name="chanVolt" expression="chanVolt
-214" radix="16" name="k" expression="k
+227" radix="16" name="k" expression="k
+evalMode="2" linenumber="389" numelements="6" evalType="0" radix="-1" name="chanVolt" expression="chanVolt
+224" radix="-1" name="lengthCompare" expression="lengthCompare
+evalMode="2" linenumber="440" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3
+evalMode="2" linenumber="389" numelements="6" evalType="0" radix="-1" name="chanWatt" expression="chanWatt
+linenumber="224" radix="16" name="numRxBytes" expression="numRxBytes
+linenumber="224" radix="16" name="numRxBytes" expression="numRxBytes
+0" radix="16" name="compareBuf" expression="compareBuf
+linenumber="210" radix="16" name="compareBufMask" expression="compareBufMask
+87" radix="16" name="compareBuf" expression="compareBuf
-  </Watches>
- </Watch4>
- <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" y="108" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" left="0" selected="0" name="unnamed" top="85" />
-14" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="1" name="unnamed" top="12
-105
+35" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="1" name="unnamed" top="35
+96
- </Files>
- <ARMCrossStudioWindow activeProject="EnergyMetersEmbedded" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dokumente und Einstellungen\phil\Desktop\repo\Examples_CP-JR_ARM7_LPC2368\ETT_LPC2368_Examples\PERIPHERAL_DEMO\LED_Blink" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" />

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

@@ -5 +5 @@
-// Pin I/O LED Control Maskbit
-#define  DIR_RS485   0x00080000                 // P1.19(0000 0000 0000 x000 0000 0000 0000 0000)
-
-
+
-
-#define RX_UART3_BUF_SIZE 100
@@ -38 +37 @@
-const unsigned char init1_rsp[] = "\x02\xf0\xb0\x08\x00\x84\x09\x0c\x04\x0a\x26\x86\xcd\x00\x03"; /* exp. init seq response */
-const unsigned char init1_r_m[] = "\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff"; /* exp. init seq response mask */
+/* init1_r_m: response after first init: \x02\xf0\xb0\x08 , later: \x02\xf0\xb0\x09 */
-
-
@@ -50 +50 @@
-
-const unsigned char init_after_all_chan[]     = "\x02\xb0\xf0\x04\x00\x21\x00\xcc\x35\x03"; // send to SC after all channels have been scanned
+// ^^ equals init1[]
-
-const unsigned char init_after_all_chan_rsp[] = "\x02\xf0\xb0\x09\x00\xa1\xfd\x03\x00\x00\x00\x00\x07\x21\x03"; // response from SC to init_after_all_chan[]
@@ -89 +90 @@
-
-
+void RXD_RS485(void)
+{
+  IOCLR1 = DIR_RS485;           // RS485 Direction = 0 (Receive)
+} /* RXD_RS485 */
+
+void TXD_RS485(void) 
+{
+  delay(500000);
+  IOSET1 = DIR_RS485;           // RS485 Direction = 1 (Transmit)
+} /* TXD_RS485 */
+
+
-
-void testUART3(void)
@@ -256 +269 @@
-  {
-    case SOL_NO_INIT:
+      delay(500000);
-      init_serial3();
-      resetUart3RxBuf(); /* init */
@@ -261 +275 @@
-
-      TXD_RS485();
+      delay(500000);
-       /* send init 1 */
-      send_uart3((unsigned char *)init1, sizeof(init1));
@@ -317 +332 @@
-        break;
-      case 6:
-
-
+
-        solarState = SOL_FINISHED;
-        break;
@@ -327 +341 @@
-     if (solarState != SOL_FINISHED)
-     {
-
+ /* wait for reply if not finished */
-     } /* if */
-    break;
@@ -373 +387 @@
-        {
-          chanVolt[currentChannel] = rxUART3[11];
-rxUART3[7] | (((int)(rxUART3[6])) << 8) /* index 7: LSB, index 6
+(rxUART3[7]) | (((int)(rxUART3[8])) << 8) /* index 7: LSB, index 8
-        } /* if */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-      else
@@ -495 +521 @@
-void delay(unsigned long int count1)
-{
-
+
+
+
-}
-