Merge branch 'master' of https://github.com/JLJu/AirDataComputer

Author: JLJu

README.md

@@ -2,7 +2,7 @@
 ![Asgard ADC](http://www.basicairdata.eu/wp-content/uploads/sites/1/nggallery/adc-asgard-build-2/IMGP5610.JPG)
 
 ## Description
-An air data computer (ADC) is an essential avionics component found in modern cockpits. This unit can determine True Airspeed, Mach number, Altitude, and common air properties from a pitot-static probe data and an outside air temperature probe.
+An air data computer (ADC) is an essential avionics component found in modern aircraft. This unit can determine True Airspeed, Mach number, Altitude, and common air properties from a pitot-static probe data and an outside air temperature probe.
 
 This repository, together with the media published on the BasicAirData website, contains the information to build from scratch a recreational grade DIY Air Data Computer. This device can transmit data via USB serial port and Bluetooth, and log all data on a MicroSD.
 

Software/Microcontroller/Firmware/AsgardADC/AsgardADC.ino

@@ -1,4 +1,4 @@
-/* Work in progress Asgard ADC Firmware Relase 0.4.0 14/01/2018
+/* Work in progress Asgard ADC Firmware Relase 0.4.0 16/01/2018
    This is a preliminary release, work in progress. Misbehaviour is plausible.
    AsgardADC.ino - Air Data Computer Firmware
    Conform to ADC Common Mesage Set 0.4
@@ -21,24 +21,27 @@
 
 #include <TimeLib.h>
 #include <Metro.h>
-
 #include <AirDC.h>
 #include <SD.h>
 #include <SPI.h>
 #include <SD_t3.h>
 #include <i2c_t3.h>                       // Library for second I2C 
 #include <SSC.h>                          // Library for SSC series sensors, support two bus I2C
 
+#define ADC_NAME "ASGARD"                 // The name of the ADC device
+#define PROTOCOL_VERSION "0.4"            // The version of the communication protocol
+
 #define BUFFERLENGTH 512                  // The length of string buffers
 #define DELIMITER '\n'
 #define SEPARATOR ","
 #define LEAVE_AS_IS "="
-#define ADC_NAME "ASGARD"                 // The name of the ADC device
-#define PROTOCOL_VERSION "0.4"            // The version of the communication protocol
 #define DEFAULT_LOGFILE "DATALOG.CSV"     // The default log file name
 #define DEFAULT_CONFIGFILE "CONFIG.CFG"   // The configuration file name
 
-const int chipSelect = BUILTIN_SDCARD;    // HW pin for micro SD adaptor CS
+const int ledPin      = 13;               // The led is ON when the application is logging on SD
+const int TsensorPin  = A0;               // The input pin for the analog Temperature sensor
+const int chipSelect  = BUILTIN_SDCARD;   // HW pin for micro SD adaptor CS
+
 File dataFile;                            // The file on SD
 File configFile;                          // The setup configuration file on SD
 bool isSDCardPresent;                     // The presence of a (formatted) card into the slot of SD
@@ -47,15 +50,14 @@ Sd2Card card;                             // The SD Card
 SdVolume volume;                          // The volume (partition) on SD
 double iTAS, ip1TAS, res, iof;            // Accessory variables for Air Data calculations
 
-AirDC AirDataComputer(1);
+AirDC AirDataComputer(1);     // The Air Data Computer
 
 SSC diffp(0x28, 0);           // Create an SSC sensor with I2C address 0x28 on I2C bus 0
 SSC absp(0x28, 1);            // Create an SSC sensor with I2C address 0x28 on I2C bus 1
 
 String message_BT;            // string that stores the incoming BT message
 String message_COM;           // string that stores the incoming COM message
 String message_CFG;           // string that stores the configuration messages
-const int ledPin = 13;        // The led is ON when the application is logging on SD
 
 float acquisition_freq     =   1;         // The minimum frequency of acquisition = 1 Hz (1 s)
 float sendtoserial_freq    =   0;         // The frequency of sendtoserial        = NOT ACTIVE
@@ -80,7 +82,6 @@ bool sendtosd_needs_acquisition        = true;    // The check that the aquisiti
 
 char Data[2][BUFFERLENGTH];  // The strings containing the data message
 char *p_Data;                // The pointer to the current valid data string
-int  TsensorPin = A0;        // The input pin for the analog Temperature sensor
 
 
 
@@ -128,7 +129,7 @@ void setup() {
   strcpy(Data[1],"\0");      // Initialize the Data
   p_Data = &Data[1][0];      // The current valid status index is 1
 
-  if (isSDCardPresent) {      // Searches the configuration file
+  if (isSDCardPresent) {     // Searches the configuration file
     configFile = SD.open(DEFAULT_CONFIGFILE);
     if (configFile) loadConfiguration = true;
   }
@@ -139,7 +140,7 @@ void setup() {
 void SDCardCheck() 
 {
   if (!isSDCardPresent) {
-    isSDCardPresent = card.init(SPI_HALF_SPEED, chipSelect);
+    isSDCardPresent = card.init(SPI_FULL_SPEED, chipSelect);
     if (isSDCardPresent) SD.begin(chipSelect);
   }
   isSDCardPresent = volume.init(card);
@@ -189,7 +190,40 @@ void acquisition()
 
   // 2) Calculations
 
-  computation();
+  // Init
+  AirDataComputer.RhoAir(1);                    // Calculates the air density
+  AirDataComputer.Viscosity(1);                 // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
+  AirDataComputer.CalibrationFactor(1);         // Calibration factor set to 1
+  AirDataComputer.IAS(1);                       // Calculates IAS method 1
+  AirDataComputer._TAS = AirDataComputer._IAS;
+  AirDataComputer.Mach(1);                      // Calculates Mach No
+  AirDataComputer.OAT(1);                       // Outside Air Temperature
+  // Wild iteration
+  iof = 1;
+  while ((res > 0.05) || (iof < 10)) {
+    AirDataComputer.RhoAir(1);                  // Calculates the air density
+    AirDataComputer.Viscosity(1);               // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
+    AirDataComputer.CalibrationFactor(2);       // Update calibration fator vat at TAS
+    AirDataComputer.IAS(1);                     // IAS
+    AirDataComputer.CAS(1);                     // CAS
+    AirDataComputer.TAS(1);                     // True Air Speed
+    AirDataComputer.Mach(1);                    // Update Mach No
+    iTAS = AirDataComputer._TAS;                // Store TAS value
+    AirDataComputer.OAT(1);                     // Update outside Air Temperature
+    AirDataComputer.RhoAir(1);                  // Calculates the air density
+    AirDataComputer.Viscosity(1);               // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
+    AirDataComputer.CalibrationFactor(2);       // Update calibration fator vat at TAS
+    AirDataComputer.TAS(1);                     // Update TAS
+    AirDataComputer.Mach(1);                    // Update Mach No
+    AirDataComputer.OAT(1);                     // Update outside Air Temperature
+    ip1TAS = AirDataComputer._TAS;
+    res = abs(ip1TAS - iTAS) / iTAS;
+    iof++;
+  }
+  // Uncorrected ISA Altitude _h
+  AirDataComputer.ISAAltitude(1);
+  AirDataComputer._d = 8e-3;
+  AirDataComputer.Red(1);
 
 
   // 3) $DTA message update
@@ -255,50 +289,9 @@ void acquisition()
   sendtoserial_needs_acquisition      = false;    // The aquisition has been updated since the last $DTA
   sendtobluetooth_needs_acquisition   = false;    // The aquisition has been updated since the last $DTA
   sendtosd_needs_acquisition          = false;    // The aquisition has been updated since the last $DTA
-
-  //Serial.println("*"); // Debug for computation frequency;
 }
 
 
-void computation() {
-  // Init
-  AirDataComputer.RhoAir(1);                    // Calculates the air density
-  AirDataComputer.Viscosity(1);                 // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
-  AirDataComputer.CalibrationFactor(1);         // Calibration factor set to 1
-  AirDataComputer.IAS(1);                       // Calculates IAS method 1
-  AirDataComputer._TAS = AirDataComputer._IAS;
-  AirDataComputer.Mach(1);                      // Calculates Mach No
-  AirDataComputer.OAT(1);                       // Outside Air Temperature
-  
-  // Wild iteration
-  iof = 1;
-  while ((res > 0.05) || (iof < 10)) {
-    AirDataComputer.RhoAir(1);                  // Calculates the air density
-    AirDataComputer.Viscosity(1);               // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
-    AirDataComputer.CalibrationFactor(2);       // Update calibration fator vat at TAS
-    AirDataComputer.IAS(1);                     // IAS
-    AirDataComputer.CAS(1);                     // CAS
-    AirDataComputer.TAS(1);                     // True Air Speed
-    AirDataComputer.Mach(1);                    // Update Mach No
-    iTAS = AirDataComputer._TAS;                // Store TAS value
-    AirDataComputer.OAT(1);                     // Update outside Air Temperature
-    AirDataComputer.RhoAir(1);                  // Calculates the air density
-    AirDataComputer.Viscosity(1);               // Calculates the dynamic viscosity, Algorithm 2 (UOM Pas1e-6)
-    AirDataComputer.CalibrationFactor(2);       // Update calibration fator vat at TAS
-    AirDataComputer.TAS(1);                     // Update TAS
-    AirDataComputer.Mach(1);                    // Update Mach No
-    AirDataComputer.OAT(1);                     // Update outside Air Temperature
-    ip1TAS = AirDataComputer._TAS;
-    res = abs(ip1TAS - iTAS) / iTAS;
-    iof++;
-  }
-  
-  // Uncorrected ISA Altitude _h
-  AirDataComputer.ISAAltitude(1);
-  AirDataComputer._d = 8e-3;
-  AirDataComputer.Red(1);
-}
-
 
 
 void sendtoserial(void)
@@ -337,14 +330,14 @@ void loop() {
   bool endmsg_CFG               = false;  // it becomes true when a message is received from CONFIGURATION FILE
   char workbuff[BUFFERLENGTH]   = "";     // General purpose buffer, used for itoa conversion
   char Message[BUFFERLENGTH]    = "";     // it contains the message to be processed
-  char Answer[BUFFERLENGTH]     = "";
+  char Answer[BUFFERLENGTH]     = "";     // it contains the answer to the message
 
 
   // 0) Check Metro Timers:
 
-  if ((acquisition_freq > 0)     && (acquisitionTimer.check() == 1)) acquisition();
+  if ((acquisition_freq > 0) && (acquisitionTimer.check() == 1)) acquisition();
 
-  if ((sendtoserial_freq > 0)    && (sendtoserialTimer.check() == 1)) {
+  if ((sendtoserial_freq > 0) && (sendtoserialTimer.check() == 1)) {
     if (sendtoserial_needs_acquisition) {
       acquisition();
       acquisitionTimer.reset();
@@ -360,7 +353,7 @@ void loop() {
     sendtobluetooth();
   }
 
-  if ((sendtosd_freq > 0)        && (sendtosdTimer.check() == 1)) {
+  if ((sendtosd_freq > 0) && (sendtosdTimer.check() == 1)) {
     if (sendtosd_needs_acquisition) {
       acquisition();
       acquisitionTimer.reset();
@@ -372,45 +365,46 @@ void loop() {
   // 1) Read input from Configuration file, Serial, and Bluetooth:
 
   if (loadConfiguration) {
-    while (configFile.available() && !endmsg_CFG) {
+    while (configFile.available()) {
       char ch = configFile.read();
-      if ((ch != DELIMITER) && (ch != '\r')) message_CFG += char(ch);      // Store string from CFG file
-      else endmsg_CFG = true;
-    }
-    if (!configFile.available()) {
-      loadConfiguration = false;
-      configFile.close();
-      endmsg_CFG = true;
+      if (ch == DELIMITER) {
+        endmsg_CFG = true;
+        message_CFG.toCharArray (Message, BUFFERLENGTH-1);
+        message_CFG = "";
+        goto endread;
+      } else if (ch != '\r') message_CFG += char(ch);   // Store string from CONFIG file
     }
+    loadConfiguration = false;
+    configFile.close();
+    endmsg_CFG = true;
     message_CFG.toCharArray (Message, BUFFERLENGTH-1);
     message_CFG = "";
-  } else {
-    while (Serial.available()) {      // while there is SERIAL data available
-      char ch = Serial.read();
-      if (ch != DELIMITER) message_COM += char(ch);      // Store string from serial command
-      else endmsg_COM = true;
-    }
-    if (endmsg_COM) {                 // This comes from the Serial port (USB)
-      if (message_COM != "") {        // if data is available
-        message_COM.toCharArray (Message, BUFFERLENGTH-1);
-        message_COM = "";
-      }
-    }
-    if (!endmsg_COM) {
-      while (Serial1.available()) {  // while there is BLUETOOTH data available
-        char ch = Serial1.read();
-        if (ch != DELIMITER) message_BT += char(ch);     // Store string from BT command
-        else endmsg_BT = true;
-      }
-      if (endmsg_BT) {                // This comes from the bluetooth device (such as phone)
-        if (message_BT != "") {       // if data is available
-          message_BT.toCharArray (Message, BUFFERLENGTH-1);
-          message_BT = "";
-        }
-      }
-    }
+    goto endread;
+  }
+
+  while (Serial.available()) {
+    char ch = Serial.read();
+    if (ch == DELIMITER) {
+      endmsg_COM = true;
+      message_COM.toCharArray (Message, BUFFERLENGTH-1);
+      message_COM = "";
+      goto endread;
+    } else if (ch != '\r') message_COM += char(ch);     // Store string from serial command
+  }
+  
+  while (Serial1.available()) {
+    char ch = Serial1.read();
+    if (ch == DELIMITER) {
+      endmsg_BT = true;
+      message_BT.toCharArray (Message, BUFFERLENGTH-1);
+      message_BT = "";
+      goto endread;
+    } else if (ch != '\r') message_BT += char(ch);      // Store string from bluetooth command
   }
 
+  endread:
+
+
   // 2) Process messages
 
   if (endmsg_COM || endmsg_BT || endmsg_CFG) {
@@ -589,7 +583,6 @@ void loop() {
               break;
             default:  // IT DOES NOTHING
               break;
-
           }
         }
       }
@@ -667,7 +660,7 @@ void loop() {
       }
       SDCardCheck();
       if (isSDCardPresent) {
-        if (SD.exists(command))   // Only if the file exist is set as current, #13 reply
+        if (SD.exists(command))   // Only if the file exists is set as current, #13 reply
         {
           if (isSDCardPresent) {
             dataFile.close();
@@ -680,8 +673,7 @@ void loop() {
               AirDataComputer._status[AIRDC_STATUS_SD] = '0';  // SD Card not present
               goto endeval;
             }
-          }
-          
+          }      
           AirDataComputer._status[AIRDC_STATUS_SD] = '1';  // SD Card present
         }
       }
@@ -962,6 +954,7 @@ void loop() {
 
     endeval:
 
+
     // 3) In case answers to the right applicant
 
     if (strcmp(Answer, "")) {

Software/Microcontroller/Libraries/AirDC/AirDC.cpp

@@ -51,8 +51,8 @@ AirDC::AirDC(int pid)
     _uT=0; //To be calculated
     _uRH=0.05;
     _uqc=5.0;
-    _uIAS=0.0;//To be calculated, 0 default value
-    _uTAT=0.0;//To be calculated, 0 default value
+    _uIAS=0.0;//0 default value
+    _uTAT=0.25;//From sensor specs 0 default value
 //Inertial Unit
     _Ip=0;
     _Iq=3;
@@ -176,14 +176,7 @@ void AirDC::IAS(int mode)
             _qc=-1*_qc;
         }
         _IAS=1.27775310604201*sqrt(_qc);
-        /*        if (_qc>0)
-                {
-                    _uIAS=0.638876553021004/(sqrt(_qc))*_uqc;
-                }
-                else
-                {
-                    _uIAS=0;
-                }*/
+        _uIAS=0.638876553021004/(sqrt(abs(_qc))*_uqc;
         break;
     }
 }
