Changeset 57

Timestamp:

03/07/10 11:21:08 (15 years ago)

Author:

phil

Message:

completed solar history entries

Files:

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

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

@@ -243 +243 @@
-        //strcat( ( char * ) uip_appdata, ( char * ) "\r\n" );
-
+
+
+      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_HISTORY_STEPSIZE * i),
+            SolarHistory[i][0],
+            SolarHistory[i][1],
+            SolarHistory[i][2]
+          );
+          strcat( uip_appdata, cCountBuf );
+      } /* for */
+
+
+
+
-        sprintf( cCountBuf, "<p><br>\r\nTSTmeter %u %u %u %u %u %u %u %u\r\n",
-            meterItems[METER_INDEX_TST].meterEnabled,
@@ -325 +347 @@
-        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/SolarCountUART.c

@@ -381 +381 @@
-  {
-    advanceHistoryArray();
+    xLastSolarHistoryAdvance = xTaskGetTickCount(); /* update timer */
-  }
-  else if (xTaskGetTickCount() < xLastSolarHistoryAdvance)
@@ -561 +562 @@
-
-  /* advance entries by 1. we do not care about data locking here. */
-0; i < (SOLAR_WATT_HISTORYSIZE-1); i++
+SOLAR_WATT_HISTORYSIZE-1; i > 0; i--
-  {
-    portENTER_CRITICAL();
-+1][0] = SolarHistory[i
-+1][1] = SolarHistory[i
-+1][2] = SolarHistory[i
+][0] = SolarHistory[i-1
+][1] = SolarHistory[i-1
+][2] = SolarHistory[i-1
-    portEXIT_CRITICAL();
-  } /* for */