0b113eafb5
- add 3 functions to controlledMotor class in motorctl.cpp/hpp
- setFade: set specific msFade duration for acceleration or
deceleration
- setFade: disable or set to default ramp for acceleration or
deceleration
- toggleFade: toggle between fading enabled or disables for
acceleration or deceleration
- button.cpp
- add controlledMotor objects to constructor
- add new command 8x press which now toggles fade-deceleration of both
motors
- config.cpp
- slightly decrease fading durations
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
C++
#pragma once
|
|
|
|
extern "C"
|
|
{
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "freertos/queue.h"
|
|
#include "esp_log.h"
|
|
#include "esp_timer.h"
|
|
}
|
|
|
|
#include "motordrivers.hpp"
|
|
|
|
|
|
//-------------------------------------
|
|
//-------- struct/type declarations -------
|
|
//-------------------------------------
|
|
|
|
//struct for sending command for one motor in the queue
|
|
struct motorCommand_t {
|
|
motorstate_t state;
|
|
float duty;
|
|
};
|
|
|
|
//struct containing commands for two motors
|
|
typedef struct motorCommands_t {
|
|
motorCommand_t left;
|
|
motorCommand_t right;
|
|
} motorCommands_t;
|
|
|
|
//struct with all config parameters for a motor regarding ramp and current limit
|
|
typedef struct motorctl_config_t {
|
|
uint32_t msFadeAccel; //acceleration of the motor (ms it takes from 0% to 100%)
|
|
uint32_t msFadeDecel; //deceleration of the motor (ms it takes from 100% to 0%)
|
|
float currentMax;
|
|
} motorctl_config_t;
|
|
|
|
//enum fade type (acceleration, deceleration)
|
|
//e.g. used for specifying which fading should be modified with setFade, togleFade functions
|
|
enum class fadeType_t {ACCEL, DECEL};
|
|
|
|
|
|
|
|
class controlledMotor {
|
|
public:
|
|
//--- functions ---
|
|
controlledMotor(single100a_config_t config_driver, motorctl_config_t config_control); //constructor with structs for configuring motordriver and parameters for control TODO: add configuration for currentsensor
|
|
void handle(); //controls motor duty with fade and current limiting feature (has to be run frequently by another task)
|
|
void setTarget(motorstate_t state_f, float duty_f = 0); //adds target command to queue for handle function
|
|
motorCommand_t getStatus(); //get current status of the motor (returns struct with state and duty)
|
|
|
|
void setFade(fadeType_t fadeType, bool enabled); //enable/disable acceleration or deceleration fading
|
|
void setFade(fadeType_t fadeType, uint32_t msFadeNew); //set acceleration or deceleration fade time
|
|
bool toggleFade(fadeType_t fadeType); //toggle acceleration or deceleration on/off
|
|
|
|
|
|
private:
|
|
//--- functions ---
|
|
void init(); //creates currentsensor objects, motordriver objects and queue
|
|
|
|
//--- objects ---
|
|
//TODO: add currentsensor object
|
|
//motor driver
|
|
single100a motor;
|
|
//queue for sending commands to the separate task running the handle() function very fast
|
|
QueueHandle_t commandQueue = NULL;
|
|
|
|
//--- variables ---
|
|
//struct for storing control specific parameters
|
|
motorctl_config_t config;
|
|
|
|
motorstate_t state = motorstate_t::IDLE;
|
|
|
|
float currentMax;
|
|
float currentNow;
|
|
|
|
float dutyTarget;
|
|
float dutyNow;
|
|
float dutyIncrementAccel;
|
|
float dutyIncrementDecel;
|
|
float dutyDelta;
|
|
|
|
uint32_t msFadeAccel;
|
|
uint32_t msFadeDecel;
|
|
|
|
uint32_t ramp;
|
|
int64_t timestampLastRunUs;
|
|
|
|
struct motorCommand_t commandReceive = {};
|
|
struct motorCommand_t commandSend = {};
|
|
|
|
};
|