Skip to content

Commit c1ed98c

Browse files
Updated config file to match TrikStudio 3.0.0-a6 port naming conventions
1 parent d382b20 commit c1ed98c

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

trikControl/config.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,47 +50,47 @@ Use it if JCx ports are configured to work as PWM signal generators.
5050
Motor type parameters like calibration curve are described separately, in "motorTypes" section. -->
5151
<servoMotors>
5252
<servoMotor
53-
port="JE1"
53+
port="E1"
5454
deviceFile="/sys/class/pwm/ehrpwm.1:1/duty_ns"
5555
periodFile="/sys/class/pwm/ehrpwm.1:1/period_ns"
5656
period="20000000"
5757
defaultType="steeringAngularServo"
5858
invert="false"
5959
/>
6060
<servoMotor
61-
port="JE2"
61+
port="E2"
6262
deviceFile="/sys/class/pwm/ehrpwm.1:0/duty_ns"
6363
periodFile="/sys/class/pwm/ehrpwm.1:0/period_ns"
6464
period="20000000"
6565
defaultType="handRotationServo"
6666
invert="false"
6767
/>
6868
<servoMotor
69-
port="JE3"
69+
port="E3"
7070
deviceFile="/sys/class/pwm/ehrpwm.0:1/duty_ns"
7171
periodFile="/sys/class/pwm/ehrpwm.0:1/period_ns"
7272
period="20000000"
7373
defaultType="handPressServo"
7474
invert="false"
7575
/>
7676
<servoMotor
77-
port="JC1"
77+
port="C1"
7878
deviceFile="/sys/class/pwm/ecap.0/duty_ns"
7979
periodFile="/sys/class/pwm/ecap.0/period_ns"
8080
period="20000000"
8181
defaultType="defaultServo"
8282
invert="false"
8383
/>
8484
<servoMotor
85-
port="JC2"
85+
port="C2"
8686
deviceFile="/sys/class/pwm/ecap.1/duty_ns"
8787
periodFile="/sys/class/pwm/ecap.1/period_ns"
8888
period="20000000"
8989
defaultType="defaultServo"
9090
invert="false"
9191
/>
9292
<servoMotor
93-
port="JC3"
93+
port="C3"
9494
deviceFile="/sys/class/pwm/ecap.2/duty_ns"
9595
periodFile="/sys/class/pwm/ecap.2/period_ns"
9696
period="20000000"
@@ -102,17 +102,17 @@ Use it if JCx ports are configured to work as PWM signal generators.
102102
<pwmCaptures>
103103
<!--
104104
<capture
105-
port="JC1"
105+
port="C1"
106106
frequencyFile="/sys/class/pwm/ecap_cap.0/freq"
107107
dutyFile="/sys/class/pwm/ecap_cap.0/duty_percentage"
108108
/>
109109
<capture
110-
port="JC2"
110+
port="C2"
111111
frequencyFile="/sys/class/pwm/ecap_cap.1/freq"
112112
dutyFile="/sys/class/pwm/ecap_cap.1/duty_percentage"
113113
/>
114114
<capture
115-
port="JC3"
115+
port="C3"
116116
frequencyFile="/sys/class/pwm/ecap_cap.2/freq"
117117
dutyFile="/sys/class/pwm/ecap_cap.2/duty_percentage"
118118
/>
@@ -124,31 +124,31 @@ Use it if JCx ports are configured to work as PWM signal generators.
124124
Power motors do not have a type, because their driver is controlled by high-level
125125
commands and handles motor specifics by itself. -->
126126
<powerMotors>
127-
<powerMotor port="JM1" i2cCommandNumber="0x14" invert="false" />
128-
<powerMotor port="JM2" i2cCommandNumber="0x15" invert="false" />
129-
<powerMotor port="M1" i2cCommandNumber="0x16" invert="true" />
130-
<powerMotor port="JM3" i2cCommandNumber="0x17" invert="false" />
127+
<powerMotor port="M1" i2cCommandNumber="0x14" invert="false" />
128+
<powerMotor port="M2" i2cCommandNumber="0x15" invert="false" />
129+
<powerMotor port="M3" i2cCommandNumber="0x16" invert="true" />
130+
<powerMotor port="M4" i2cCommandNumber="0x17" invert="false" />
131131
</powerMotors>
132132

133133
<!-- Aanalog sensors configuration, maps logical port to I2C command.
134134
I2C device path and device id are set separately, in "i2c" section.
135135
Analog sensors do not have a type, because their driver is controlled by high-level
136136
commands and handles sensor specifics by itself. -->
137137
<analogSensors>
138-
<analogSensor port="JA1" i2cCommandNumber="0x25" />
139-
<analogSensor port="JA2" i2cCommandNumber="0x24" />
140-
<analogSensor port="JA3" i2cCommandNumber="0x23" />
141-
<analogSensor port="JA4" i2cCommandNumber="0x22" />
142-
<analogSensor port="JA5" i2cCommandNumber="0x21" />
143-
<analogSensor port="JA6" i2cCommandNumber="0x20" />
138+
<analogSensor port="A1" i2cCommandNumber="0x25" />
139+
<analogSensor port="A2" i2cCommandNumber="0x24" />
140+
<analogSensor port="A3" i2cCommandNumber="0x23" />
141+
<analogSensor port="A4" i2cCommandNumber="0x22" />
142+
<analogSensor port="A5" i2cCommandNumber="0x21" />
143+
<analogSensor port="A6" i2cCommandNumber="0x20" />
144144
</analogSensors>
145145

146146
<!-- Encoders configuration, maps logical port to I2C command.
147147
I2C device path and device id are set separately, in "i2c" section. -->
148148
<encoders>
149-
<encoder port="JB2" i2cCommandNumber="0x31" />
150-
<encoder port="JB4" i2cCommandNumber="0x32" />
151-
<encoder port="JB3" i2cCommandNumber="0x33" />
149+
<encoder port="B2" i2cCommandNumber="0x31" />
150+
<encoder port="B4" i2cCommandNumber="0x32" />
151+
<encoder port="B3" i2cCommandNumber="0x33" />
152152
</encoders>
153153

154154
<!-- Description of servo motor types used in servo motors mapping. Supplied values correspond to
@@ -164,8 +164,8 @@ Use it if JCx ports are configured to work as PWM signal generators.
164164
<!-- Digital sensors configuration, maps logical port to digital sensor device file and digital sensor type used by default
165165
(if not configured programmatically). -->
166166
<digitalSensors>
167-
<!-- <digitalSensor port="JD1" deviceFile="/sys/devices/platform/da850_trik/sensor_d1" defaultType="lightSensor" />
168-
<digitalSensor port="JD2" deviceFile="/sys/devices/platform/da850_trik/sensor_d2" defaultType="lightSensor" /> -->
167+
<!-- <digitalSensor port="D1" deviceFile="/sys/devices/platform/da850_trik/sensor_d1" defaultType="lightSensor" />
168+
<digitalSensor port="D2" deviceFile="/sys/devices/platform/da850_trik/sensor_d2" defaultType="lightSensor" /> -->
169169
<digitalSensor port="F1" deviceFile="/sys/devices/platform/da850_trik/sensor_dc" defaultType="volumeSensor" />
170170
<accelerometer min="-32767" max="32767" deviceFile="/dev/input/by-path/platform-i2c_davinci.1-event" />
171171
<gyroscope min="-32767" max="32767" deviceFile="/dev/input/by-path/platform-spi_davinci.1-event" />

0 commit comments

Comments
 (0)