Skip to content

Commit 5951b82

Browse files
authored
Merge pull request #67 from JLJu/master
Added msg 19,20 to doc to fix #62. Added Scilab cp/cv calculation
2 parents fd51b85 + 5effb0c commit 5951b82

12 files changed

Lines changed: 28064 additions & 21565 deletions

File tree

Binary file not shown.

Software/Documentation/Firmware/Test Serial Session/Serial Test Session.md

Lines changed: 0 additions & 109 deletions
This file was deleted.

Software/Script/Scilab/ADCAsgard/50-25.CSV

Lines changed: 0 additions & 2777 deletions
This file was deleted.

Software/Script/Scilab/ADCAsgard/50-50.CSV

Lines changed: 0 additions & 3585 deletions
This file was deleted.

Software/Script/Scilab/ADCAsgard/CSVLoader.sce

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Re=24;
3434
cfactor=25;
3535
//Define tollerance band
3636
airdensityeband=0.5; //Air Density Percent of rho
37-
viscosityeband=0.5;//Viscosity %
37+
viscosityeband=2;//Viscosity %
3838
altitudeeband=0.5;//Altitude %
3939
fsamplev=zeros(1,ngroups);
4040

@@ -109,39 +109,39 @@ subplot(4,3,3)
109109
xtitle('True Air Speed [m/s] vs Time [ms]')
110110
plot(timetic,Q(:,TASmcol),2)
111111
//External temperature [°K]
112-
subplot(4,3,3)
112+
subplot(4,3,4)
113113
xtitle('External Temperature [°K] vs Time [ms]')
114114
plot(timetic,Q(:,ExtTempmcol),2)
115115
//Temperature deltapsensor [°K]
116-
subplot(4,3,4)
116+
subplot(4,3,5)
117117
xtitle('Temperature from deltap pressure sensor [°K] vs Time [ms]')
118118
plot(timetic,Q(:,tempdeltapmcol),2)
119119
//Temperature abspressure sensor [°K]
120-
subplot(4,3,5)
120+
subplot(4,3,6)
121121
xtitle('Temperature from absolute pressure sensor [°K] vs Time [ms]')
122122
plot(timetic,Q(:,tempabsmcol),2)
123123
//Altitude [m]
124-
subplot(4,3,6)
124+
subplot(4,3,7)
125125
xtitle('Altitude [m] vs Time [ms]')
126126
plot(timetic,Q(:,altitude),2)
127127
//Outside Air Temperature [°K]
128-
subplot(4,3,7)
128+
subplot(4,3,8)
129129
xtitle('Outside Air Temperature [°K] vs Time [ms]')
130130
plot(timetic,Q(:,OAT),2)
131131
//Air Density [kg/m^3]
132-
subplot(4,3,8)
132+
subplot(4,3,9)
133133
xtitle('Air Density [kg/m^3] vs Time [ms]')
134134
plot(timetic,Q(:,rhoairmcol),2)
135135
//Air Viscosity [mPas]
136-
subplot(4,3,9)
136+
subplot(4,3,10)
137137
xtitle('Air Viscosity [mPas] vs Time [ms]')
138138
plot(timetic,Q(:,vair),2)
139139
//Re
140-
subplot(4,3,10)
140+
subplot(4,3,11)
141141
xtitle('Reynolds vs Time [ms]')
142142
plot(timetic,Q(:,Re),2)
143143
//C factot
144-
subplot(4,3,11)
144+
subplot(4,3,12)
145145
xtitle('c factor vs Time [ms]')
146146
plot(timetic,Q(:,cfactor),2)
147147
//Compares ADC logged values with offline calculated ones
@@ -169,7 +169,7 @@ if debug==1 then
169169
subplot(2,2,2)
170170
xtitle('Viscosity of Air Difference % vs Time [ms]')
171171
for ri=1:r
172-
Q(ri,c+2)=(Q(ri,vair)-viscosityair(Q(ri,exttempcol)))/viscosityair(Q(ri,exttempcol))*100
172+
Q(ri,c+2)=(Q(ri,vair)-viscosityair(Q(ri,ExtTempmcol)))/viscosityair(Q(ri,ExtTempmcol))*100
173173
end
174174
plot(timetic,Q(:,c+2),2)
175175
if ((abs(min(Q(:,c+2)))<viscosityeband)&(abs(max(Q(:,c+2)))<viscosityeband)) then
@@ -189,9 +189,4 @@ if debug==1 then
189189
else
190190
mprintf('\nWarning: ADC calculated altitude value is outside the tollerance band of %f %% of viscosity',altitudeeband)
191191
end
192-
193-
194-
195-
196-
197192
end

0 commit comments

Comments
 (0)