Skip to content

Commit f3e5e1c

Browse files
authored
Merge pull request #72 from JLJu/master
Closes #71
2 parents 0c4a4ee + 689a9dc commit f3e5e1c

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- --,TERCOM/larraguetajunior,,17.01.2018 10:40,file:///C:/Users/larraguetajunior/AppData/Roaming/LibreOffice/4;

Software/Microcontroller/Libraries/AirDC/AirDC.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ AirDC::AirDC(int pid)
5151
_uT=0; //To be calculated
5252
_uRH=0.05;
5353
_uqc=5.0;
54-
_uIAS=0.0;//To be calculated, 0 default value
55-
_uTAT=0.0;//To be calculated, 0 default value
54+
_uIAS=0.0;//0 default value
55+
_uTAT=0.25;//From sensor specs 0 default value
5656
//Inertial Unit
5757
_Ip=0;
5858
_Iq=3;
@@ -176,14 +176,7 @@ void AirDC::IAS(int mode)
176176
_qc=-1*_qc;
177177
}
178178
_IAS=1.27775310604201*sqrt(_qc);
179-
/* if (_qc>0)
180-
{
181-
_uIAS=0.638876553021004/(sqrt(_qc))*_uqc;
182-
}
183-
else
184-
{
185-
_uIAS=0;
186-
}*/
179+
_uIAS=0.638876553021004/(sqrt(abs(_qc))*_uqc;
187180
break;
188181
}
189182
}
@@ -260,7 +253,7 @@ void AirDC::ISAAltitude(int mode)
260253
{
261254
double Ps,h;
262255
Ps=_p*0.000295299875080277;//Pa to inHg Conversion
263-
_h=(pow(29.92126,0.190255)-pow(Ps,0.190255))*76189.2339431570; //Using Goodrich 4081 Air data handbook formula, US atmosphere 1962
256+
_h=(pow(29.92126,0.190255)-pow(Ps,0.190255))*76189.2339431570; //Conform to Goodrich 4081 Air data handbook formula, US atmosphere 1962
264257
_h=_h*0.3048;//Back to SI
265258
_uh=4418.19264813511*pow(Ps,-0.809745)*_up*0.000295299875080277;
266259
break;

Software/Script/Scilab/ADCAsgard/CSVLoader.sce

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//ADC Asgard CSV Loader. JLJ . Basicairdata
1+
//ADC Asgard CSV Loader. JLJ. Basicairdata Team.
22
//1 debug mode
33
debug=1;
44
exec('rhoair.sci')

0 commit comments

Comments
 (0)