Revision 1:521869dcf4f1, committed 2018-11-13

Comitter:

martlefebvre94

Date:

Tue Nov 13 16:23:18 2018 +0000

Parent:

0:642dcee532b6

Commit message:

Removal of ADC22

Changed in this revision

--- a/main.cpp	Mon Nov 12 22:13:57 2018 +0000
+++ b/main.cpp	Tue Nov 13 16:23:18 2018 +0000
@@ -50,7 +50,7 @@
     float Temperature;              // 4 bytes
     unsigned short Analog_PTE20;    // 2 bytes
     unsigned short Analog_PTE21;    // 2 bytes
-    unsigned short Analog_PTE22;    // 2 bytes
+    unsigned short Empty;           // 2 bytes
 } Sensor_Data;                      // TOTAL = 16 bytes 
 
 // --- Setup I2C for MMA8451 accelerometer
@@ -67,7 +67,6 @@
 // Analog inputs (ADCs)
 AnalogIn myPTE20(PTE20);
 AnalogIn myPTE21(PTE21);
-AnalogIn myPTE22(PTE22);
 
 // Analog output (DAC)
 AnalogOut myDAC(PTE30);
@@ -105,7 +104,7 @@
     float vdac;
     uint16_t dac_value;                                     // Local variable in 16 bits
      
-    vdac = 0.3;                                             // Voltage output value
+    vdac = 0;                                               // Voltage output value
     dac_value = (uint16_t) ((vdac * 65536) / KL25Z_VDD);    // Transform desired voltage to fraction of 0xFFFF 
     myDAC.write_u16(dac_value);                             // DAC value in range 0x0000 - 0xFFFF (see mbed's AnalogOut classe ref.)
     
@@ -316,8 +315,7 @@
 
         // Get ADC values
         myData.Analog_PTE20 = myPTE20.read_u16(); 
-        myData.Analog_PTE21 = myPTE21.read_u16();  
-        myData.Analog_PTE22 = myPTE22.read_u16();  
+        myData.Analog_PTE21 = myPTE21.read_u16();   
         
  /*** Save Data in Flash ***/   
         Status = program_flash(Flash_Ptr, (char *) &myData, sizeof(Sensor_Data));   // Write in the Flash
@@ -348,7 +346,6 @@
     
     float Voltage_PTE20;
     float Voltage_PTE21;
-    float Voltage_PTE22;
     
     Clear_Led(); 
   
@@ -356,7 +353,7 @@
     Record_Counter = 0;
     Flash_Record_Ptr = 0;
     
-    Host_Comm.printf("\n\rAccX AccY AccZ Temp PTE20 PTE21 PTE22");  
+    Host_Comm.printf("\n\r# AccX AccY AccZ Temp PTE20 PTE21");  
      
     while (Record_Counter < Max_Record) 
     {         
@@ -383,13 +380,12 @@
         else
         {
             Voltage_PTE20 = ((float) myRead_Data.Analog_PTE20 / 0XFFFF) * KL25Z_VDD;    // Convert to voltage
-            Voltage_PTE21 = ((float) myRead_Data.Analog_PTE21 / 0XFFFF) * KL25Z_VDD;          
-            Voltage_PTE22 = ((float) myRead_Data.Analog_PTE22 / 0XFFFF) * KL25Z_VDD;                 
+            Voltage_PTE21 = ((float) myRead_Data.Analog_PTE21 / 0XFFFF) * KL25Z_VDD;                          
             
             Host_Comm.printf("\n\r%d ", Record_Counter);
             Host_Comm.printf("%d %d %d ", myRead_Data.Accel_X, myRead_Data.Accel_Y, myRead_Data.Accel_Z);
             Host_Comm.printf("%1.2f ", myRead_Data.Temperature);
-            Host_Comm.printf("%1.3f %1.3f %1.3f ", Voltage_PTE20, Voltage_PTE21, Voltage_PTE22);               
+            Host_Comm.printf("%1.3f %1.3f ", Voltage_PTE20, Voltage_PTE21);               
         }
         
         Record_Counter ++;