Revision 77:67faccef7f14, committed 2018-12-04

Comitter:

MathieuM

Date:

Tue Dec 04 13:12:52 2018 +0000

Parent:

76:04941d128fff

Child:

78:ab7595f2133b

Commit message:

WIP

Changed in this revision

--- a/altitude.cpp	Mon Oct 15 07:57:53 2018 +0000
+++ b/altitude.cpp	Tue Dec 04 13:12:52 2018 +0000
@@ -8,10 +8,12 @@
         long P = 0;
         //barometre->reset();
         //pc.printf("SB, DEBUG : available? => %d \r\n", barometre->isAvailable() ); // DEBUG : show sensor status
-        wait(2);
+        //wait(2);
         P = barometre->ReadPressure();
         //pc.printf("P = %ul \r\n", P); // DEBUG : print pressure value
-        wait(3);
+        //wait(3);
         return P;
+    } else {
+        return -1;
     }
 }
\ No newline at end of file

--- a/communication.cpp	Mon Oct 15 07:57:53 2018 +0000
+++ b/communication.cpp	Tue Dec 04 13:12:52 2018 +0000
@@ -7,10 +7,10 @@
     m[0] = ((char)h_sol) << 1; // b0 --- b6
     m[0] = m[0] + (((char)h_air) >> 6); // b7
     m[1] = ((char)h_air) << 2; // b8 --- b13
-    m[1] = m[1] + (((int)(t_sol * 10) + 200) & 0x300); // b14 --- b15
+    m[1] = m[1] + (((int)(t_sol * 10) + 200) >> 8); // b14 --- b15
     m[2] = ((int)(t_sol * 10) + 200) & 0x0ff; // b16 --- b23
-    m[3] = (((int)(t_sol * 10) + 200) >> 2) & 0xff; // b24 --- b31
-    m[4] = (((int)(t_sol * 10) + 200) & 0x03) << 10; // b32 --- b33
+    m[3] = (((int)(t_air * 10) + 200) >> 2) & 0xff; // b24 --- b31
+    m[4] = (((int)(t_air * 10) + 200) & 0x03) << 10; // b32 --- b33
     m[4] = m[4] + ((chMag[0] & 0x3ff) >> 4); // b34 --- b39
     m[5] = chMag[0] & 0xf; // b40 --- b43
     m[5] = m[5] + ((chMag[1] & 0x3ff) >> 6); // b44 --- b47

--- a/config.h	Mon Oct 15 07:57:53 2018 +0000
+++ b/config.h	Tue Dec 04 13:12:52 2018 +0000
@@ -2,7 +2,7 @@
 #define __CONFIG__
 
 // communication
-#define SERIAL_PORT                 D1, D0
+#define SERIAL_PORT                 D1, D0 // Rx <-> Tx     |       Tx <-> Rx
 #define WAIT_TIME                   60*15 // 15 minutes
 
 // T_H_air
@@ -20,9 +20,12 @@
 #define HP20X_I2C_PORT              D12, A6
 
 // Magnetometer
-#define HMC5883_I2C_PORT            D4, D5
+#define HMC5883_I2C_PORT            D4, D5 //sda, scl
 
 // Warnings
 #define W_AIR                       LED3
 
+// Voltage control
+#define TRANSISTOR_PIN              D9
+
 #endif
\ No newline at end of file

--- a/main.cpp	Mon Oct 15 07:57:53 2018 +0000
+++ b/main.cpp	Tue Dec 04 13:12:52 2018 +0000
@@ -41,7 +41,7 @@
         else{
             solT = temp;
             }
-        solH = getSoilHumidity( humidSensor, airValue,waterValue, false);
+        solH = getSoilHumidity( humidSensor, airValue,waterValue, true);
         
         msg = genMessage( solH,  airH,  solT, airT, P,magXYZ);
         // Display
@@ -53,8 +53,12 @@
         pc.printf("Mag : X:%d ; Y:%d ; Z:%d\n\r", magXYZ[0], magXYZ[1], magXYZ[2]); 
         pc.printf("Pression : %u Pa\r\n", P);
         pc.printf("AT$SF=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\r\n", msg[0], msg[1], msg[2], msg[3], msg[4], msg[5], msg[6], msg[7], msg[8], msg[9], msg[10], msg[11]);
-        wisol.printf("AT$SF=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\r\n", msg[0], msg[1], msg[2], msg[3], msg[4], msg[5], msg[6], msg[7], msg[8], msg[9], msg[10], msg[11]);
+        //wisol.printf("AT$SF=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\r\n", msg[0], msg[1], msg[2], msg[3], msg[4], msg[5], msg[6], msg[7], msg[8], msg[9], msg[10], msg[11]);
         pc.printf("\n\r");
-        wait(WAIT_TIME - 7);
+        free(msg);
+        msg = NULL;
+        wait(3);
+        //wait(WAIT_TIME - 7);
+        //comment
     }
 }