Skip to content

Commit

Permalink
Merge branch 'encodersInDegrees' of git://github.com/romankurbatov/tr…
Browse files Browse the repository at this point in the history 
…ikRuntime

Conflicts:
	trikControl/config.xml
  • Loading branch information
@yurii-litvinov
yurii-litvinov committed Aug 4, 2014
2 parents 60521c2 + 288fd89 commit 8e0b83c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
11 changes: 6 additions & 5 deletions trikControl/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ Use it if JCx ports are configured to work as PWM signal generators.
<!-- Encoders configuration, maps logical port to I2C command.
I2C device path and device id are set separately, in "i2c" section. -->
<encoders>
<encoder port="B1" i2cCommandNumber="0x30" defaultType="defaultEncoder"/>
<encoder port="B2" i2cCommandNumber="0x31" defaultType="defaultEncoder"/>
<encoder port="B4" i2cCommandNumber="0x32" defaultType="defaultEncoder"/>
<encoder port="B3" i2cCommandNumber="0x33" defaultType="defaultEncoder"/>
<encoder port="B1" i2cCommandNumber="0x30" defaultType="encoder95"/>
<encoder port="B2" i2cCommandNumber="0x31" defaultType="encoder95"/>
<encoder port="B4" i2cCommandNumber="0x32" defaultType="encoder95"/>
<encoder port="B3" i2cCommandNumber="0x33" defaultType="encoder95"/>
</encoders>

<!-- Description of servo motor types used in servo motors mapping. Supplied values correspond to
Expand Down Expand Up @@ -185,7 +185,8 @@ Use it if JCx ports are configured to work as PWM signal generators.

<!-- Description of encoder types. Provides a coefficient for converting raw encoder values to degrees. -->
<encoderTypes>
<defaultEncoder rawToDegrees="0.02304708" />
<encoder95 rawToDegrees="0.02304708" />
<encoder126 rawToDegrees="0.03033597" />
</encoderTypes>

<!-- Format for playSound command, used to play .wav files. %1 designates file name to be played. -->
Expand Down
9 changes: 5 additions & 4 deletions trikControl/config_capture.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ Use it if JCx ports are configured to work as PWM signal capture devices.
<!-- Encoders configuration, maps logical port to I2C command.
I2C device path and device id are set separately, in "i2c" section. -->
<encoders>
<encoder port="B2" i2cCommandNumber="0x31" />
<encoder port="B4" i2cCommandNumber="0x32" />
<encoder port="B3" i2cCommandNumber="0x33" />
<encoder port="B2" i2cCommandNumber="0x31" defaultType="encoder95" />
<encoder port="B4" i2cCommandNumber="0x32" defaultType="encoder95" />
<encoder port="B3" i2cCommandNumber="0x33" defaultType="encoder95" />
</encoders>

<!-- Description of servo motor types used in servo motors mapping. Supplied values correspond to
Expand Down Expand Up @@ -184,7 +184,8 @@ Use it if JCx ports are configured to work as PWM signal capture devices.

<!-- Description of encoder types. Provides a coefficient for converting raw encoder values to degrees. -->
<encoderTypes>
<defaultEncoder rawToDegrees="0.02304708" />
<encoder95 rawToDegrees="0.02304708" />
<encoder126 rawToDegrees="0.03033597" />
</encoderTypes>

<!-- Format for playSound command, used to play .wav files. %1 designates file name to be played. -->
Expand Down

0 comments on commit 8e0b83c

Please sign in to comment.