Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
PeerfactSim.KOM
Commits
125d6756
Commit
125d6756
authored
Nov 06, 2020
by
Julian Zobel
Browse files
Removed Sysouts
parent
3a9f72cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/de/tud/kom/p2psim/impl/energy/components/StatefulActuatorComponent.java
View file @
125d6756
...
...
@@ -102,9 +102,9 @@ public class StatefulActuatorComponent implements ActuatorComponent {
double
consumationDelta
=
MAX
.
getEnergyConsumption
()
-
FLY
.
getEnergyConsumption
();
double
estimation
=
FLY
.
getEnergyConsumption
()
+
consumationDelta
*
load
;
System
.
out
.
println
(
"MAX "
+
((
MAX
.
getEnergyConsumption
()
/
14.8
)
/
Battery
.
uJconverison
));
System
.
out
.
println
(
"MIN"
+
((
FLY
.
getEnergyConsumption
()
/
14.8
)
/
Battery
.
uJconverison
));
System
.
out
.
println
(
load
);
//
System.out.println("MAX " + ((MAX.getEnergyConsumption() / 14.8) / Battery.uJconverison));
//
System.out.println("MIN" + ((FLY.getEnergyConsumption() / 14.8) / Battery.uJconverison));
//
System.out.println(load);
// this estimation is in uJ, but has to return J, thus, do conversion
return
estimation
/
Battery
.
uJconverison
;
}
...
...
src/de/tud/kom/p2psim/impl/energy/components/StatelessActuatorComponent.java
View file @
125d6756
...
...
@@ -144,7 +144,7 @@ public class StatelessActuatorComponent implements ActuatorComponent {
else
{
double
amps
=
approximateAmpereDraw
(
targetThrust
);
System
.
out
.
println
(
amps
);
//
System.out.println(amps);
return
numberOfActuators
*
amps
*
volts
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment