Changeset 70 for webserver

Timestamp:

10/17/10 18:13:03 (14 years ago)

Author:

phil

Message:

we now query and display the solar yields of the previous days (day - 1) for all the channels

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (3 diffs)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (3 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) (4 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (18 diffs)

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

@@ -14 +14 @@
- </Memory3>
- <Memory4>
-" numColumns="16" sizeText="
+0x40005cc8" numColumns="16" sizeText="60
- </Memory4>
- <Project>
-  <ProjectSessionItem path="EnergyMetersEmbedded" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;FreeRTOS.org Source" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;uIP Source" name="unnamed" />
- </Project>
- <Register1>
@@ -39 +42 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
-   <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="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" />
-  </Watches>
- </Watch1>
@@ -55 +58 @@
- <Watch4>
-  <Watches active="1" update="Twice a Second" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  </Watches>
- </Watch4>
- <Files>
-
-
-
-
-
-
-
-
-
+
+
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" y="115" path="D:\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="99" />
-
-
-
-
-
-
-
-
-
+
+
+
+
- </Files>
-Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Release
+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
-</session>

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c

@@ -70 +70 @@
-extern int solarReadCounter;
-extern unsigned char scDate[6]; /* date received from solar count */
+
+
+
+extern int dayRxYield[NUMBER_OF_SOLAR_CHANNELS]; /* daily yield data */
-
-extern int resultValueRaw; /* last raw yield value */
@@ -233 +237 @@
-{
-        int i;
+        unsigned char k;
-
-        unsigned long long currentTime = getEpochTimeWithMs();
@@ -280 +285 @@
-      } /* for */
-
+      for (i = 0; i < NUMBER_OF_SOLAR_CHANNELS; i++)
+      {
+         sprintf( cCountBuf, "DAY %u %u\n", (int)i, dayRxYield[i] );
+         strcat( uip_appdata, cCountBuf );
+      }
+
+      strcat( uip_appdata, cCountBuf );
-
-

webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h

@@ -2 +2 @@
-void initMeterItems(void);
-
-
-
+
+
+
+
+
-
-int extractBinaryHexDigitString(unsigned char* srcDataStart, 
@@ -12 +15 @@
-
-unsigned long long getEpochTimeWithMs(void);
+
+
+void send_yield_query_day(unsigned char channel /* 0 to 5 */, unsigned char day /* 1 to 31 */);
+void send_yield_query_hour(unsigned char channel /* 0 to 5 */, unsigned char hour /* 0 to 23 */);
+void send_yield_query_minute(unsigned char channel /* 0 to 5 */, unsigned char minute /* 0 to 59 */);
-
-#define NUMBER_OF_METERS 6 /* the number of meters we use */
@@ -24 +32 @@
-
-#define METERS_INT_CHECK_INTERVAL_MS 100 /* how often (in ms) do we check if one of the I/O lines has triggered */
+
+
+#define NUMBER_OF_SOLAR_CHANNELS 6 /* number of solar channels */
+#define DAILY_RX_YIELD_LENGTH 9 /* length of the rx data */
+
-
-
@@ -50 +63 @@
-extern int historyRemainTime; /* how many ticks have we left until the next history entry must be written? */
-
+/* bit values for calculate_crc8() */
+
+#define BIT0 (1U << 0)
+#define BIT1 (1U << 1)
+#define BIT2 (1U << 2)
+#define BIT3 (1U << 3)
+#define BIT4 (1U << 4)
+#define BIT5 (1U << 5)
+#define BIT6 (1U << 6)
+#define BIT7 (1U << 7)
+
+

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

@@ -103 +103 @@
-
-
+int dayRxYield[NUMBER_OF_SOLAR_CHANNELS]; /* daily yield data */
+
+
-const unsigned char query_sc_time[] = "\x02\xB0\xF0\x03\x00\x04\xAB\xB9\x03"; // Zeit abfragen
-const unsigned char query_sc_time_rsp[] = "\x02\xF0\xB0\x08\x00\x84\x00\x00\x00\x00\x00\x00\x00\x03"; // Zeit abfragen
@@ -120 +123 @@
-//specification: unsigned char req_month_yield[] = "\x02\x31\x3c\x4d\x30\x31\x30\x30\x03"; // Frame for querying the yield. Will be filled in by solQueryYield()
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// tt (time) values: m=minute , h = hour, D = day, M = month (\x31), Y = year
@@ -129 +152 @@
-// ad: unit address
-// r1 to r7: result binary coded hex
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
@@ -229 +250 @@
-{
-  int i;
+  int k;
+
-  xLastSolarStateChangeTime = xTaskGetTickCount();
-  xLastTimeCheckTime = xTaskGetTickCount();
@@ -243 +266 @@
-
-  /* do not invalidate history here so we do not lose all data */
+
+  /* init daily rx yield array with 0 */
+  for (i = 0; i < NUMBER_OF_SOLAR_CHANNELS; i++)
+  {
+      dayRxYield[i] = 0;
+  } /* for */
-
-
@@ -417 +446 @@
-void solarFSM(void)
-{
+  unsigned char i;
-  int cmpResult;
+  unsigned char power; /* variable for conversions */
+  unsigned char checkDate; /* temp variable for day of month */
-
-
@@ -537 +569 @@
-
-        currentChannel = 0; /* start yield scan on channel 0 */
-
+/xxxxxxx SOL_NO_INIT; //SOL_QUERY_YIELD; /
-      }
-      else
@@ -552 +584 @@
-        /* first, fill in data for tx */
-        // TODO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    break; /* end of case SOL_QUERY_YIELD */
@@ -576 +648 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
@@ -584 +661 @@
-      {
-        /* we have got a match! */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     }
-#if 0
-        currentChannel++; /* next channel */
-
-        if (currentChannel >= 6)
-        {
-          solarState = SOL_NO_INIT; /* change state: last channel done */
-        } /* if */
-        else
-        {
-          solarState = SOL_QUERY_YIELD; /* scan next channel */
-        } /* else */
-#endif
-
-    break; /* end of case SOL_QUERY_YIELD_WAIT_REPLY */
@@ -1012 +1084 @@
-
-
-
+ 
-{
-  portCHAR retVal; /* return value */
@@ -1020 +1092 @@
-  int x;
-
- = 0
+
-  unsigned char crcCHAR;
-  unsigned char crcCHARinv;
-
+
+
+
+
+
+
+
-
-  /* use bytes 1 to 13 for the checksum */
@@ -1029 +1107 @@
-  {
-
-    /* overflow? */
- //   if (((portSHORT)crc + (portSHORT)(dataStart[x])) > 0xFF)
- //   {
- //     carry++;
- //   }
-
-    crcLONG = (crcLONG + dataStart[x]); /* add and truncate to 8 bit */
-  }
@@ -1040 +1112 @@
-  carry = (unsigned char)(((crcLONG & 0xFF00) >> 8));
-
-
-
-
+
-  crcCHARinv = (unsigned char)(~crcCHAR);
-
@@ -1048 +1118 @@
-  calculatedCrc1Byte = crcCHARinv; /* save calculated CRC (for use in case of checksum generation) */
-
-char
+
-  {
-    retVal = 1; /* checksum OK, data is valid */
@@ -1060 +1130 @@
-
-
-
+ 
-{
-  unsigned short cmpValue;
@@ -1077 +1147 @@
-
-
-charCheckSumStartByte+1])<<8) | dataStart[char
+CheckSumStartByte+1])<<8) | dataStart[
-
-  calculatedCrc2Byte = staticCRC; /* save calculated CRC (for use in case of checksum generation) */
@@ -1132 +1202 @@
-
- } /* extractBinaryHexDigitString() */
+
+
+static unsigned char calculate_crc8(unsigned char * d_serdata_tuc, unsigned char nbytes)
+{
+   unsigned char i;
+   unsigned char j;
+   unsigned char d_currbyte_tuc;
+   unsigned char d_crc_tuc;
+   
+   /* start with BISISTX and repeat the checksum calculation for all bytes until CHKS8 (excl.) */
+    d_crc_tuc = 0; //   init the checksum
+
+    for( j = 1; j < (nbytes-2); j ++  )
+    {
+
+      d_currbyte_tuc = d_serdata_tuc[ j ];
+
+      for( i = 8; i > 0; i --  )
+      {
+         /*  if  current bit != 0 */
+         if (( (d_crc_tuc ^ d_currbyte_tuc) & BIT0  ) != 0)
+         {
+            d_crc_tuc ^= 0x18;
+            d_crc_tuc >>= 1;
+            d_crc_tuc |= BIT7;
+         }
+         else
+         {
+          d_crc_tuc >>= 1;
+         }
+         d_currbyte_tuc >>= 1;   //       prepare for next databit
+      } /* for */
+    } // this byte is finished
+
+  /* checksum is complete now - result always ORed with 0x80  and then compare */
+  /* calculated and received checksum */
+  d_crc_tuc |= BIT7;
+  return d_crc_tuc;
+}
+
+
+void send_yield_query_day(unsigned char channel /* 0 to 5 */, unsigned char day /* 1 to 31 */)
+{
+        unsigned char newChkSum;
+
+        req_day_yield[5] = 0x30 + channel; // channel
+
+
+        /* convert day to binary coded hex */
+        if (day > 15)
+        {
+            req_day_yield[8] = 0x31; /* hex MSB day is 1 */
+            day = day - 16;          /* decrease day (is now remainder */
+        }
+        else
+        {
+            req_day_yield[8] = 0x30; /* hex MSB day is 0 */
+        }
+        req_day_yield[9] = 0x30 + day; /* hex LSB day */
+
+        newChkSum = calculate_crc8(  (&(req_day_yield[0])), (sizeof(req_day_yield)-1));
+        req_day_yield[10] = newChkSum; /* fill in checksum */
+
+        resetUart3RxBuf();
+        send_uart3((unsigned char *)req_day_yield, sizeof(req_day_yield));
+
+} /* prepare_yield_query_day() */
+
+
+void send_yield_query_hour(unsigned char channel /* 0 to 5 */, unsigned char hour /* 0 to 23 */)
+{
+
+        unsigned char newChkSum;
+        unsigned char hourMSB;
+        unsigned char hourLSB;
+
+        req_hour_yield[5] = 0x30 + channel; // channel
+
+     
+        hourMSB = hour % 16;
+        hourLSB = hour - hourMSB;
+        
+        req_hour_yield[8] = 0x30 + hourMSB; // minute MSB (binary coded hex) 
+        req_hour_yield[9] = 0x30 + hourLSB; // minute LSB (binary coded hex)
+
+        newChkSum = calculate_crc8(  (&(req_hour_yield[0])), (sizeof(req_hour_yield)-1));
+
+        // crc
+        req_hour_yield[10] = newChkSum; /* fill in checksum */
+
+        resetUart3RxBuf();
+        send_uart3((unsigned char *)req_hour_yield, sizeof(req_hour_yield));
+
+
+
+} /* prepare_yield_query_hour() */
+
+
+void send_yield_query_minute(unsigned char channel /* 0 to 5 */, unsigned char minute /* 0 to 59 */)
+{
+        unsigned char newChkSum;
+        unsigned char minuteMSB;
+        unsigned char minuteLSB;
+
+        req_minute_yield[5] = 0x30 + channel; // channel
+
+     
+        minuteMSB = minute % 16;
+        minuteLSB = minute - minuteMSB;
+        
+        req_minute_yield[6] = 0x30 + minuteMSB; // minute MSB (binary coded hex) 
+        req_minute_yield[7] = 0x30 + minuteLSB; // minute LSB (binary coded hex)
+
+        newChkSum = calculate_crc8(  (&(req_minute_yield[0])), (sizeof(req_minute_yield)-1));
+
+        // crc
+        req_minute_yield[10] = newChkSum; /* fill in checksum */
+
+        resetUart3RxBuf();
+        send_uart3((unsigned char *)req_minute_yield, sizeof(req_minute_yield));
+
+
+} /* prepare_yield_query_minute() */