Affichage des erreurs

www/index.html

@@ -54,6 +54,11 @@
 
             <h3>Magnetometer</h3>
             <pre><code id="magnetometerData"></code></pre>
+            <div>
+                <h3>Dernière erreur</h3>
+                <p id="errorTime"></p>
+                <p id="errorMessage"></p>
+            </div>
         </div>
         <script src="cordova.js"></script>
         <script type="text/javascript" src="js/APIKeys.js"></script>

www/js/index.js

@@ -80,18 +80,18 @@ function handleButtonEvent() {
     + "\n   Z: "      + acceleration.z;
 
     //Set gyroscope in html
-    document.getElementById('gyroscopeData').innerHTML = ""
-    + "   timestamp: " + gyroscope.timestamp
-    + "\n   X: "      + gyroscope.x
-    + "\n   Y: "      + gyroscope.y
-    + "\n   Z: "      + gyroscope.z;
+    // document.getElementById('gyroscopeData').innerHTML = ""
+    // + "   timestamp: " + gyroscope.timestamp
+    // + "\n   X: "      + gyroscope.x
+    // + "\n   Y: "      + gyroscope.y
+    // + "\n   Z: "      + gyroscope.z;
 
     //Set magnetometer in html
-    document.getElementById('magnetometerData').innerHTML = ""
-    + "   timestamp: " + acceleration.timestamp
-    + "\n   X: "      + magnetometer.x
-    + "\n   Y: "      + magnetometer.y
-    + "\n   Z: "      + magnetometer.z;
+    // document.getElementById('magnetometerData').innerHTML = ""
+    // + "   timestamp: " + acceleration.timestamp
+    // + "\n   X: "      + magnetometer.x
+    // + "\n   Y: "      + magnetometer.y
+    // + "\n   Z: "      + magnetometer.z;
 
     serial.read(function(buffer) {console.log(buffer);}, error => handleError(`Error while reading data from Arduino`, error));
 
@@ -144,15 +144,15 @@ function save(positionData, accelerationData, gyroscopeData, magnetometerData) {
         ${accelerationData.timestamp};
         ${accelerationData.x};
         ${accelerationData.y};
-        ${accelerationData.z};
-        ${gyroscopeData.timestamp};
-        ${gyroscopeData.x};
-        ${gyroscopeData.y};
-        ${gyroscopeData.z};
-        ${accelerationData.timestamp};
-        ${magnetometerData.x};
-        ${magnetometer.y};
-        ${magnetometer.z}\n`;
+        ${accelerationData.z}\n`;
+        // ${gyroscopeData.timestamp};
+        // ${gyroscopeData.x};
+        // ${gyroscopeData.y};
+        // ${gyroscopeData.z};
+        // ${accelerationData.timestamp};
+        // ${magnetometerData.x};
+        // ${magnetometer.y};
+        // ${magnetometer.z}\n`;
 
     writeFile(saveFile, new Blob([newLine]));
     readFile(saveFile);
@@ -175,10 +175,10 @@ function createDataFile() {
             saveFile = fileEntry;
             writeFile(saveFile, new Blob([
                 `position timestamp;latitude;longitude;altitude;heading;speed;accuracy;
-                acceleration timestamp;acceleration x;acceleration y;acceleration z
-                gyrorsope timestamp;gyroscope x;gyroscope y;gyroscope z;
-                magnetometer timestamp;magnetometer x;magnetometer y;magnetometer z;
-                constraint 1;constraint 2;constraint 3;constraint 4;constraint 5;constraint 6\n`
+                acceleration timestamp;acceleration x;acceleration y;acceleration z\n`
+                // gyrorsope timestamp;gyroscope x;gyroscope y;gyroscope z;
+                // magnetometer timestamp;magnetometer x;magnetometer y;magnetometer z;
+                // constraint 1;constraint 2;constraint 3;constraint 4;constraint 5;constraint 6\n`
             ]));
             console.log('Data file opened');
         }, error => handleError(`Error while getting file ${fileEntry.name}`, error));
@@ -214,7 +214,6 @@ function writeFile(fileEntry, dataObj) {
 }
 
 function readFile(fileEntry) {
-    console.log(fileEntry);
     fileEntry.file(function(file) {
         var reader = new FileReader();
 
@@ -231,4 +230,7 @@ function readFile(fileEntry) {
 function handleError(message, error) {
     var errorMessage = typeof(error) === 'string' ? error : error.message;
     writeFile(errorsFile, new Blob([`${new Date()};${message};${errorMessage}\n`]));
+
+    document.getElementById("errorTime").innerHTML = new Date();
+    document.getElementById("errorMessage").innerHTML = `${message} ; ${errorMessage}`;
 }