Skip to content

Commit 7f8e79c

Browse files
committed
Renamed mentions of tmc 1.2.1 to 1.2.2 to make versioning clearer
1 parent 16011ce commit 7f8e79c

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

Firmware/FFBoard/UserExtensions/Inc/TMC4671.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ enum class PosSelection : uint8_t {PhiE=0, PhiE_ext=1, PhiE_openloop=2, PhiE_abn
4141
enum class EncoderType_TMC : uint8_t {NONE=0,abn=1,sincos=2,uvw=3,hall=4,ext=5}; // max 7
4242

4343
// Hardware versions for identifying different types
44-
enum class TMC_HW_Ver : uint8_t {NONE=0,v1_0,v1_2,v1_2_1,v1_2_1_LEM20,v1_2_1_TMCS};
44+
enum class TMC_HW_Ver : uint8_t {NONE=0,v1_0,v1_2,v1_2_2,v1_2_2_LEM20,v1_2_2_TMCS};
4545
// Selectable version names to be listed in commands
4646
const std::vector<std::pair<TMC_HW_Ver,std::string>> tmcHwVersionNames{
4747
std::make_pair(TMC_HW_Ver::NONE,"Undefined"), // Do not select. Default but disables some safety features
4848
std::make_pair(TMC_HW_Ver::v1_0,"v1.0"),
4949
std::make_pair(TMC_HW_Ver::v1_2,"v1.2"),
50-
std::make_pair(TMC_HW_Ver::v1_2_1,"v1.2.1 LEM GO 10"),
51-
std::make_pair(TMC_HW_Ver::v1_2_1_LEM20,"v1.2.1 LEM GO 20"),
52-
std::make_pair(TMC_HW_Ver::v1_2_1_TMCS,"v1.2.1 TMCS1100A2")
50+
std::make_pair(TMC_HW_Ver::v1_2_2,"v1.2.2 LEM GO 10"),
51+
std::make_pair(TMC_HW_Ver::v1_2_2_LEM20,"v1.2.2 LEM GO 20"),
52+
std::make_pair(TMC_HW_Ver::v1_2_2_TMCS,"v1.2.2 TMCS1100A2")
5353
};
5454

5555
struct TMC4671MotConf{

Firmware/FFBoard/UserExtensions/Src/TMC4671.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,10 +1821,10 @@ void TMC4671::restoreEncHallMisc(uint16_t val){
18211821
void TMC4671::setHwType(TMC_HW_Ver type){
18221822
//TMC4671HardwareTypeConf newHwConf;
18231823
switch(type){
1824-
case TMC_HW_Ver::v1_2_1_TMCS:
1824+
case TMC_HW_Ver::v1_2_2_TMCS:
18251825
{
18261826
TMC4671HardwareTypeConf newHwConf = {
1827-
.hwVersion = TMC_HW_Ver::v1_2_1_TMCS,
1827+
.hwVersion = TMC_HW_Ver::v1_2_2_TMCS,
18281828
.adcOffset = 0,
18291829
.thermistor_R2 = 1500,
18301830
.thermistor_R = 10000,
@@ -1838,11 +1838,11 @@ void TMC4671::setHwType(TMC_HW_Ver type){
18381838
this->conf.hwconf = newHwConf;
18391839
break;
18401840
}
1841-
case TMC_HW_Ver::v1_2_1_LEM20:
1841+
case TMC_HW_Ver::v1_2_2_LEM20:
18421842
{
18431843
// TODO possibly lower PWM limit because of lower valid sensor range
18441844
TMC4671HardwareTypeConf newHwConf = {
1845-
.hwVersion = TMC_HW_Ver::v1_2_1,
1845+
.hwVersion = TMC_HW_Ver::v1_2_2,
18461846
.adcOffset = 0,
18471847
.thermistor_R2 = 1500,
18481848
.thermistor_R = 10000,
@@ -1856,11 +1856,11 @@ void TMC4671::setHwType(TMC_HW_Ver type){
18561856
this->conf.hwconf = newHwConf;
18571857
break;
18581858
}
1859-
case TMC_HW_Ver::v1_2_1:
1859+
case TMC_HW_Ver::v1_2_2:
18601860
{
18611861
// TODO possibly lower PWM limit because of lower valid sensor range
18621862
TMC4671HardwareTypeConf newHwConf = {
1863-
.hwVersion = TMC_HW_Ver::v1_2_1,
1863+
.hwVersion = TMC_HW_Ver::v1_2_2,
18641864
.adcOffset = 0,
18651865
.thermistor_R2 = 1500,
18661866
.thermistor_R = 10000,

0 commit comments

Comments
 (0)