diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzeFFT1024.txt b/docs/audio_html/AudioAnalyzeFFT1024.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzeFFT1024.txt rename to docs/audio_html/AudioAnalyzeFFT1024.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzeFFT256.txt b/docs/audio_html/AudioAnalyzeFFT256.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzeFFT256.txt rename to docs/audio_html/AudioAnalyzeFFT256.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzeNoteFrequency.txt b/docs/audio_html/AudioAnalyzeNoteFrequency.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzeNoteFrequency.txt rename to docs/audio_html/AudioAnalyzeNoteFrequency.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzePeak.txt b/docs/audio_html/AudioAnalyzePeak.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzePeak.txt rename to docs/audio_html/AudioAnalyzePeak.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzePrint.txt b/docs/audio_html/AudioAnalyzePrint.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzePrint.txt rename to docs/audio_html/AudioAnalyzePrint.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzeRMS.txt b/docs/audio_html/AudioAnalyzeRMS.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzeRMS.txt rename to docs/audio_html/AudioAnalyzeRMS.html diff --git a/docs/scripts/ParsedNodeDocs/AudioAnalyzeToneDetect.txt b/docs/audio_html/AudioAnalyzeToneDetect.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioAnalyzeToneDetect.txt rename to docs/audio_html/AudioAnalyzeToneDetect.html diff --git a/docs/scripts/ParsedNodeDocs/AudioControlAK4558.txt b/docs/audio_html/AudioControlAK4558.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioControlAK4558.txt rename to docs/audio_html/AudioControlAK4558.html diff --git a/docs/scripts/ParsedNodeDocs/AudioControlCS4272.txt b/docs/audio_html/AudioControlCS4272.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioControlCS4272.txt rename to docs/audio_html/AudioControlCS4272.html diff --git a/docs/scripts/ParsedNodeDocs/AudioControlSGTL5000.txt b/docs/audio_html/AudioControlSGTL5000.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioControlSGTL5000.txt rename to docs/audio_html/AudioControlSGTL5000.html diff --git a/docs/scripts/ParsedNodeDocs/AudioControlWM8731.txt b/docs/audio_html/AudioControlWM8731.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioControlWM8731.txt rename to docs/audio_html/AudioControlWM8731.html diff --git a/docs/scripts/ParsedNodeDocs/AudioControlWM8731master.txt b/docs/audio_html/AudioControlWM8731master.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioControlWM8731master.txt rename to docs/audio_html/AudioControlWM8731master.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectBitcrusher.txt b/docs/audio_html/AudioEffectBitcrusher.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectBitcrusher.txt rename to docs/audio_html/AudioEffectBitcrusher.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectChorus.txt b/docs/audio_html/AudioEffectChorus.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectChorus.txt rename to docs/audio_html/AudioEffectChorus.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectDelay.txt b/docs/audio_html/AudioEffectDelay.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectDelay.txt rename to docs/audio_html/AudioEffectDelay.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectDelayExternal.txt b/docs/audio_html/AudioEffectDelayExternal.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectDelayExternal.txt rename to docs/audio_html/AudioEffectDelayExternal.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectEnvelope.txt b/docs/audio_html/AudioEffectEnvelope.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectEnvelope.txt rename to docs/audio_html/AudioEffectEnvelope.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectFade.txt b/docs/audio_html/AudioEffectFade.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectFade.txt rename to docs/audio_html/AudioEffectFade.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectFlange.txt b/docs/audio_html/AudioEffectFlange.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectFlange.txt rename to docs/audio_html/AudioEffectFlange.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectMidSide.txt b/docs/audio_html/AudioEffectMidSide.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectMidSide.txt rename to docs/audio_html/AudioEffectMidSide.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectMultiply.txt b/docs/audio_html/AudioEffectMultiply.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectMultiply.txt rename to docs/audio_html/AudioEffectMultiply.html diff --git a/docs/scripts/ParsedNodeDocs/AudioEffectReverb.txt b/docs/audio_html/AudioEffectReverb.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioEffectReverb.txt rename to docs/audio_html/AudioEffectReverb.html diff --git a/docs/scripts/ParsedNodeDocs/AudioFilterBiquad.txt b/docs/audio_html/AudioFilterBiquad.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioFilterBiquad.txt rename to docs/audio_html/AudioFilterBiquad.html diff --git a/docs/scripts/ParsedNodeDocs/AudioFilterFIR.txt b/docs/audio_html/AudioFilterFIR.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioFilterFIR.txt rename to docs/audio_html/AudioFilterFIR.html diff --git a/docs/scripts/ParsedNodeDocs/AudioFilterStateVariable.txt b/docs/audio_html/AudioFilterStateVariable.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioFilterStateVariable.txt rename to docs/audio_html/AudioFilterStateVariable.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputAnalog.txt b/docs/audio_html/AudioInputAnalog.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputAnalog.txt rename to docs/audio_html/AudioInputAnalog.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputAnalogStereo.txt b/docs/audio_html/AudioInputAnalogStereo.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputAnalogStereo.txt rename to docs/audio_html/AudioInputAnalogStereo.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputI2S.txt b/docs/audio_html/AudioInputI2S.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputI2S.txt rename to docs/audio_html/AudioInputI2S.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputI2SQuad.txt b/docs/audio_html/AudioInputI2SQuad.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputI2SQuad.txt rename to docs/audio_html/AudioInputI2SQuad.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputI2Sslave.txt b/docs/audio_html/AudioInputI2Sslave.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputI2Sslave.txt rename to docs/audio_html/AudioInputI2Sslave.html diff --git a/docs/scripts/ParsedNodeDocs/AudioInputUSB.txt b/docs/audio_html/AudioInputUSB.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioInputUSB.txt rename to docs/audio_html/AudioInputUSB.html diff --git a/docs/scripts/ParsedNodeDocs/AudioMixer4.txt b/docs/audio_html/AudioMixer4.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioMixer4.txt rename to docs/audio_html/AudioMixer4.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputAnalog.txt b/docs/audio_html/AudioOutputAnalog.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputAnalog.txt rename to docs/audio_html/AudioOutputAnalog.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputAnalogStereo.txt b/docs/audio_html/AudioOutputAnalogStereo.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputAnalogStereo.txt rename to docs/audio_html/AudioOutputAnalogStereo.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputI2S.txt b/docs/audio_html/AudioOutputI2S.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputI2S.txt rename to docs/audio_html/AudioOutputI2S.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputI2SQuad.txt b/docs/audio_html/AudioOutputI2SQuad.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputI2SQuad.txt rename to docs/audio_html/AudioOutputI2SQuad.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputI2Sslave.txt b/docs/audio_html/AudioOutputI2Sslave.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputI2Sslave.txt rename to docs/audio_html/AudioOutputI2Sslave.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputPT8211.txt b/docs/audio_html/AudioOutputPT8211.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputPT8211.txt rename to docs/audio_html/AudioOutputPT8211.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputPWM.txt b/docs/audio_html/AudioOutputPWM.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputPWM.txt rename to docs/audio_html/AudioOutputPWM.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputSPDIF.txt b/docs/audio_html/AudioOutputSPDIF.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputSPDIF.txt rename to docs/audio_html/AudioOutputSPDIF.html diff --git a/docs/scripts/ParsedNodeDocs/AudioOutputUSB.txt b/docs/audio_html/AudioOutputUSB.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioOutputUSB.txt rename to docs/audio_html/AudioOutputUSB.html diff --git a/docs/scripts/ParsedNodeDocs/AudioPlayMemory.txt b/docs/audio_html/AudioPlayMemory.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioPlayMemory.txt rename to docs/audio_html/AudioPlayMemory.html diff --git a/docs/scripts/ParsedNodeDocs/AudioPlayQueue.txt b/docs/audio_html/AudioPlayQueue.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioPlayQueue.txt rename to docs/audio_html/AudioPlayQueue.html diff --git a/docs/scripts/ParsedNodeDocs/AudioPlaySdRaw.txt b/docs/audio_html/AudioPlaySdRaw.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioPlaySdRaw.txt rename to docs/audio_html/AudioPlaySdRaw.html diff --git a/docs/scripts/ParsedNodeDocs/AudioPlaySdWav.txt b/docs/audio_html/AudioPlaySdWav.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioPlaySdWav.txt rename to docs/audio_html/AudioPlaySdWav.html diff --git a/docs/scripts/ParsedNodeDocs/AudioPlaySerialflashRaw.txt b/docs/audio_html/AudioPlaySerialflashRaw.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioPlaySerialflashRaw.txt rename to docs/audio_html/AudioPlaySerialflashRaw.html diff --git a/docs/scripts/ParsedNodeDocs/AudioRecordQueue.txt b/docs/audio_html/AudioRecordQueue.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioRecordQueue.txt rename to docs/audio_html/AudioRecordQueue.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthKarplusStrong.txt b/docs/audio_html/AudioSynthKarplusStrong.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthKarplusStrong.txt rename to docs/audio_html/AudioSynthKarplusStrong.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthNoisePink.txt b/docs/audio_html/AudioSynthNoisePink.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthNoisePink.txt rename to docs/audio_html/AudioSynthNoisePink.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthNoiseWhite.txt b/docs/audio_html/AudioSynthNoiseWhite.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthNoiseWhite.txt rename to docs/audio_html/AudioSynthNoiseWhite.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthSimpleDrum.txt b/docs/audio_html/AudioSynthSimpleDrum.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthSimpleDrum.txt rename to docs/audio_html/AudioSynthSimpleDrum.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthToneSweep.txt b/docs/audio_html/AudioSynthToneSweep.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthToneSweep.txt rename to docs/audio_html/AudioSynthToneSweep.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthWaveform.txt b/docs/audio_html/AudioSynthWaveform.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthWaveform.txt rename to docs/audio_html/AudioSynthWaveform.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthWaveformDc.txt b/docs/audio_html/AudioSynthWaveformDc.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthWaveformDc.txt rename to docs/audio_html/AudioSynthWaveformDc.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthWaveformSine.txt b/docs/audio_html/AudioSynthWaveformSine.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthWaveformSine.txt rename to docs/audio_html/AudioSynthWaveformSine.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthWaveformSineHires.txt b/docs/audio_html/AudioSynthWaveformSineHires.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthWaveformSineHires.txt rename to docs/audio_html/AudioSynthWaveformSineHires.html diff --git a/docs/scripts/ParsedNodeDocs/AudioSynthWaveformSineModulated.txt b/docs/audio_html/AudioSynthWaveformSineModulated.html similarity index 100% rename from docs/scripts/ParsedNodeDocs/AudioSynthWaveformSineModulated.txt rename to docs/audio_html/AudioSynthWaveformSineModulated.html diff --git a/docs/index.html b/docs/index.html index 7839938..21b79a1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -344,9 +344,9 @@ span.mainfunction {color: #993300; font-weight: bolder} - - + - + + - + + - + + - + - + - + - + - + + diff --git a/docs/scripts/NewOutputs/new_nodes.txt b/docs/scripts/NewOutputs/new_nodes.txt index da37762..134e21f 100644 --- a/docs/scripts/NewOutputs/new_nodes.txt +++ b/docs/scripts/NewOutputs/new_nodes.txt @@ -1,6 +1,6 @@ - {"type":"AudioInputI2S_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"inputI2S","inputs":"0","outputs":"2","category":"input-function","color":"#E6E0F8","icon":"arrow-in.png"}}, - {"type":"AudioOutputI2S_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"outputI2S","inputs":"2","outputs":"0","category":"output-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioControlTLV320AIC3206","data":{"defaults":{"name":{"value":"new"}},"shortName":"tlv320aic3206","inputs":"0","outputs":"0","category":"control-function","color":"#E6E0F8","icon":"debug.png"}}, + {"type":"AudioInputI2S_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"i2sAudioIn","inputs":"0","outputs":"2","category":"input-function","color":"#E6E0F8","icon":"arrow-in.png"}}, + {"type":"AudioOutputI2S_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"i2sAudioOut","inputs":"2","outputs":"0","category":"output-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioConvert_I16toF32","data":{"defaults":{"name":{"value":"new"}},"shortName":"I16toF32","inputs":"1","outputs":"1","category":"convert-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioConvert_F32toI16","data":{"defaults":{"name":{"value":"new"}},"shortName":"F32toI16","inputs":"1","outputs":"1","category":"convert-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioEffectCompressor_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"compressor","inputs":"1","outputs":"1","category":"effect-function","color":"#E6E0F8","icon":"arrow-in.png"}}, @@ -9,7 +9,7 @@ {"type":"AudioFilterIIR_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"iir","inputs":"1","outputs":"1","category":"filter-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioMixer4_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"mixer4","inputs":"4","outputs":"1","category":"mixer-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioMultiply_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"multiply","inputs":"2","outputs":"1","category":"effect-function","color":"#E6E0F8","icon":"arrow-in.png"}}, - {"type":"AudioControlSGTL5000_Extended","data":{"defaults":{"name":{"value":"new"}},"shortName":"sgtl5000ext","inputs":"0","outputs":"0","category":"control-function","color":"#E6E0F8","icon":"debug.png"}}, + {"type":"AudioControlSGTL5000","data":{"defaults":{"name":{"value":"new"}},"shortName":"sgtl5000","inputs":"0","outputs":"0","category":"control-function","color":"#E6E0F8","icon":"debug.png"}}, {"type":"AudioInputUSB","data":{"defaults":{"name":{"value":"new"}},"shortName":"usbAudioIn","inputs":"0","outputs":"2","category":"input-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioOutputUSB","data":{"defaults":{"name":{"value":"new"}},"shortName":"usbAudioOut","inputs":"2","outputs":"0","category":"output-function","color":"#E6E0F8","icon":"arrow-in.png"}}, {"type":"AudioSynthWaveformSine_F32","data":{"defaults":{"name":{"value":"new"}},"shortName":"sine","inputs":"0","outputs":"1","category":"synth-function","color":"#E6E0F8","icon":"arrow-in.png"}}, diff --git a/docs/scripts/findAndLoadMatchingDoc.m b/docs/scripts/findAndLoadMatchingDoc.m new file mode 100644 index 0000000..4126430 --- /dev/null +++ b/docs/scripts/findAndLoadMatchingDoc.m @@ -0,0 +1,51 @@ +function all_lines = findAndLoadMatchingDoc(node_name,dir_f32,dir_orig) +all_lines={}; + +%look first in the f32 directory +fnames = dir([dir_f32 node_name '.html']); +if isempty(fnames); fnames = dir([dir_orig node_name '.html']);end + +%maybe this is an f32 version of an original module +modify_html_for_f32=0; +if isempty(fnames); + if (node_name(end-3:end) == '_F32') + fnames = dir([dir_orig node_name(1:end-4) '.html']); + modify_html_for_f32=1; + end +end + +if isempty(fnames) + return; +end + +if length(fnames) > 1 + disp(['*** WARNING ***: findAndLoadMatchingDoc: more than one HTML file found for ' node_name]); + for I=1:length(fnames) + disp([' : ' fnames(I).name]); + end + disp([' : Using first one.']); +end + +%load the file +all_lines = readAllLines([fnames(1).folder '\' fnames(1).name]); + +%adjust as needed +if modify_html_for_f32 + name_as_orig = node_name(1:end-4); + for Iline=1:length(all_lines) + line = all_lines{Iline}; + I=strfind(line,name_as_orig); + if ~isempty(I) + new_line = []; + if (I(1) > 1) + new_line = [new_line line(1:I(1)-1)]; + end + new_line = [new_line node_name]; + new_line = [new_line line((I(1)+length(name_as_orig)):end)]; + all_lines{Iline}=new_line; + end + end +end + + + diff --git a/docs/scripts/functions/buildNewNodes.m b/docs/scripts/functions/buildNewNodes.m index 5dba4a7..059e73b 100644 --- a/docs/scripts/functions/buildNewNodes.m +++ b/docs/scripts/functions/buildNewNodes.m @@ -256,6 +256,12 @@ for Iname=1:length(class_names) if strcmpi(name,'sgtl5000_extended') name = 'sgtl5000ext'; end + if strcmpi(name,'inputI2S') + name = 'i2sAudioIn'; + end + if strcmpi(name,'outputI2S') + name = 'i2sAudioOut'; + end %strop off leading space or underscore while( (name(1) == ' ') | (name(1) == '_')); name=name(2:end); end diff --git a/docs/scripts/functions/generateNodes.m b/docs/scripts/functions/generateNodes.m index fa2a4a3..317d3c8 100644 --- a/docs/scripts/functions/generateNodes.m +++ b/docs/scripts/functions/generateNodes.m @@ -1,7 +1,7 @@ function [nodes] = generateNodes(origNode_fname,newNode_pname,outfname) if nargin < 3 - %outfname = 'NewOutputs\new_nodes.txt'; + %outfname = 'NewOutputs\new_nodes.txt'; outfname = []; if nargin < 2 %source location for header files for all of the new nodes @@ -12,14 +12,14 @@ if nargin < 3 end end end - + addpath('functions\'); %% read existing node file and get the nodes orig_nodes = parseNodeFile(origNode_fname); -% keep just a subsete of the nodes +% keep just a subset of the nodes % nodes_keep = {'AudioInputI2S','AudioInputUSB',... % 'AudioOutputI2S','AudioOutputUSB',... % 'AudioPlaySdWav',... @@ -28,16 +28,18 @@ orig_nodes = parseNodeFile(origNode_fname); % 'AudioSynthNoiseWhite','AudioSynthNoisePink',... % 'AudioAnalyzePeak','AudioAnalyzeRMS',... % 'AudioControlSGTL5000'}; -% +% % nodes_keep = {'AudioInputUSB',... % 'AudioOutputUSB',... % 'AudioPlaySdWav',... % 'AudioPlayQueue','AudioRecordQueue',... % 'AudioAnalyzePeak','AudioAnalyzeRMS'}; -nodes_keep = {'AudioInputUSB',... +nodes_keep = { + 'AudioControlSGTL5000',... + 'AudioInputUSB',... 'AudioOutputUSB',... -}; + }; %adjust node shortnames for Inode=1:length(orig_nodes) @@ -49,13 +51,21 @@ for Inode=1:length(orig_nodes) end orig_nodes(Inode)=node; end - + +%adjust node icons +for Inode=1:length(orig_nodes) + node = orig_nodes(Inode); + if strcmpi(node.type,'AudioControlSGTL5000') + node.icon = 'debug.png'; + end + orig_nodes(Inode)=node; +end %keep just these nodes=[]; for Ikeep=1:length(nodes_keep) for Iorig=1:length(orig_nodes) - node = orig_nodes(Iorig); + node = orig_nodes(Iorig); if strcmpi(node.type,nodes_keep{Ikeep}) if isempty(nodes) nodes = node; @@ -96,33 +106,44 @@ for Inode = 1:size(new_node_data,1) nodes(end+1) = node; end end - -%% sort the nodes - -%put tlv before sgtl -all_names = {nodes(:).shortName}; -I = find(strcmpi(all_names,'tlv320aic3206'));tlv_node = nodes(I); -J = find(strcmpi(all_names,'sgtl5000ext')); sgtl_node = nodes(J); -nodes(min([I(1) J(1)])) = tlv_node; %this comes first -nodes(max([I(1) J(1)])) = sgtl_node; %this comes second - -% put i2s before USB -all_names = {nodes(:).shortName}; -I = find(strcmpi(all_names,'inputI2S'));first_node = nodes(I); -J = find(strcmpi(all_names,'usbAudioIn')); second_node = nodes(J); -nodes(min([I(1) J(1)])) = first_node; %this comes first -nodes(max([I(1) J(1)])) = second_node; %this comes second - -all_names = {nodes(:).shortName}; -I = find(strcmpi(all_names,'outputI2S'));first_node = nodes(I); -J = find(strcmpi(all_names,'usbAudioOut')); second_node = nodes(J); -nodes(min([I(1) J(1)])) = first_node; %this comes first -nodes(max([I(1) J(1)])) = second_node; %this comes second +clear new_node_data + +%remove some undesired nodes +remove_names = {'AudioControlSGTL5000_Extended'}; +Ikeep = ones(size(nodes)); +for Irem=1:length(remove_names) + for Inode = 1:length(Ikeep) + if strcmpi(nodes(Inode).type,remove_names{Irem}) + Ikeep(Inode)=0; + end + end +end +Ikeep = find(Ikeep); +nodes = nodes(Ikeep); + +%% put some of the nodes into a particular desired order +first_second = {}; +first_second(end+1,:) ={'tlv320aic3206' 'sgtl5000'}; +first_second(end+1,:) ={'inputI2S' 'usbAudioIn'}; +first_second(end+1,:) ={'outputI2S' 'usbAudioOut'}; +first_second(end+1,:) ={'i2sAudioIn' 'usbAudioIn'}; +first_second(end+1,:) ={'i2sAudioOut' 'usbAudioOut'}; + +for Iswap = 1:length(first_second); + all_names = {nodes(:).shortName}; + I = find(strcmpi(all_names,first_second{Iswap,1})); + J = find(strcmpi(all_names,first_second{Iswap,2})); + if ~isempty(I) & ~isempty(J) + first_node = nodes(I); second_node = nodes(J); + nodes(min([I(1) J(1)])) = first_node; %this comes first + nodes(max([I(1) J(1)])) = second_node; %this comes second + end +end %% write new nodes if ~isempty(outfname) writeNodeText(nodes,outfname) end - + diff --git a/docs/scripts/functions/parseDocsFile.m b/docs/scripts/functions/parseAudioObjectHTML.m similarity index 94% rename from docs/scripts/functions/parseDocsFile.m rename to docs/scripts/functions/parseAudioObjectHTML.m index 9171825..843b831 100644 --- a/docs/scripts/functions/parseDocsFile.m +++ b/docs/scripts/functions/parseAudioObjectHTML.m @@ -1,4 +1,4 @@ -function all_docs = parseDocsFile(fname,outpname); +function all_docs = parseAudioObjectHTML(fname,outpname); if nargin < 2 outpname = 'NodeDocs\'; @@ -50,7 +50,7 @@ for Idoc = 1:length(row_inds)-1 name_str = name_str((I(1)+1):(I(2)-1)); %write doc - outfname = [outpname name_str '.txt']; + outfname = [outpname name_str '.html']; writeText(outfname,node_doc); %add to data structure diff --git a/docs/scripts/parseIndexHTML.m b/docs/scripts/parseIndexHTML.m index 741ad98..75f0cd3 100644 --- a/docs/scripts/parseIndexHTML.m +++ b/docs/scripts/parseIndexHTML.m @@ -88,7 +88,7 @@ outfname = 'ParsedInputs\node_docs.txt'; writeText(outfname,textToWrite); %% parse the docs and write the invidiual docs -all_docs = parseDocsFile(outfname,'ParsedNodeDocs\'); +all_docs = parseAudioObjectHTML(outfname,'..\audio_html\'); %% extract the end of the file outfname = 'ParsedInputs\end_of_file.txt'; diff --git a/docs/scripts/writeNewIndexHTML.m b/docs/scripts/writeNewIndexHTML.m index c7138e9..7462bc7 100644 --- a/docs/scripts/writeNewIndexHTML.m +++ b/docs/scripts/writeNewIndexHTML.m @@ -36,7 +36,13 @@ all_lines(end+[1:length(foo_lines)]) = foo_lines; %accumulate the lines % assemble the docs for Inode = 1:length(nodes) - foo_lines = createEmptyDoc(nodes(Inode).type); + dir_f32 = '..\audio_f32_html\'; + dir_orig = '..\audio_html\'; + foo_lines = findAndLoadMatchingDoc(nodes(Inode).type,dir_f32,dir_orig); + + if isempty(foo_lines) + foo_lines = createEmptyDoc(nodes(Inode).type); + end all_lines(end+[1:length(foo_lines)]) = foo_lines; end