diff --git a/CONFIGURATION/CL-Windcon/src/ikClwindconInputMod/ikClwindconInputMod.c b/CONFIGURATION/CL-Windcon/src/ikClwindconInputMod/ikClwindconInputMod.c index 647ab40..6ceaf4f 100644 --- a/CONFIGURATION/CL-Windcon/src/ikClwindconInputMod/ikClwindconInputMod.c +++ b/CONFIGURATION/CL-Windcon/src/ikClwindconInputMod/ikClwindconInputMod.c @@ -51,7 +51,7 @@ void ikGeneratorSpeedSingalFail(ikClwindconWTConInputs *in) { */ /*! [Speed sensor fault] */ - if (0 < N && _n < N) { + if (0 >= N || _n < N) { _n++; return; } diff --git a/doc/svg/ikClwindconWTCon_block_diagram.svg b/doc/svg/ikClwindconWTCon_block_diagram.svg index 1b93350..b17158f 100644 --- a/doc/svg/ikClwindconWTCon_block_diagram.svg +++ b/doc/svg/ikClwindconWTCon_block_diagram.svg @@ -1970,16 +1970,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.31079822" - inkscape:cx="1265.304" - inkscape:cy="1815.2639" + inkscape:zoom="0.43830041" + inkscape:cx="1619.8935" + inkscape:cy="832.62336" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1005" + inkscape:window-x="-9" + inkscape:window-y="-9" inkscape:window-maximized="1" fit-margin-top="10" fit-margin-left="10" @@ -2014,42 +2014,49 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> + width="192.63057" + height="83.401764" + x="617.60461" + y="410.21466" /> drivetrain damper + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">drivetrain damper ikConLoop + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">ikConLoop + + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">+ + + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">+ - torque control + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">torque control ikConLoop + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">ikConLoop torquetorquedemanddemand  + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">  torque demandtorque demandfrom drivetrain damperfrom drivetrain damper  + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">  torque demandtorque demandfrom torque controlfrom torque control  + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">  maximummaximumspeedspeed  + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">  @@ -2278,56 +2292,58 @@ sodipodi:nodetypes="cc" /> 0 + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">0 + width="262.77829" + height="55.645401" + x="503.92499" + y="1093.8442" /> collective pitch control + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">collective pitch control ikConLoop + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">ikConLoop @@ -2364,84 +2380,90 @@ y="671.479" /> torque-pitch manager + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">torque-pitch manager ikTpman + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">ikTpman pitch demand for blade 1 + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">pitch demand for blade 1 pitch demand for blade 2 + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">pitch demand for blade 2 pitch demand for blade 3 + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">pitch demand for blade 3 collective pitchcollective pitchdemand + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">demand @@ -2503,8 +2525,8 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" /> @@ -2526,7 +2548,7 @@ id="path4164-6-0-3-3-5-9" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> - external minimum torque + style="font-size:22.53806496px;line-height:1.25;stroke-width:1.5px">external minimum torque external maximum torque + style="font-size:22.53806496px;line-height:1.25;stroke-width:1.5px">external maximum torque external maximum pitch + style="font-size:22.53806496px;line-height:1.25;stroke-width:1.5px">external maximum pitch maximum pitch + style="text-align:center;text-anchor:middle;stroke-width:1.5px">maximum pitch minimum pitch + style="text-align:center;text-anchor:middle;stroke-width:1.5px">minimum pitch minimum torqueminimum torque + style="text-align:center;text-anchor:middle;stroke-width:1.5px" /> -1 + style="font-size:22.95324135px;line-height:1.25;stroke-width:1.5px">-1 power manager ikPowman derating ratio + style="font-size:22.53806686px;line-height:1.25;text-align:start;text-anchor:start;stroke-width:1.50000012px">derating ratio + width="68.689369" + height="37.044655" + x="1552.4827" + y="356.07776" /> MIN maximum torque + style="font-size:22.53806686px;line-height:1.25;stroke-width:1.50000012px">maximum torque maximum torque from power manager + style="font-size:22.53806877px;line-height:1.25;stroke-width:1.50000036px">maximum torque from power manager + width="68.689369" + height="37.044655" + x="1689.0117" + y="481.44702" /> MAX minimum pitch from power manager + style="font-size:22.53806686px;line-height:1.25;stroke-width:1.50000012px">minimum pitch from power manager external minimum pitch + style="font-size:22.53806686px;line-height:1.25;stroke-width:1.50000012px">external minimum pitch individual pitch control + style="font-size:22.95323944px;line-height:1.25;stroke-width:1.49999988px">individual pitch control ikIpc 0 + style="font-size:22.95323944px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:1.49999988px">0 blade root moments + style="font-size:22.95323944px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:1.49999988px">blade root moments azimuth + style="font-size:22.95323944px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:1.49999988px">azimuth 0 + style="font-size:22.95323944px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:1.49999988px">0 0 + style="font-size:22.95323944px;line-height:1.25;text-align:end;text-anchor:end;stroke-width:1.49999988px">0 maximum individual pitch + style="font-size:22.95323944px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.49999988px">maximum individual pitch @@ -3045,7 +3072,7 @@ yaw by ipc ikConLoop yaw error reference yaw error individual pitch for yaw + style="font-size:22.95323944px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.49999988px">individual pitch for yaw + width="36.590233" + height="32.589973" + x="1264.6149" + y="1398.1893" /> -1 + style="font-size:22.95323944px;line-height:1.25;stroke-width:1.49999988px">-1 @@ -3192,19 +3219,19 @@ r="4.999999" /> generator speed + style="text-align:end;text-anchor:end;stroke-width:1.5px">generator speed speed sensor manager + style="font-size:22.95323944px;line-height:1.25;stroke-width:1.49999988px">speed sensor manager ikSpdman rotor speed + style="text-align:end;text-anchor:end;stroke-width:1.50000024px">rotor speed azimuth + style="text-align:end;text-anchor:end;stroke-width:1.50000036px">azimuth generator speed equivalent + style="text-align:center;text-anchor:middle;stroke-width:1.50000024px">generator speed equivalent +