Changeset 58

Timestamp:

03/07/10 13:35:12 (15 years ago)

Author:

phil

Message:

- solar history now in reverse direction
- do not invalidate whole history on read error, only recent data item

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (1 diff)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (3 diffs)

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

@@ -250 +250 @@
-      strcat( uip_appdata, cCountBuf );
-
-0; i < SOLAR_WATT_HISTORYSIZE; i++
+SOLAR_WATT_HISTORYSIZE; i > 0; i--
-      {
+          /* print history in reverse direction */
-          sprintf( 
-            cCountBuf, "SH %u %u %u %u\r\n",
-SOLAR_WATT_HISTORY_STEPSIZE * i
-
-
-
+(SOLAR_WATT_HISTORY_STEPSIZE) * (i-1)
+-1
+-1
+-1
-          );
-          strcat( uip_appdata, cCountBuf );

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

@@ -165 +165 @@
-  int i;
-  xLastSolarStateChangeTime = xTaskGetTickCount();
-  xLastSolarHistoryAdvance = xTaskGetTickCount();
-  xLastReadTime = xTaskGetTickCount();
-  solarState = SOL_NO_INIT;
@@ -172 +171 @@
-  currentChannel = 0;
-
-data
+recent data item
-  chanWatt[0] = SOLAR_FSM_INVALID_VALUE;
-  chanWatt[1] = SOLAR_FSM_INVALID_VALUE;
-  chanWatt[2] = SOLAR_FSM_INVALID_VALUE;
-
-
-
-
-
-
-
-
+
+
-
-} /* initSolarFSM */
@@ -711 +705 @@
-static portTASK_FUNCTION( vSolar_Task, pvParameters )
-{
+  int i;
-
-  init_serial3();
+
+  /* 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;
+  }
+
+  xLastSolarHistoryAdvance = xTaskGetTickCount();
+
-  initSolarFSM();
-