j/armchair_fw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch V2.1-board-motorctl to work with new common code

Browse Source 
Changes to outsourced motorctl code made configuration
of currently unused board-motorctl from V2.1 incompatible
-> patch config
This commit is contained in:
jonny_jr9 2023-09-13 15:38:40 +02:00
parent 169c809870
commit b6fd16eb2a
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
board_control/sdkconfig
View File

@ -132,6 +132,23 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_PARTITION_TABLE_MD5=y
# end of Partition Table
#
# SSD1306 Configuration
#
CONFIG_GPIO_RANGE_MAX=33
CONFIG_I2C_INTERFACE=y
# CONFIG_SPI_INTERFACE is not set
# CONFIG_SSD1306_128x32 is not set
CONFIG_SSD1306_128x64=y
CONFIG_OFFSETX=0
# CONFIG_FLIP is not set
CONFIG_SCL_GPIO=22
CONFIG_SDA_GPIO=21
CONFIG_RESET_GPIO=15
CONFIG_I2C_PORT_0=y
# CONFIG_I2C_PORT_1 is not set
# end of SSD1306 Configuration
#
# Compiler options
#

16
board_motorctl/main/config.cpp
View File

@ -76,10 +76,22 @@ fan_config_t configCooling = {
//===== create global objects =====
//=================================
//TODO outsource global variables to e.g. global.cpp and only config options here?
single100a motorDriverLeft(configDriverLeft);
single100a motorDriverRight(configDriverRight);
//--- controlledMotor ---
//functions for updating the duty via certain/current driver that can then be passed to controlledMotor
//-> makes it possible to easily use different motor drivers
//note: ignoring warning "capture of variable with non-automatic storage duration", since sabertoothDriver object does not get destroyed anywhere - no lifetime issue
motorSetCommandFunc_t setLeftFunc = [&motorDriverLeft](motorCommand_t cmd) {
motorDriverLeft.set(cmd);
};
motorSetCommandFunc_t setRightFunc = [&motorDriverRight](motorCommand_t cmd) {
motorDriverRight.set(cmd);
};
//create controlled motor instances (motorctl.hpp)
controlledMotor motorLeft(configDriverLeft, configMotorControlLeft);
controlledMotor motorRight(configDriverRight, configMotorControlRight);
controlledMotor motorLeft(setLeftFunc, configMotorControlLeft);
controlledMotor motorRight(setRightFunc, configMotorControlRight);
//create buzzer object on pin 12 with gap between queued events of 100ms
buzzer_t buzzer(GPIO_NUM_12, 100);

17
board_motorctl/sdkconfig
View File

@ -132,6 +132,23 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_PARTITION_TABLE_MD5=y
# end of Partition Table
#
# SSD1306 Configuration
#
CONFIG_GPIO_RANGE_MAX=33
CONFIG_I2C_INTERFACE=y
# CONFIG_SPI_INTERFACE is not set
# CONFIG_SSD1306_128x32 is not set
CONFIG_SSD1306_128x64=y
CONFIG_OFFSETX=0
# CONFIG_FLIP is not set
CONFIG_SCL_GPIO=22
CONFIG_SDA_GPIO=21
CONFIG_RESET_GPIO=15
CONFIG_I2C_PORT_0=y
# CONFIG_I2C_PORT_1 is not set
# end of SSD1306 Configuration
#
# Compiler options
#