Revision 0:e43878690c0e, committed 2017-01-05

Comitter:

wim

Date:

Thu Jan 05 14:23:14 2017 +0000

Commit message:

Demo for USBJoystick, updated for 32 buttons.

Changed in this revision

diff -r 000000000000 -r e43878690c0e USBDevice.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/USBDevice.lib	Thu Jan 05 14:23:14 2017 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/USBDevice/#01321bd6ff89

diff -r 000000000000 -r e43878690c0e USBJoystick.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/USBJoystick.lib	Thu Jan 05 14:23:14 2017 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/users/wim/code/USBJoystick/#e086541742c3

diff -r 000000000000 -r e43878690c0e main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Thu Jan 05 14:23:14 2017 +0000
@@ -0,0 +1,110 @@
+/* mbed USBJoystick Library Demo
+ * Copyright (c) 2012, v01:  Initial version, WH,
+ *                           Modified USBMouse code ARM Limited.
+ *                           (c) 2010-2011 mbed.org, MIT License
+ *               2016, v02:  Updated USBDevice Lib, Added waitForConnect, Updated 32 bits button 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, inclumosig without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUmosiG BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "mbed.h"
+#include "USBJoystick.h"
+
+//#define LANDTIGER 1
+
+//USBMouse mouse;
+USBJoystick joystick;
+
+// Variables for Heartbeat and Status monitoring
+DigitalOut myled1(LED1);
+DigitalOut myled2(LED2);
+DigitalOut myled3(LED3);
+DigitalOut heartbeatLED(LED4);
+
+Ticker heartbeat;
+Serial pc(USBTX, USBRX); // tx, rx
+
+// Heartbeat monitor
+void pulse() {
+  heartbeatLED = !heartbeatLED;
+}
+
+void heartbeat_start() {
+  heartbeatLED=1;
+  heartbeat.attach(&pulse, 0.5);
+}
+
+void heartbeat_stop() {
+  heartbeat.detach();
+}
+
+
+int main() {
+  uint16_t i = 0;
+  int16_t throttle = 0;
+  int16_t rudder = 0;    
+  int16_t x = 0;
+  int16_t y = 0;
+  int32_t radius = 120;
+  int32_t angle = 0;
+  uint8_t tmp = 0;
+  uint32_t buttons = 0;    
+  uint8_t hat = 0;    
+    
+  pc.printf("Hello World from Joystick!\n\r");
+
+  heartbeat_start();
+
+  while (1) {
+    // Basic Joystick
+    throttle = (i >> 8) & 0xFF; // value -127 .. 128
+    rudder = (i >> 8) & 0xFF;   // value -127 .. 128        
+
+#if (BUTTONS4 == 1)        
+    buttons = (i >> 8) & 0x0F;   // value    0 ..  15, one bit per button     
+#endif        
+#if (BUTTONS8 == 1)        
+    buttons = (i >> 8) & 0xFF;   // value    0 .. 255, one bit per button     
+#endif        
+#if (BUTTONS32 == 1)        
+    tmp     = (i >> 8) & 0xFF;   // value    0 .. 255, one bit per button     
+    buttons =           (( tmp <<  0) & 0x000000FF);
+    buttons = buttons | ((~tmp <<  8) & 0x0000FF00);
+    buttons = buttons | (( tmp << 16) & 0x00FF0000);
+    buttons = buttons | ((~tmp << 24) & 0xFF000000);
+#endif        
+
+#if (HAT4 == 1)        
+    hat    = (i >> 8) & 0x03;   // value 0, 1, 2, 3 or 4 for neutral 
+#endif
+#if (HAT8 == 1)
+    hat    = (i >> 8) & 0x07;   // value 0..7 or 8 for neutral
+#endif        
+    i++;        
+        
+    x = cos((double)angle*3.14/180.0)*radius;  // value -127 .. 128
+    y = sin((double)angle*3.14/180.0)*radius;  // value -127 .. 128
+    angle += 3;        
+
+    joystick.update(throttle, rudder, x, y, buttons, hat);
+    wait(0.001);
+  }
+    
+  pc.printf("Bye World!\n\r");                           
+}
\ No newline at end of file

diff -r 000000000000 -r e43878690c0e mbed.bld
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Thu Jan 05 14:23:14 2017 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/9baf128c2fab
\ No newline at end of file