phillip/dezibot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix oversights in modeling functions

Browse Source
This commit is contained in:
Phillip Kühne
2025-02-15 22:07:33 +01:00
parent ff80ebe4db
commit 62d4c6bdb0
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motion/Motion.h
View File

@@ -71,7 +71,7 @@ class Motor{
* @param durationMs time the display will be on
* @return consumed energy in coloumbs
*/
float modelChargeConsumptionOn(uint16_t duty, uint16_t durationMs);
float modelChargeConsumption(uint16_t duty, uint16_t durationMs);
protected:

4
src/motion/Motor.cpp
View File

@@ -68,11 +68,11 @@ bool Motor::setSpeed(uint16_t duty) {
uint16_t Motor::getSpeed(void) { return this->duty; };
float modelCurrentConsumption(uint16_t duty) {
float Motor::modelCurrentConsumption(uint16_t duty) {
const float dutyFactor = duty / static_cast<float>(1 << DUTY_RES);
return PowerParameters::CurrentConsumptions::CURRENT_MOTOR_T_ON * dutyFactor;
}
float modelChargeConsumptionOn(uint16_t duty, uint16_t durationMs) {
float Motor::modelChargeConsumption(uint16_t duty, uint16_t durationMs) {
return modelCurrentConsumption(duty) * durationMs * 10e6;
}