Changeset 56 for webserver

Timestamp:

03/07/10 10:45:29 (15 years ago)

Author:

phil

Message:

- added watt history, SOLAR_WATT_HISTORY_STEPSIZE, SOLAR_WATT_HISTORYSIZE
- added SOLAR_FSM_INVALID_VALUE 0x4000 for wattages (after stuck)
- changed "solar FSM stuck" check in solarFSM()
- increased cCountBuf[] buffer size (to prevent overflow/mem corruption)

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (2 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) (1 diff)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (8 diffs)

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

@@ -218 +218 @@
-
-extern void vTaskList( signed char *pcWriteBuffer );
-8
+10
-long lRefreshCount = 0;
-static unsigned short
-generate_rtos_stats(void *arg)
-{
+        int i;
-
-        unsigned long long currentTime = getEpochTimeWithMs();
@@ -323 +324 @@
-         );
-        strcat( uip_appdata, cCountBuf );
+
+
+      sprintf( cCountBuf, "HIST %u %u\r\n",
+      SOLAR_WATT_HISTORY_STEPSIZE,
+      SOLAR_WATT_HISTORYSIZE );
+      strcat( uip_appdata, cCountBuf );
+
+      for (i = 0; i < SOLAR_WATT_HISTORYSIZE; i++)
+      {
+          sprintf( 
+            cCountBuf, "SH %u %u %u %u\r\n",
+             SOLAR_WATT_HISTORYSIZE,
+           
+            SolarHistory[i][0],
+            SolarHistory[i][1],
+            SolarHistory[i][2]
+          );
+          strcat( uip_appdata, cCountBuf );
+      } /* for */
-
-        //strcat( ( char * ) uip_appdata, ( char * ) "1234test" );

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

@@ -28 +28 @@
-meterItem meterItems[NUMBER_OF_METERS]; /* the data for all the meters */
-
+/* the history spans (SOLAR_WATT_HISTORYSIZE * SOLAR_WATT_HISTORY_STEPSIZE) / 1000 seconds */
+
+/* how many old values of the three wattages do we keep? */
+#define SOLAR_WATT_HISTORYSIZE        10
+/* how far are the values apart? in milliseconds */
+#define SOLAR_WATT_HISTORY_STEPSIZE   3000
+extern int SolarHistory[SOLAR_WATT_HISTORYSIZE][3]; /* three watt values: P1, P2, P3 */
+extern int historyRemainTime; /* how many ticks have we left until the next history entry must be written? */
+

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

@@ -8 +8 @@
-#include "task.h"
-#include "serial.h"
+#include "MetersIncludes.h"
+
+
+static void advanceHistoryArray(void);
-
-#define solarSTACK_SIZE         configMINIMAL_STACK_SIZE+200
-
-#define SOLAR_READ_DELAY         500
+
+/* after what inactivity time (ms) do we determine the solar FSM as stuck? */
+#define SOLAR_FSM_STUCK_TIMEOUT  2000
+
+/* means "unknown value", converted to "U" on rrdtool script side */
+#define SOLAR_FSM_INVALID_VALUE  0x4000 /* 16384 */
+
+
+
+int SolarHistory[SOLAR_WATT_HISTORYSIZE][3]; /* three watt values: P1, P2, P3 */
+int historyRemainTime = SOLAR_WATT_HISTORY_STEPSIZE; /* how many ticks have we left until the next history entry must be written? */
+
+
+
-
-// Pin I/O LED Control Maskbit
@@ -106 +124 @@
-portTickType xLastSolarStateChangeTime;
-
+ /* time when the elements of the history array were last moved on one step */
+portTickType xLastSolarHistoryAdvance;
+
+
-
-int solarReadErrors = 0;
@@ -141 +163 @@
-void initSolarFSM(void)
-{
+  int i;
-  xLastSolarStateChangeTime = xTaskGetTickCount();
+  xLastSolarHistoryAdvance = xTaskGetTickCount();
-  xLastReadTime = xTaskGetTickCount();
-  solarState = SOL_NO_INIT;
@@ -147 +171 @@
-  rxBuf3NextFreeRxPos = 0;
-  currentChannel = 0;
+
+  /* set data to invalid value */
+  chanWatt[0] = SOLAR_FSM_INVALID_VALUE;
+  chanWatt[1] = SOLAR_FSM_INVALID_VALUE;
+  chanWatt[2] = SOLAR_FSM_INVALID_VALUE;
+
+  /* invalidate history */
+  for (i = 0; i < SOLAR_WATT_HISTORYSIZE; i++)
+  {
+            SolarHistory[i][0] = SOLAR_FSM_INVALID_VALUE;
+            SolarHistory[i][1] = SOLAR_FSM_INVALID_VALUE;
+            SolarHistory[i][2] = SOLAR_FSM_INVALID_VALUE;
+  }
+
-} /* initSolarFSM */
-
@@ -326 +364 @@
-
-  /* did the SolarFSM get stuck during reading? */
-5000
+SOLAR_FSM_STUCK_TIMEOUT
-  {
-    /* something has gone wrong (possible Rx Timeout). restart, state SOL_NO_INIT */
@@ -332 +370 @@
-    initSolarFSM();
-    solarReadErrors++;
+  }
+  else if (xTaskGetTickCount() < xLastSolarStateChangeTime)
+  {
+    /* overflow of timer, just recover. delay will be wrong. */
+    xLastSolarStateChangeTime = xTaskGetTickCount();
+  }
+
+
+  if (xTaskGetTickCount() > (xLastSolarHistoryAdvance + SOLAR_WATT_HISTORY_STEPSIZE))
+  {
+    advanceHistoryArray();
+  }
+  else if (xTaskGetTickCount() < xLastSolarHistoryAdvance)
+  {
+    /* overflow of timer, just recover. delay will be wrong. */
+    xLastSolarHistoryAdvance = xTaskGetTickCount();
-  }
-
@@ -454 +508 @@
-        if ((currentChannel >= 0) && (currentChannel < 6))
-        {
+          portENTER_CRITICAL();
-          chanVolt[currentChannel] = rxUART3[11];
-          chanWatt[currentChannel] = (int)(rxUART3[7]) | (((int)(rxUART3[8])) << 8) /* index 7: LSB, index 8: MSB */;
+          portEXIT_CRITICAL();
-        } /* if */
-
@@ -495 +551 @@
-
-
+/*
+ * Check if we have to save the current data to the next history array set, and do it
+ * if necessary.
+ *
+ */
+static void advanceHistoryArray(void)
+{
+  int i;
+
+  /* advance entries by 1. we do not care about data locking here. */
+  for (i = 0; i < (SOLAR_WATT_HISTORYSIZE-1); i++)
+  {
+    portENTER_CRITICAL();
+    SolarHistory[i+1][0] = SolarHistory[i][0];
+    SolarHistory[i+1][1] = SolarHistory[i][1];
+    SolarHistory[i+1][2] = SolarHistory[i][2];
+    portEXIT_CRITICAL();
+  } /* for */
+  /* get the most recent values to index 0 */
+  portENTER_CRITICAL();
+  SolarHistory[0][0] = chanWatt[0];
+  SolarHistory[0][1] = chanWatt[1];
+  SolarHistory[0][2] = chanWatt[2];
+  portEXIT_CRITICAL();
+
+} /* advanceHistoryArray() */
-
-