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

Update configs according to new pin assignment

Browse Source 
current config of each board now matches pin assignment
This commit is contained in:
jonny_jr9 2023-09-04 08:43:20 +02:00
parent b6fb97277b
commit 0a1f941de0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board_motorctl/main/config.cpp
View File

@ -6,8 +6,8 @@
//--- configure left motor (hardware) --- //--- configure left motor (hardware) ---
single100a_config_t configDriverLeft = { single100a_config_t configDriverLeft = {
.gpio_pwm = GPIO_NUM_26, .gpio_pwm = GPIO_NUM_26,
.gpio_a = GPIO_NUM_16, .gpio_a = GPIO_NUM_4,
.gpio_b = GPIO_NUM_4, .gpio_b = GPIO_NUM_16,
.ledc_timer = LEDC_TIMER_0, .ledc_timer = LEDC_TIMER_0,
.ledc_channel = LEDC_CHANNEL_0, .ledc_channel = LEDC_CHANNEL_0,
.aEnabledPinState = false, //-> pins inverted (mosfets) .aEnabledPinState = false, //-> pins inverted (mosfets)
@ -20,7 +20,7 @@ single100a_config_t configDriverLeft = {
single100a_config_t configDriverRight = { single100a_config_t configDriverRight = {
.gpio_pwm = GPIO_NUM_27, .gpio_pwm = GPIO_NUM_27,
.gpio_a = GPIO_NUM_2, .gpio_a = GPIO_NUM_2,
.gpio_b = GPIO_NUM_14, .gpio_b = GPIO_NUM_15,
.ledc_timer = LEDC_TIMER_1, .ledc_timer = LEDC_TIMER_1,
.ledc_channel = LEDC_CHANNEL_1, .ledc_channel = LEDC_CHANNEL_1,
.aEnabledPinState = false, //-> pin inverted (mosfet) .aEnabledPinState = false, //-> pin inverted (mosfet)
@ -35,8 +35,13 @@ single100a_config_t configDriverRight = {
motorctl_config_t configMotorControlLeft = { motorctl_config_t configMotorControlLeft = {
.msFadeAccel = 1900, //acceleration of the motor (ms it takes from 0% to 100%) .msFadeAccel = 1900, //acceleration of the motor (ms it takes from 0% to 100%)
.msFadeDecel = 1000, //deceleration of the motor (ms it takes from 100% to 0%) .msFadeDecel = 1000, //deceleration of the motor (ms it takes from 100% to 0%)
<<<<<<< Updated upstream
.currentLimitEnabled = true, .currentLimitEnabled = true,
.currentSensor_adc = ADC1_CHANNEL_0, //GPIO36
=======
.currentLimitEnabled = false,
.currentSensor_adc = ADC1_CHANNEL_6, //GPIO34 .currentSensor_adc = ADC1_CHANNEL_6, //GPIO34
>>>>>>> Stashed changes
.currentSensor_ratedCurrent = 50, .currentSensor_ratedCurrent = 50,
.currentMax = 30, .currentMax = 30,
.deadTimeMs = 900 //minimum time motor is off between direction change .deadTimeMs = 900 //minimum time motor is off between direction change
@ -46,8 +51,13 @@ motorctl_config_t configMotorControlLeft = {
motorctl_config_t configMotorControlRight = { motorctl_config_t configMotorControlRight = {
.msFadeAccel = 1900, //acceleration of the motor (ms it takes from 0% to 100%) .msFadeAccel = 1900, //acceleration of the motor (ms it takes from 0% to 100%)
.msFadeDecel = 1000, //deceleration of the motor (ms it takes from 100% to 0%) .msFadeDecel = 1000, //deceleration of the motor (ms it takes from 100% to 0%)
<<<<<<< Updated upstream
.currentLimitEnabled = true, .currentLimitEnabled = true,
.currentSensor_adc = ADC1_CHANNEL_3, //GPIO39
=======
.currentLimitEnabled = false,
.currentSensor_adc = ADC1_CHANNEL_4, //GPIO32 .currentSensor_adc = ADC1_CHANNEL_4, //GPIO32
>>>>>>> Stashed changes
.currentSensor_ratedCurrent = 50, .currentSensor_ratedCurrent = 50,
.currentMax = 30, .currentMax = 30,
.deadTimeMs = 900 //minimum time motor is off between direction change .deadTimeMs = 900 //minimum time motor is off between direction change