Changeset 655a816 in orbit for octave/GenerateAudioCommand/flyCommand.m

Timestamp:

11/29/12 14:26:14 (7 years ago)

Author:

AzureViolin <zhanghaotz@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

f323fb4, 2cd475f

Parents:

a0b523e

Message:

flyCommand updated for 44.1kHz)

File:

• octave/GenerateAudioCommand/flyCommand.m (modified) (3 diffs)

octave/GenerateAudioCommand/flyCommand.m

@@ -7 +7 @@
 %sps = 96000;     % sample rate [samples/s]
 
-
+if length(code)==5
 if code=='demo1'
         code=[1 0 1 1 0 1 1 1 0 1 0 0 1 1 0 0 1 0 0 1 1 1 1 1 0 1 1 0];%minimum rotating throttle
@@ -18 +18 @@
         code=[1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 0 0 0 ];%test for Untitled 04
         endif
+
+endif
 
 if (length(AndroidOriOS)==3)%'iOS'
@@ -48 +50 @@
 elseif length(AndroidOriOS)==7 %'Android'
 
-longHIGH=875;longHIGH_s=floor(longHIGH*sps/1e6)-4;%longHIGH[us]  longHIGH_s[sample]
-longLOW=729;longLOW_s=floor(longLOW*sps/1e6+3);
-shortHIGH=458;shortHIGH_s=floor(shortHIGH*sps/1e6)-2;
-shortLOW=333;shortLOW_s=floor(shortLOW*sps/1e6)+1;
+longHIGH=875;longHIGH_s=floor(longHIGH*sps/1e6)-3;%longHIGH[us]  longHIGH_s[sample]
+longLOW=729;longLOW_s=floor(longLOW*sps/1e6+3)+1;
+shortHIGH=458;shortHIGH_s=floor(shortHIGH*sps/1e6)-3;
+shortLOW=333;shortLOW_s=floor(shortLOW*sps/1e6)+1+2;
 
-codeWave=[halfSineGenDirect('d',longLOW_s-1,0,1,sps);halfSineGenDirect('u',longHIGH_s-2,0,1,sps);             halfSineGenDirect('d',shortLOW_s-1,0,1,sps);halfSineGenDirect('u',longHIGH_s-2,0,1,sps); halfSineGenDirect('d',shortLOW_s,0,1,sps);0]; %starting 5 half period
+
+shortLOW_ss=floor(shortLOW*sps/1e6)+2;
+
+codeWave=[halfSineGenDirect('d',longLOW_s-1,0,1,sps);halfSineGenDirect('u',longHIGH_s-2,0,1,sps);    halfSineGenDirect('d',shortLOW_ss+2,0,1,sps);halfSineGenDirect('u',longHIGH_s-2,0,1,sps); halfSineGenDirect('d',shortLOW_ss+3,0,1,sps)]; %starting 5 half period
 
 % notice that the "code" here should be a 28 bit binary array.
-m=0;
-n=0;
 for i=1:size(code,2)
 codeWave = [codeWave; bitGenDirect(code(i),1,sps,longHIGH_s,   longLOW_s,shortHIGH_s,shortLOW_s)];
-if code(i)==1
-        n=n+1;
-elseif code(i)==0
-        m=m+1;
-endif
-
-if n==115 
-        n=0;
-        codeWave=[codeWave;0];
-endif
-if m==101
-        m=0;
-        codeWave=[codeWave;0];
-endif
         
 endfor