@@ -260,7 +253,7 @@ void AirDC::ISAAltitude(int mode)
     {
         double Ps,h;
         Ps=_p*0.000295299875080277;//Pa to inHg Conversion
-        _h=(pow(29.92126,0.190255)-pow(Ps,0.190255))*76189.2339431570; //Using Goodrich 4081 Air data handbook formula, US atmosphere 1962
+        _h=(pow(29.92126,0.190255)-pow(Ps,0.190255))*76189.2339431570; //Conform to Goodrich 4081 Air data handbook formula, US atmosphere 1962
         _h=_h*0.3048;//Back to SI
         _uh=4418.19264813511*pow(Ps,-0.809745)*_up*0.000295299875080277;
         break;
@@ -285,7 +278,7 @@ void AirDC::ISAAltitude(int mode)
             i=i+1;
         }
         _h=t1;
-        _uh=0; //<- Need to be completed
+        _uh=erralt+4418.19264813511*pow(Ps,-0.809745)*_up*0.000295299875080277;
         break;
     }
     }

Software/Microcontroller/README.md

@@ -4,4 +4,4 @@
 ## Introduction
 Within "Hardware Integration Test" folder you find a sketch for test the hardware of a Asgard ADC.
 Firmware folder will contain the sketch that need to ve uploaded to ADC. The firmware supports Bluetooth and SD card.
-Libraries folder contains the libraries you need to place in your library Arduino IDE folder to be able to compile the ADC sketch.
+Libraries folder contains the libraries you need to place in your Arduino IDE library folder to be able to compile the ADC sketch.