メモリにデータを記録するコードを追加

diff --git a/trial/HTTP-MEMORY-test/HTTP-MEMORY-test.ino b/trial/HTTP-MEMORY-test/HTTP-MEMORY-test.ino
index 34f6adb..837ef0c 100644 (file)
--- a/trial/HTTP-MEMORY-test/HTTP-MEMORY-test.ino
+++ b/trial/HTTP-MEMORY-test/HTTP-MEMORY-test.ino
@@ -15,10 +15,11 @@ extern "C" {
 }
 
 #define DEVICEID ESP.getChipId()
+#define MAXROW 128
 
 struct ADData
 {
-    int  nBootedClock;
+    long  nBootedClock;
     long  nEphochTime;
     int  ADValue;
 };
@@ -38,7 +39,7 @@ int nCounter30s = 0;
 int ADvalue = 0;
 bool bCommandReadingHttp = false; 
 bool bNoNTPupdated = true;
-ADData AD1[128];
+ADData AD1[MAXROW];
 int nADcount=0;
 long nBootedClock=0;
 
@@ -48,6 +49,21 @@ WiFiUDP ntpUDP;
 // update interval (in milliseconds, can be changed using setUpdateInterval() ).
 NTPClient timeClient(ntpUDP, "ntp.nict.jp", 0, 3600000);
 
+void ADRowAdd(){
+  if (nADcount > MAXROW-1) {
+    int row;
+    for(row =1; row <MAXROW; row++){
+         AD1[row-1].nBootedClock =AD1[row].nBootedClock; 
+         AD1[row-1].nEphochTime=AD1[row-1].nEphochTime;
+         AD1[row-1].ADValue = AD1[row-1].ADValue;
+    }
+    nADcount=127;
+  }
+    AD1[nADcount].nBootedClock = nBootedClock; 
+    AD1[nADcount].nEphochTime=(long)timeClient.getEpochTime();
+    AD1[nADcount].ADValue = ADvalue;
+    nADcount++;
+}
 
 void timer1_ISR (void) {
  if (WiFi.status() != WL_CONNECTED) {
@@ -69,9 +85,10 @@ void timer1_ISR (void) {
   }
 
     ADvalue =  analogRead(A0);
-    AD1[nADcount].nBootedClock = nBootedClock; 
-    AD1[nADcount].nEphochTime=(long)timeClient.getEpochTime();
-    AD1[nADcount].ADValue = ADvalue;
+    ADRowAdd();
+   // AD1[nADcount].nBootedClock = nBootedClock; 
+   // AD1[nADcount].nEphochTime=(long)timeClient.getEpochTime();
+   // AD1[nADcount].ADValue = ADvalue;
        
 
   char buf[128];
@@ -129,9 +146,10 @@ void loop() {
     HTTPClient http;
     String szCommandReadURL = szCommandReadBaseURL + "?DeviceID=" + DEVICEID;
     //以下3行は，デバッグ用に追加
-    szCommandReadURL = szCommandReadURL + "&AD1=" + AD1[nADcount].ADValue;
-    szCommandReadURL = szCommandReadURL + "&EphochTime=" + AD1[nADcount].nEphochTime;
-    szCommandReadURL = szCommandReadURL + "&BootedClock=" +  AD1[nADcount].nBootedClock;
+    szCommandReadURL = szCommandReadURL + "&AD1=" + AD1[nADcount-1].ADValue;
+    szCommandReadURL = szCommandReadURL + "&EphochTime=" + AD1[nADcount-1].nEphochTime;
+    szCommandReadURL = szCommandReadURL + "&BootedClock=" +  AD1[nADcount-1].nBootedClock;
+    szCommandReadURL = szCommandReadURL + "&ADCount=" + nADcount;
     http.begin(szCommandReadURL,FingurePrintSha1);
     int httpCode = http.GET();
     //Nefry.print(timeClient.getFormattedTime());
@@ -159,3 +177,7 @@ void loop() {
   Nefry.setLed(0, 0, 64);
  }
 }
+
+
+
+

diff --git a/trial/HTTP-MEMORY-test/arduino.bin b/trial/HTTP-MEMORY-test/arduino.bin
index 10e013a..c7a3569 100644 (file)
Binary files a/trial/HTTP-MEMORY-test/arduino.bin and b/trial/HTTP-MEMORY-test/arduino.bin differ