Skip to content

Commit 38f0c3b

Browse files
committed
Fixed max value from 255 to 100
1 parent e69260b commit 38f0c3b

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed
Binary file not shown.
0 Bytes
Binary file not shown.

app/build/intermediates/incremental/mergeResources/debug/merger.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<item name="500">Every 500 milliseconds</item>
1212
<item name="1000">Every 1 second</item>
1313
<item name="2000">Every 2 seconds</item>
14-
</string-array><string-array name="dataFormat">
15-
<item name="4">data only (4 bytes)</item>
16-
<item name="5">precede by \'U\' (0x55)</item>
17-
<item name="6">use STX(02) and ETX(03)</item>
18-
<item name="7">$PWM=123,234*</item>
1914
</string-array><string-array name="dataFormatValues">
2015
<item name="4">4</item>
2116
<item name="5">5</item>
2217
<item name="6">6</item>
2318
<item name="7">7</item>
19+
</string-array><string-array name="dataFormat">
20+
<item name="4">data only (4 bytes)</item>
21+
<item name="5">precede by \'U\' (0x55)</item>
22+
<item name="6">use STX(02) and ETX(03)</item>
23+
<item name="7">$PWM=12,23* (max=100)</item>
2424
</string-array><string-array name="timeoutCount">
2525
<item name="0">Continually</item>
2626
<item name="10">Every after 10 intervals</item>
@@ -33,4 +33,4 @@
3333
<item name="500">500</item>
3434
<item name="1000">1000</item>
3535
<item name="2000">2000</item>
36-
</string-array></file><file path="C:\projects\android\android-joystick-app\app\src\main\res\values\strings.xml" qualifiers=""><string name="btnC_text">C</string><string name="btnA_text">A</string><string name="title_not_connected">not connected</string><string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth JoyStick.</string><string name="btnB_text">B</string><string name="title_connected_to">connected to:</string><string name="dataL_text">( 0, 0 )</string><string name="btnD_text">D</string><string name="dataR_text">( 0, 0 )</string><string name="not_connected">You are not connected to a device</string><string name="scanning">scanning for devices</string><string name="title_other_devices">Other Available Devices</string><string name="status_text">C</string><string name="select_device">select a device to connect</string><string name="title_connecting">connecting</string><string name="none_paired">No devices have been paired</string><string name="title_paired_devices">Paired Devices</string><string name="none_found">No devices found</string><string name="app_name">BTJoyStick</string><string name="button_scan">Scan for devices</string></file></source><source path="C:\projects\android\android-joystick-app\app\build\generated\res\rs\debug"/><source path="C:\projects\android\android-joystick-app\app\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\projects\android\android-joystick-app\app\src\debug\res"/></dataSet><mergedItems/></merger>
36+
</string-array></file><file path="C:\projects\android\android-joystick-app\app\src\main\res\values\strings.xml" qualifiers=""><string name="btnC_text">C</string><string name="btnA_text">A</string><string name="title_not_connected">not connected</string><string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth JoyStick.</string><string name="btnB_text">B</string><string name="title_connected_to">connected to:</string><string name="dataL_text">( 0, 0 )</string><string name="btnD_text">D</string><string name="dataR_text">( 0, 0 )</string><string name="not_connected">You are not connected to a device</string><string name="scanning">scanning for devices</string><string name="status_text">C</string><string name="title_other_devices">Other Available Devices</string><string name="select_device">select a device to connect</string><string name="title_connecting">connecting</string><string name="none_paired">No devices have been paired</string><string name="title_paired_devices">Paired Devices</string><string name="none_found">No devices found</string><string name="button_scan">Scan for devices</string><string name="app_name">BTJoyStick</string></file></source><source path="C:\projects\android\android-joystick-app\app\build\generated\res\rs\debug"/><source path="C:\projects\android\android-joystick-app\app\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\projects\android\android-joystick-app\app\src\debug\res"/></dataSet><mergedItems/></merger>

app/build/intermediates/res/debug/values/values.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<item name="4">data only (4 bytes)</item>
77
<item name="5">precede by \'U\' (0x55)</item>
88
<item name="6">use STX(02) and ETX(03)</item>
9-
<item name="7">$PWM=123,234*</item>
9+
<item name="7">$PWM=12,23* (max=100)</item>
1010
</string-array>
1111
<string-array name="dataFormatValues">
1212
<item name="4">4</item>
8 Bytes
Binary file not shown.
13 Bytes
Binary file not shown.
13 Bytes
Binary file not shown.

app/src/main/java/org/projectproto/btjoystick/BluetoothJoystickActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@ private void UpdateMethod() {
369369
sendMessage( new String(new byte[] {
370370
0x02, radiusL, angleL, radiusR, angleR, 0x03 } ) );
371371
}else if( mDataFormat==7 ) {
372-
// use "$PWM=123,234*"
372+
// use "$PWM=12,23*"
373373

374374
// radiusL = 0 .. 10
375375
// angleL = 0 .. 35
376-
int radius = 255 * radiusL / 10;
376+
int radius = 100 * radiusL / 10; // maximum value = 100
377377
int angle = angleL * 10;
378378
double angleRadians = Math.toRadians(angle);
379379

app/src/main/res/values/arrays.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<item name="4">data only (4 bytes)</item>
3939
<item name="5">precede by \'U\' (0x55)</item>
4040
<item name="6">use STX(02) and ETX(03)</item>
41-
<item name="7">$PWM=123,234*</item>
41+
<item name="7">$PWM=12,23* (max=100)</item>
4242
</string-array>
4343

4444
<string-array name="dataFormatValues">

0 commit comments

Comments
 (0)