Skip to content
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

BLDC engine added #560

Merged
merged 27 commits into from
Jan 11, 2022
Merged

BLDC engine added #560

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ad4550d
first release FRBLdc.cpp and test scripts
pbecchi Dec 19, 2021
bafa85a
Programmable braking torque
pbecchi Dec 28, 2021
db1afa1
Delete Cobra2217.xml
pbecchi Dec 28, 2021
3708f40
added F450 test case
pbecchi Dec 28, 2021
541753a
Update FGBldc.h
pbecchi Dec 28, 2021
49df919
FGpropulsion.cpp modified
pbecchi Dec 29, 2021
0ec7d4d
local modifications
pbecchi Dec 29, 2021
8ea4b13
Merge branch 'DLBGengine' of https://github.com/pbecchi/jsbsim into D…
pbecchi Dec 29, 2021
43e2f64
Cmakelists_propulsion
pbecchi Jan 1, 2022
701190c
cleaned_examples
pbecchi Jan 8, 2022
be747db
Merge branch 'DLBGengine' of https://github.com/pbecchi/jsbsim into D…
pbecchi Jan 8, 2022
f566702
FGBLdc.cpp_reformatted
pbecchi Jan 8, 2022
841d32f
formatCorrections
pbecchi Jan 8, 2022
031a001
Correction_Reformat_requested
pbecchi Jan 8, 2022
313b169
updatedMakefile&addedElectricalUnits
pbecchi Jan 8, 2022
9c2b187
corrections
pbecchi Jan 10, 2022
e76c643
AdditionalCorrections
pbecchi Jan 10, 2022
927d82b
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
7b27fc6
Update src/input_output/FGXMLElement.cpp
pbecchi Jan 10, 2022
5948851
Update src/models/propulsion/FGBrushLessDCMotor.h
pbecchi Jan 10, 2022
2ce9a4e
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
3da9f59
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
7273ed7
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
4d5b655
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
d19358f
Update src/models/propulsion/FGBrushLessDCMotor.cpp
pbecchi Jan 10, 2022
073615f
Remaining_comments
pbecchi Jan 11, 2022
58a7d77
Merge branch 'DLBGengine' of https://github.com/pbecchi/jsbsim into D…
pbecchi Jan 11, 2022
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
2 changes: 2 additions & 0 deletions JSBSim.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
<ClInclude Include="src\models\flight_control\FGDistributor.h" />
<ClInclude Include="src\models\flight_control\FGLinearActuator.h" />
<ClInclude Include="src\models\flight_control\FGWaypoint.h" />
<ClInclude Include="src\models\propulsion\FGBldc.h" />
<ClInclude Include="src\models\propulsion\FGTransmission.h" />
<ClInclude Include="src\simgear\xml\ascii.h" />
<ClInclude Include="src\simgear\xml\asciitab.h" />
Expand Down Expand Up @@ -371,6 +372,7 @@
<ClCompile Include="src\models\flight_control\FGDistributor.cpp" />
<ClCompile Include="src\models\flight_control\FGLinearActuator.cpp" />
<ClCompile Include="src\models\flight_control\FGWaypoint.cpp" />
<ClCompile Include="src\models\propulsion\FGBldc.cpp" />
<ClCompile Include="src\models\propulsion\FGTransmission.cpp" />
<ClCompile Include="src\simgear\magvar\coremag.cxx" />
<ClCompile Include="src\simgear\xml\easyxml.cxx" />
Expand Down
6 changes: 6 additions & 0 deletions JSBSim.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
<ClCompile Include="src\math\FGStateSpace.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\models\propulsion\FGBldc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\input_output\FGInputSocket.h">
Expand Down Expand Up @@ -673,5 +676,8 @@
<ClInclude Include="src\math\FGStateSpace.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\models\propulsion\FGBldc.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
149 changes: 149 additions & 0 deletions aircraft/F450/Aero.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<?xml version="1.0" ?>
<aerodynamics>
<function name="aero/coefficient/CL__zero">
<description>CL__zero</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/dCL__alpha_rad">
<description>dCL__alpha_rad</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CL__alpha_rad">
<description>CL__alpha_rad = dCL__alpha_rad * alpha_rad</description>
<product>
<property>aero/coefficient/dCL__alpha_rad</property>
<property>aero/alpha-rad</property>
</product>
</function>
<function name="aero/coefficient/CL">
<description>CL summation</description>
<sum>
<property>aero/coefficient/CL__zero</property>
<property>aero/coefficient/CL__alpha_rad</property>
</sum>
</function>
<function name="aero/coefficient/CD__zero">
<description>CD__zero</description>
<value> 1.0 </value>
</function>
<function name="aero/coefficient/dCD__alpha_rad">
<description>dCD__alpha_rad</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CD__alpha_rad">
<description>CD__alpha_rad = dCD__alpha_rad * alpha_rad</description>
<product>
<property>aero/coefficient/dCD__alpha_rad</property>
<property>aero/alpha-rad</property>
</product>
</function>
<function name="aero/coefficient/CD">
<description>CD summation</description>
<sum>
<property>aero/coefficient/CD__zero</property>
<property>aero/coefficient/CD__alpha_rad</property>
</sum>
</function>
<function name="aero/coefficient/CY__zero">
<description>CY__zero</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CY">
<description>CY summation</description>
<sum>
<property>aero/coefficient/CY__zero</property>
<value> 0 </value>
</sum>
</function>
<function name="aero/coefficient/CMl__zero">
<description>CMl__zero</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CMl">
<description>CMl summation</description>
<sum>
<property>aero/coefficient/CMl__zero</property>
<value> 0 </value>
</sum>
</function>
<function name="aero/coefficient/CMm__zero">
<description>CMm__zero</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CMm">
<description>CM summation</description>
<sum>
<property>aero/coefficient/CMm__zero</property>
<value> 0 </value>
</sum>
</function>
<function name="aero/coefficient/CMn__zero">
<description>CMn__zero</description>
<value> 0 </value>
</function>
<function name="aero/coefficient/CMn">
<description>CMn summation</description>
<sum>
<property>aero/coefficient/CMn__zero</property>
<value> 0 </value>
</sum>
</function>

