diff --git a/src/Dezibot.cpp b/src/Dezibot.cpp index 6c9e9c4..2282813 100644 --- a/src/Dezibot.cpp +++ b/src/Dezibot.cpp @@ -9,7 +9,7 @@ Dezibot::Dezibot() : multiColorLight() {}; void Dezibot::begin(void) { - Power.begin(); + power.begin(); Wire.begin(SDA_PIN, SCL_PIN); infraredLight.begin(); lightDetection.begin(); diff --git a/src/motion/Motor.cpp b/src/motion/Motor.cpp index 7c629b2..d6c68e3 100644 --- a/src/motion/Motor.cpp +++ b/src/motion/Motor.cpp @@ -1,11 +1,11 @@ #include "Motion.h" +#include "power/Power.h" Motor::Motor(uint8_t pin, ledc_timer_t timer, ledc_channel_t channel){ this->pin = pin; this->channel = channel; this->timer = timer; this->duty = 0; - this->powerManager = }; void Motor::begin(void){ @@ -24,13 +24,6 @@ void Motor::begin(void){ }; void Motor::setSpeed(uint16_t duty){ - if(duty>0) { - powerManager->waitForPowerAllowance(CONSUMPTION_MOTOR, portMAX_DELAY); - Serial.println("Motor got power"); - } else { - powerManager->releasePower(CONSUMPTION_MOTOR); - Serial.println("Motor released power"); - } int difference = duty-this->getSpeed(); if (difference > 0){ for(int i = 0;i