diff --git a/CMakeLists.txt b/CMakeLists.txt index e7326fc..89028a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ target_compile_options(motortest.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON # -DPETERS_PLATINE +# -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -106,6 +107,7 @@ target_compile_options(motortest_peter.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE +# -DSHUNT_4_MILLIOHM # -DFEATURE_INVERT_HALL # -DHUART2 # -DHUART3 @@ -134,6 +136,7 @@ target_compile_options(feedcode-front.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE +# -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -160,6 +163,7 @@ target_compile_options(feedcode-back.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE +# -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -186,6 +190,7 @@ target_compile_options(greyhash.elf PRIVATE -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE +# -DSHUNT_4_MILLIOHM # -DHUART2 -DHUART3 -DFEATURE_SERIAL_CONTROL @@ -212,6 +217,7 @@ target_compile_options(pcbv2_front.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE + # -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -239,6 +245,7 @@ target_compile_options(pcbv2_back.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE + # -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -266,6 +273,7 @@ target_compile_options(pcbv2_test.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE + # -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -316,6 +324,7 @@ target_compile_options(commander_v2_front.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE + -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL @@ -366,6 +375,7 @@ target_compile_options(commander_v2_back.elf PRIVATE # -DPWM_FREQ_12KHZ # -DFEATURE_BUTTON -DPETERS_PLATINE + -DSHUNT_4_MILLIOHM # -DHUART2 # -DHUART3 # -DFEATURE_SERIAL_CONTROL diff --git a/main.cpp b/main.cpp index c229ac9..7a848b9 100644 --- a/main.cpp +++ b/main.cpp @@ -496,6 +496,12 @@ void updateMotors() #endif int16_t curR_DC = (int16_t)(offsetdcr - adc_buffer.dcr); + +#ifdef SHUNT_4_MILLIOHM + curL_DC *= 2; + curR_DC *= 2; +#endif + const bool chopL = std::abs(curL_DC) > (left.iDcMax.load() * AMPERE2BIT_CONV); if (chopL) left.chops++;