<axis name="LIFT">
<function name="aero/force/LIFT__CL">
<description>LIFT from CL</description>
<product>
<property>aero/qbar-area</property>
<property>aero/coefficient/CL</property>
</product>
</function>
</axis>
<axis name="DRAG">
<function name="aero/force/DRAG__CD">
<description>DRAG from CD</description>
<product>
<property>aero/qbar-area</property>
<property>aero/coefficient/CD</property>
</product>
</function>
</axis>
<axis name="SIDE">
<function name="aero/force/SIDE__CY">
<description>SIDE from CY</description>
<product>
<property>aero/qbar-area</property>
<property>aero/coefficient/CY</property>
</product>
</function>
</axis>
<axis name="ROLL">
<function name="aero/moment/ROLL__CMl">
<description>ROLL from CMl</description>
<product>
<property>aero/qbar-area</property>
<property>metrics/bw-ft</property>
<property>aero/coefficient/CMl</property>
</product>
</function>
</axis>
<axis name="PITCH">
<function name="aero/moment/PITCH__CMm">
<description>PITCH from CMm</description>
<product>
<property>aero/qbar-area</property>
<property>metrics/cbarw-ft</property>
<property>aero/coefficient/CMm</property>
</product>
</function>
</axis>
<axis name="YAW">
<function name="aero/moment/YAW__CMn">
<description>YAW from CMn</description>
<product>
<property>aero/qbar-area</property>
<property>metrics/bw-ft</property>
<property>aero/coefficient/CMn</property>
</product>
</function>
</axis>
</aerodynamics>
Expand Down
46 changes: 46 additions & 0 deletions aircraft/F450/Effectors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" ?>

<system name="Effectors">
<channel name="Electronic Speed Conrollers">
<actuator name="Front Right">
<input>fcs/cmdEscFR_nd</input>
<!-- Want a total tau=0.100 with 20 ms delay -->
<!-- <delay> 0.010 </delay> -->
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
<output>fcs/throttle-cmd-norm[0]</output>
</actuator>

<actuator name="Aft Left">
<input>fcs/cmdEscAL_nd</input>
<!-- <delay> 0.010 </delay> -->
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
<output>fcs/throttle-cmd-norm[1]</output>
</actuator>

<actuator name="Front Left">
<input>fcs/cmdEscFL_nd</input>
<!-- <delay> 0.010 </delay> -->
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
<output>fcs/throttle-cmd-norm[2]</output>
</actuator>

<actuator name="Aft Right">
<input>fcs/cmdEscAR_nd</input>
<!-- <delay> 0.010 </delay> -->
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
<output>fcs/throttle-cmd-norm[3]</output>
</actuator>
</channel>
</system>
Loading