fe0e0093d0
menu.cpp:
- add item center-Joystick (functional)
- add item accel-Limit (functional)
- add item decel-Limit (functional)
- fix display freeze on timeout
- add menu timeout
- switch to previous mode on exit instead of always idle
motorctl.cpp:
- add getFade method, to get currently configured values
- add log output on fade change
89 lines
3.0 KiB
C++
89 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"
|
|
#include "currentsensor.hpp"
|
|
|
|
|
|
//=======================================
|
|
//====== struct/type declarations ======
|
|
//=======================================
|
|
//outsourced to common/types.hpp
|
|
#include "types.hpp"
|
|
|
|
typedef void (*motorSetCommandFunc_t)(motorCommand_t cmd);
|
|
|
|
|
|
//===================================
|
|
//====== controlledMotor class ======
|
|
//===================================
|
|
class controlledMotor {
|
|
public:
|
|
//--- functions ---
|
|
controlledMotor(motorSetCommandFunc_t setCommandFunc, 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)
|
|
|
|
uint32_t getFade(fadeType_t fadeType); //get currently set acceleration or deceleration fading time
|
|
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
|
|
|
|
float getCurrentA() {return cSensor.read();}; //read current-sensor of this motor (Ampere)
|
|
|
|
//TODO set current limit method
|
|
|
|
private:
|
|
//--- functions ---
|
|
void init(); //creates currentsensor objects, motordriver objects and queue
|
|
|
|
//--- objects ---
|
|
//queue for sending commands to the separate task running the handle() function very fast
|
|
QueueHandle_t commandQueue = NULL;
|
|
//current sensor
|
|
currentSensor cSensor;
|
|
|
|
//function pointer that sets motor duty (driver)
|
|
motorSetCommandFunc_t motorSetCommand;
|
|
|
|
//--- variables ---
|
|
//TODO add name for logging?
|
|
//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;
|
|
|
|
bool deadTimeWaiting = false;
|
|
uint32_t timestampsModeLastActive[4] = {};
|
|
motorstate_t statePrev = motorstate_t::FWD;
|
|
|
|
struct motorCommand_t commandReceive = {};
|
|
struct motorCommand_t commandSend = {};
|
|
|
|
uint32_t timestamp_commandReceived = 0;
|
|
bool receiveTimeout = false;
|
|
};
|