Skip to content

Added msg 19,20 to doc to fix #62. Added Scilab cp/cv calculation #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JLJu merged 2 commits into from
Jan 15, 2018
Merged

Added msg 19,20 to doc to fix #62. Added Scilab cp/cv calculation #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47bc7b4
Added msg 19 e 20 for #62 . Added cpcv calculation script
Jan 15, 2018
5effb0c
Merge remote-tracking branch 'refs/remotes/BasicAirData/master'
Jan 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Software/Documentation/ADC Common Message Set/ADC Common Message Set.odt
View file
Open in desktop
Binary file not shown.
109 changes: 0 additions & 109 deletions Software/Documentation/Firmware/Test Serial Session/Serial Test Session.md
View file
Open in desktop

This file was deleted.

2,777 changes: 0 additions & 2,777 deletions Software/Script/Scilab/ADCAsgard/50-25.CSV
View file
Open in desktop

This file was deleted.

3,585 changes: 0 additions & 3,585 deletions Software/Script/Scilab/ADCAsgard/50-50.CSV
View file
Open in desktop

This file was deleted.

27 changes: 11 additions & 16 deletions Software/Script/Scilab/ADCAsgard/CSVLoader.sce
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Re=24;
cfactor=25;
//Define tollerance band
airdensityeband=0.5; //Air Density Percent of rho
viscosityeband=0.5;//Viscosity %
viscosityeband=2;//Viscosity %
altitudeeband=0.5;//Altitude %
fsamplev=zeros(1,ngroups);

Expand Down Expand Up @@ -109,39 +109,39 @@ subplot(4,3,3)
xtitle('True Air Speed [m/s] vs Time [ms]')
plot(timetic,Q(:,TASmcol),2)
//External temperature [°K]
subplot(4,3,3)
subplot(4,3,4)
xtitle('External Temperature [°K] vs Time [ms]')
plot(timetic,Q(:,ExtTempmcol),2)
//Temperature deltapsensor [°K]
subplot(4,3,4)
subplot(4,3,5)
xtitle('Temperature from deltap pressure sensor [°K] vs Time [ms]')
plot(timetic,Q(:,tempdeltapmcol),2)
//Temperature abspressure sensor [°K]
subplot(4,3,5)
subplot(4,3,6)
xtitle('Temperature from absolute pressure sensor [°K] vs Time [ms]')
plot(timetic,Q(:,tempabsmcol),2)
//Altitude [m]
subplot(4,3,6)
subplot(4,3,7)
xtitle('Altitude [m] vs Time [ms]')
plot(timetic,Q(:,altitude),2)
//Outside Air Temperature [°K]
subplot(4,3,7)
subplot(4,3,8)
xtitle('Outside Air Temperature [°K] vs Time [ms]')
plot(timetic,Q(:,OAT),2)
//Air Density [kg/m^3]
subplot(4,3,8)
subplot(4,3,9)
xtitle('Air Density [kg/m^3] vs Time [ms]')
plot(timetic,Q(:,rhoairmcol),2)
//Air Viscosity [mPas]
subplot(4,3,9)
subplot(4,3,10)
xtitle('Air Viscosity [mPas] vs Time [ms]')
plot(timetic,Q(:,vair),2)
//Re
subplot(4,3,10)
subplot(4,3,11)
xtitle('Reynolds vs Time [ms]')
plot(timetic,Q(:,Re),2)
//C factot
subplot(4,3,11)
subplot(4,3,12)
xtitle('c factor vs Time [ms]')
plot(timetic,Q(:,cfactor),2)
//Compares ADC logged values with offline calculated ones
Expand Down Expand Up @@ -169,7 +169,7 @@ if debug==1 then
subplot(2,2,2)
xtitle('Viscosity of Air Difference % vs Time [ms]')
for ri=1:r
Q(ri,c+2)=(Q(ri,vair)-viscosityair(Q(ri,exttempcol)))/viscosityair(Q(ri,exttempcol))*100
Q(ri,c+2)=(Q(ri,vair)-viscosityair(Q(ri,ExtTempmcol)))/viscosityair(Q(ri,ExtTempmcol))*100
end
plot(timetic,Q(:,c+2),2)
if ((abs(min(Q(:,c+2)))<viscosityeband)&(abs(max(Q(:,c+2)))<viscosityeband)) then
Expand All @@ -189,9 +189,4 @@ if debug==1 then
else
mprintf('\nWarning: ADC calculated altitude value is outside the tollerance band of %f %% of viscosity',altitudeeband)
end





end
Loading