diff --git a/examples/position_sense/hdsl_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/example.syscfg b/examples/position_sense/hdsl_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/example.syscfg index 487bcba..8fbb991 100644 --- a/examples/position_sense/hdsl_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/example.syscfg +++ b/examples/position_sense/hdsl_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/example.syscfg @@ -1,7 +1,7 @@ /** * These arguments were used when this file was generated. They will be automatically applied on subsequent loads * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments. - * @cliArgs --device "AM243x_ALV_beta" --package "ALV" --part "ALV" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK_AM243X@09.01.00" + * @cliArgs --device "AM243x_ALV_beta" --package "ALV" --part "ALV" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK@09.01.00" * @versions {"tool":"1.18.0+3266"} */ @@ -102,7 +102,3 @@ hdsl1.PRU_ICSSG0_PRU.GPO5.$suggestSolution = "PRG0_PRU1_GPO5"; hdsl1.PRU_ICSSG0_PRU.GPO4.$suggestSolution = "PRG0_PRU1_GPO4"; hdsl1.PRU_ICSSG0_PRU.GPO3.$suggestSolution = "PRG0_PRU1_GPO3"; hdsl1.PRU_ICSSG0_PRU.GPI14.$suggestSolution = "PRG0_PRU1_GPO14"; -hdsl1.PRU_ICSSG0_PRU.GPO8.$suggestSolution = "PRG0_PRU1_GPO8"; -hdsl1.PRU_ICSSG0_PRU.GPO12.$suggestSolution = "PRG0_PRU1_GPO12"; -hdsl1.PRU_ICSSG0_PRU.GPO6.$suggestSolution = "PRG0_PRU1_GPO6"; -hdsl1.PRU_ICSSG0_PRU.GPI11.$suggestSolution = "PRG0_PRU1_GPO11"; diff --git a/examples/position_sense/hdsl_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/example.syscfg b/examples/position_sense/hdsl_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/example.syscfg index 5f92cd4..24feb78 100644 --- a/examples/position_sense/hdsl_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/example.syscfg +++ b/examples/position_sense/hdsl_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/example.syscfg @@ -1,7 +1,7 @@ /** * These arguments were used when this file was generated. They will be automatically applied on subsequent loads * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments. - * @cliArgs --device "AM64x_beta" --package "ALV" --part "Default" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK_AM64X@09.01.00" + * @cliArgs --device "AM64x" --package "ALV" --part "Default" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK@09.01.00" * @versions {"tool":"1.18.0+3266"} */ @@ -75,12 +75,13 @@ mpu_armv76.baseAddr = 0x80000000; mpu_armv76.size = 31; hdsl1.$name = "CONFIG_HDSL0"; -hdsl1.coreClk = 300000000; hdsl1.channel_1 = true; +hdsl1.coreClk = 300000000; hdsl1.PRU_ICSSG0_PRU.$assign = "PRU_ICSSG0_PRU1"; const pruicss2 = pruicss.addInstance({}, false); pruicss2.$name = "CONFIG_PRU_ICSS0"; +pruicss2.instance = scripting.forceWrite("ICSSG0"); hdsl1.pru = pruicss2; pruicss2.AdditionalICSSSettings[0].$name = "CONFIG_PRU_ICSS_IO1"; @@ -102,7 +103,3 @@ hdsl1.PRU_ICSSG0_PRU.GPO5.$suggestSolution = "PRG0_PRU1_GPO5"; hdsl1.PRU_ICSSG0_PRU.GPO4.$suggestSolution = "PRG0_PRU1_GPO4"; hdsl1.PRU_ICSSG0_PRU.GPO3.$suggestSolution = "PRG0_PRU1_GPO3"; hdsl1.PRU_ICSSG0_PRU.GPI14.$suggestSolution = "PRG0_PRU1_GPO14"; -hdsl1.PRU_ICSSG0_PRU.GPO8.$suggestSolution = "PRG0_PRU1_GPO8"; -hdsl1.PRU_ICSSG0_PRU.GPO12.$suggestSolution = "PRG0_PRU1_GPO12"; -hdsl1.PRU_ICSSG0_PRU.GPO6.$suggestSolution = "PRG0_PRU1_GPO6"; -hdsl1.PRU_ICSSG0_PRU.GPI11.$suggestSolution = "PRG0_PRU1_GPO11"; diff --git a/examples/position_sense/hdsl_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/example.syscfg b/examples/position_sense/hdsl_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/example.syscfg index e53e3d6..dd07507 100644 --- a/examples/position_sense/hdsl_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/example.syscfg +++ b/examples/position_sense/hdsl_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/example.syscfg @@ -1,7 +1,7 @@ /** * These arguments were used when this file was generated. They will be automatically applied on subsequent loads * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments. - * @cliArgs --device "AM243x_ALV_beta" --package "ALV" --part "ALV" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK_AM243X@09.01.00" + * @cliArgs --device "AM243x_ALV_beta" --package "ALV" --part "ALV" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK@09.01.00" * @versions {"tool":"1.18.0+3266"} */ @@ -104,11 +104,3 @@ hdsl1.PRU_ICSSG0_PRU.GPO2.$suggestSolution = "PRG0_PRU1_GPO2"; hdsl1.PRU_ICSSG0_PRU.GPO1.$suggestSolution = "PRG0_PRU1_GPO1"; hdsl1.PRU_ICSSG0_PRU.GPO0.$suggestSolution = "PRG0_PRU1_GPO0"; hdsl1.PRU_ICSSG0_PRU.GPI13.$suggestSolution = "PRG0_PRU1_GPO13"; -hdsl1.PRU_ICSSG0_PRU.GPO5.$suggestSolution = "PRG0_PRU1_GPO5"; -hdsl1.PRU_ICSSG0_PRU.GPO4.$suggestSolution = "PRG0_PRU1_GPO4"; -hdsl1.PRU_ICSSG0_PRU.GPO3.$suggestSolution = "PRG0_PRU1_GPO3"; -hdsl1.PRU_ICSSG0_PRU.GPI14.$suggestSolution = "PRG0_PRU1_GPO14"; -hdsl1.PRU_ICSSG0_PRU.GPO8.$suggestSolution = "PRG0_PRU1_GPO8"; -hdsl1.PRU_ICSSG0_PRU.GPO12.$suggestSolution = "PRG0_PRU1_GPO12"; -hdsl1.PRU_ICSSG0_PRU.GPO6.$suggestSolution = "PRG0_PRU1_GPO6"; -hdsl1.PRU_ICSSG0_PRU.GPI11.$suggestSolution = "PRG0_PRU1_GPO11"; diff --git a/examples/position_sense/hdsl_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/example.syscfg b/examples/position_sense/hdsl_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/example.syscfg index 1aee5a1..7ab3748 100644 --- a/examples/position_sense/hdsl_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/example.syscfg +++ b/examples/position_sense/hdsl_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/example.syscfg @@ -1,7 +1,7 @@ /** * These arguments were used when this file was generated. They will be automatically applied on subsequent loads * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments. - * @cliArgs --device "AM243x_ALX_beta" --package "ALX" --part "ALX" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK_AM243X@09.01.00" + * @cliArgs --device "AM243x_ALX_beta" --package "ALX" --part "ALX" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK@09.01.00" * @versions {"tool":"1.18.0+3266"} */ @@ -77,18 +77,10 @@ mpu_armv75.baseAddr = 0x60000000; mpu_armv75.size = 28; mpu_armv75.accessPermissions = "Supervisor RD, User RD"; -hdsl1.$name = "CONFIG_HDSL0"; -hdsl1.Booster_Pack = true; -hdsl1.coreClk = 300000000; -hdsl1.PRU_ICSSG0_PRU.$assign = "PRU_ICSSG0_PRU1"; -hdsl1.PRU_ICSSG0_PRU.GPO5.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPO4.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPO3.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPI14.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPO8.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPO12.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPO6.$used = false; -hdsl1.PRU_ICSSG0_PRU.GPI11.$used = false; +hdsl1.$name = "CONFIG_HDSL0"; +hdsl1.Booster_Pack = true; +hdsl1.coreClk = 300000000; +hdsl1.PRU_ICSSG0_PRU.$assign = "PRU_ICSSG0_PRU1"; hdsl1.ENC1_EN = gpio2; gpio2.$name = "ENC1_EN"; diff --git a/examples/position_sense/hdsl_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/example.syscfg b/examples/position_sense/hdsl_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/example.syscfg index 97dc71e..8efbf11 100644 --- a/examples/position_sense/hdsl_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/example.syscfg +++ b/examples/position_sense/hdsl_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/example.syscfg @@ -1,7 +1,7 @@ /** * These arguments were used when this file was generated. They will be automatically applied on subsequent loads * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments. - * @cliArgs --device "AM64x" --package "ALV" --part "Default" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK_AM64X@09.01.00" + * @cliArgs --device "AM64x" --package "ALV" --part "Default" --context "r5fss0-0" --product "MOTOR_CONTROL_SDK@09.01.00" * @versions {"tool":"1.18.0+3266"} */ @@ -87,6 +87,7 @@ hdsl1.PRU_ICSSG0_PRU.$assign = "PRU_ICSSG0_PRU1"; const pruicss2 = pruicss.addInstance({}, false); pruicss2.$name = "CONFIG_PRU_ICSS0"; +pruicss2.instance = scripting.forceWrite("ICSSG0"); hdsl1.pru = pruicss2; pruicss2.AdditionalICSSSettings[0].$name = "CONFIG_PRU_ICSS_IO1"; @@ -104,11 +105,3 @@ hdsl1.PRU_ICSSG0_PRU.GPO2.$suggestSolution = "PRG0_PRU1_GPO2"; hdsl1.PRU_ICSSG0_PRU.GPO1.$suggestSolution = "PRG0_PRU1_GPO1"; hdsl1.PRU_ICSSG0_PRU.GPO0.$suggestSolution = "PRG0_PRU1_GPO0"; hdsl1.PRU_ICSSG0_PRU.GPI13.$suggestSolution = "PRG0_PRU1_GPO13"; -hdsl1.PRU_ICSSG0_PRU.GPO5.$suggestSolution = "PRG0_PRU1_GPO5"; -hdsl1.PRU_ICSSG0_PRU.GPO4.$suggestSolution = "PRG0_PRU1_GPO4"; -hdsl1.PRU_ICSSG0_PRU.GPO3.$suggestSolution = "PRG0_PRU1_GPO3"; -hdsl1.PRU_ICSSG0_PRU.GPI14.$suggestSolution = "PRG0_PRU1_GPO14"; -hdsl1.PRU_ICSSG0_PRU.GPO8.$suggestSolution = "PRG0_PRU1_GPO8"; -hdsl1.PRU_ICSSG0_PRU.GPO12.$suggestSolution = "PRG0_PRU1_GPO12"; -hdsl1.PRU_ICSSG0_PRU.GPO6.$suggestSolution = "PRG0_PRU1_GPO6"; -hdsl1.PRU_ICSSG0_PRU.GPI11.$suggestSolution = "PRG0_PRU1_GPO11"; diff --git a/source/.meta/position_sense/hdsl_endat_pins.js b/source/.meta/position_sense/hdsl_endat_pins.js index 5483f5c..5c05bc6 100644 --- a/source/.meta/position_sense/hdsl_endat_pins.js +++ b/source/.meta/position_sense/hdsl_endat_pins.js @@ -42,7 +42,7 @@ function pinmuxRequirements(inst) { pinmux.setConfigurableDefault( pinResource, "rx", pin.rx ); - if(inst["Channel_0"]==true){ + if((inst["Channel_0"]==true) || (inst["channel_0"]==true)){ if( (pin.pinName == "GPO2") || (pin.pinName == "GPO1") || (pin.pinName == "GPO0") || (pin.pinName == "GPI13")){ pinResource.used = true; } @@ -52,7 +52,7 @@ function pinmuxRequirements(inst) { } } - if(inst["Channel_1"]==true){ + if((inst["Channel_1"]==true) || (inst["channel_1"]==true)){ if( (pin.pinName == "GPO5") || (pin.pinName == "GPO4") || (pin.pinName == "GPO3") || (pin.pinName == "GPI14")){ pinResource.used = true; } @@ -62,7 +62,7 @@ function pinmuxRequirements(inst) { } } - if(inst["Channel_2"]==true){ + if((inst["Channel_2"]==true) || (inst["channel_2"]==true)){ if( (pin.pinName == "GPO8") || (pin.pinName == "GPO12") || (pin.pinName == "GPO6") || (pin.pinName == "GPI11")){ pinResource.used = true; }