Fix example, and reformat

examples/HID/USBHIDJoystick/Makefile

@@ -0,0 +1,30 @@
+#
+# These are set for a mega 1280 + quadram plus my serial patch.
+# If you lack quadram, or want to disable LFN, just change _FS_TINY=1 _USE_LFN=0
+#
+# If your board is a mega 2560 uncomment the following two lines
+# BOARD = mega2560
+# PROGRAMMER = wiring
+# ...and then comment out the following two lines
+BOARD = mega
+PROGRAMMER = arduino
+
+# set your Arduino tty port here
+PORT = /dev/ttyUSB0
+
+
+# uncomment the next line to enable debugging
+#EXTRA_FLAGS += -D DEBUG_USB_HOST=1
+
+#
+# Advanced debug on Serial3
+#
+
+# uncomment the next line to enable debug on Serial3
+#EXTRA_FLAGS += -D USB_HOST_SERIAL=Serial3
+
+# The following are the libraries used.
+LIB_DIRS =
+LIB_DIRS += ../libraries/USB_Host_Shield_2_0
+# And finally, the part that brings everything together for you.
+include ../Arduino_Makefile_master/_Makefile.master

examples/HID/USBHIDJoystick/USBHIDJoystick.ino

@@ -1,23 +1,10 @@
 
-#include <avr/pgmspace.h>
-
-#include <avrpins.h>
-#include <max3421e.h>
-#include <usbhost.h>
-#include <usb_ch9.h>
-#include <Usb.h>
 #include <usbhub.h>
-#include <avr/pgmspace.h>
-#include <address.h>
 #include <hid.h>
 #include <hiduniversal.h>
 
 #include "hidjoystickrptparser.h"
 
-#include <printhex.h>
-#include <message.h>
-#include <hexdump.h>
-#include <parsetools.h>
 
 USB Usb;
 USBHub Hub(&Usb);
@@ -25,8 +12,7 @@ HIDUniversal                                    Hid(&Usb);
 JoystickEvents JoyEvents;
 JoystickReportParser Joy(&JoyEvents);
 
-void setup()
+void setup() {
-{
         Serial.begin(115200);
         Serial.println("Start");
 
@@ -39,8 +25,7 @@ void setup()
                 ErrorMessage<uint8_t > (PSTR("SetReportParser"), 1);
 }
 
-void loop()
+void loop() {
-{
         Usb.Task();
 }
 

examples/HID/USBHIDJoystick/hidjoystickrptparser.cpp

@@ -3,27 +3,23 @@
 JoystickReportParser::JoystickReportParser(JoystickEvents *evt) :
 joyEvents(evt),
 oldHat(0xDE),
-	oldButtons(0)
+oldButtons(0) {
-{
         for (uint8_t i = 0; i < RPT_GEMEPAD_LEN; i++)
                 oldPad[i] = 0xD;
 }
 
-void JoystickReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
+void JoystickReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
-{
         bool match = true;
 
         // Checking if there are changes in report since the method was last called
         for (uint8_t i = 0; i < RPT_GEMEPAD_LEN; i++)
-		if (buf[i] != oldPad[i])
+                if (buf[i] != oldPad[i]) {
-		{
                         match = false;
                         break;
                 }
 
         // Calling Game Pad event handler
-	if (!match && joyEvents)
+        if (!match && joyEvents) {
-	{
                 joyEvents->OnGamePadChanged((const GamePadEventData*)buf);
 
                 for (uint8_t i = 0; i < RPT_GEMEPAD_LEN; i++) oldPad[i] = buf[i];
@@ -32,8 +28,7 @@ void JoystickReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t
         uint8_t hat = (buf[5] & 0xF);
 
         // Calling Hat Switch event handler
-	if (hat != oldHat && joyEvents)
+        if (hat != oldHat && joyEvents) {
-	{
                 joyEvents->OnHatSwitch(hat);
                 oldHat = hat;
         }
@@ -44,10 +39,8 @@ void JoystickReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t
         uint16_t changes = (buttons ^ oldButtons);
 
         // Calling Button Event Handler for every button changed
-	if (changes)
+        if (changes) {
-	{
+                for (uint8_t i = 0; i < 0x0C; i++) {
-		for (uint8_t i=0; i<0x0C; i++)
-		{
                         uint16_t mask = (0x0001 << i);
 
                         if (((mask & changes) > 0) && joyEvents)
@@ -60,36 +53,32 @@ void JoystickReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t
         }
 }
 
-void JoystickEvents::OnGamePadChanged(const GamePadEventData *evt)
+void JoystickEvents::OnGamePadChanged(const GamePadEventData *evt) {
-{
+        Serial.print("X1: ");
-	Serial.print("X: ");
         PrintHex<uint8_t > (evt->X, 0x80);
-	Serial.print("\tY: ");
+        Serial.print("\tY1: ");
         PrintHex<uint8_t > (evt->Y, 0x80);
-	Serial.print("\tZ: ");
+        Serial.print("\tX2: ");
         PrintHex<uint8_t > (evt->Z1, 0x80);
-	Serial.print("\tZ: ");
+        Serial.print("\tY2: ");
         PrintHex<uint8_t > (evt->Z2, 0x80);
         Serial.print("\tRz: ");
         PrintHex<uint8_t > (evt->Rz, 0x80);
         Serial.println("");
 }
 
-void JoystickEvents::OnHatSwitch(uint8_t hat)
+void JoystickEvents::OnHatSwitch(uint8_t hat) {
-{
         Serial.print("Hat Switch: ");
         PrintHex<uint8_t > (hat, 0x80);
         Serial.println("");
 }
 
-void JoystickEvents::OnButtonUp(uint8_t but_id)
+void JoystickEvents::OnButtonUp(uint8_t but_id) {
-{
         Serial.print("Up: ");
         Serial.println(but_id, DEC);
 }
 
-void JoystickEvents::OnButtonDn(uint8_t but_id)
+void JoystickEvents::OnButtonDn(uint8_t but_id) {
-{
         Serial.print("Dn: ");
         Serial.println(but_id, DEC);
 }

examples/HID/USBHIDJoystick/hidjoystickrptparser.h

@@ -1,33 +1,14 @@
 #if !defined(__HIDJOYSTICKRPTPARSER_H__)
 #define __HIDJOYSTICKRPTPARSER_H__
 
-#include <inttypes.h>
+#include <Usb.h>
-#include <avr/pgmspace.h>
+#include <hid.h>
-#include "avrpins.h"
-#include "max3421e.h"
-#include "usbhost.h"
-#include "usb_ch9.h"
-#include "Usb.h"
 
-#if defined(ARDUINO) && ARDUINO >=100
+struct GamePadEventData {
-#include "Arduino.h"
-#else
-#include <WProgram.h>
-#endif
-
-#include "printhex.h"
-#include "hexdump.h"
-#include "message.h"
-#include "confdescparser.h"
-#include "hid.h"
-
-struct GamePadEventData
-{
         uint8_t X, Y, Z1, Z2, Rz;
 };
 
-class JoystickEvents
+class JoystickEvents {
-{
 public:
         virtual void OnGamePadChanged(const GamePadEventData *evt);
         virtual void OnHatSwitch(uint8_t hat);
@@ -37,8 +18,7 @@ public:
 
 #define RPT_GEMEPAD_LEN		5
 
-class JoystickReportParser : public HIDReportParser
+class JoystickReportParser : public HIDReportParser {
-{
         JoystickEvents *joyEvents;
 
         uint8_t oldPad[RPT_GEMEPAD_LEN];

examples/HID/USBHIDJoystick/nbproject/Package-Default.bash

@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=AVR-Linux-x86
+CND_CONF=Default
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=MissingOutputInProject
+OUTPUT_BASENAME=MissingOutputInProject
+PACKAGE_TOP_DIR=USBHIDJoystick/
+
+# Functions
+function checkReturnCode
+{
+    rc=$?
+    if [ $rc != 0 ]
+    then
+        exit $rc
+    fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+    mkdir -p "$1"
+    checkReturnCode
+    if [ "$2" != "" ]
+    then
+      chmod $2 "$1"
+      checkReturnCode
+    fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+    cp "$1" "$2"
+    checkReturnCode
+    if [ "$3" != "" ]
+    then
+        chmod $3 "$2"
+        checkReturnCode
+    fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/USBHIDJoystick"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/USBHIDJoystick.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/USBHIDJoystick.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}

examples/HID/USBHIDJoystick/nbproject/configurations.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="80">
+  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
+    <df name="USBHIDJoystick" root=".">
+      <df name="build">
+        <in>CDC.lst</in>
+        <in>HID.lst</in>
+        <in>HardwareSerial.lst</in>
+        <in>IPAddress.lst</in>
+        <in>Print.lst</in>
+        <in>Stream.lst</in>
+        <in>Tone.lst</in>
+        <in>USBCore.lst</in>
+        <in>WInterrupts.lst</in>
+        <in>WMath.lst</in>
+        <in>WString.lst</in>
+        <in>wiring.lst</in>
+        <in>wiring_analog.lst</in>
+        <in>wiring_digital.lst</in>
+        <in>wiring_pulse.lst</in>
+        <in>wiring_shift.lst</in>
+      </df>
+      <in>USBHIDJoystick.ino</in>
+      <in>hidjoystickrptparser.cpp</in>
+      <in>hidjoystickrptparser.h</in>
+    </df>
+    <logicalFolder name="ExternalFiles"
+                   displayName="Important Files"
+                   projectFiles="false"
+                   kind="IMPORTANT_FILES_FOLDER">
+      <itemPath>Makefile</itemPath>
+    </logicalFolder>
+  </logicalFolder>
+  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
+  <sourceRootList>
+    <Elem>.</Elem>
+  </sourceRootList>
+  <projectmakefile>Makefile</projectmakefile>
+  <confs>
+    <conf name="Default" type="0">
+      <toolsSet>
+        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
+        <compilerSet>default</compilerSet>
+      </toolsSet>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>.</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile</buildCommand>
+          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+          <executablePath></executablePath>
+        </makeTool>
+      </makefileType>
+    </conf>
+  </confs>
+</configurationDescriptor>

examples/HID/USBHIDJoystick/nbproject/project.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.cnd.makeproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/make-project/1">
+            <name>USBHIDJoystick</name>
+            <c-extensions/>
+            <cpp-extensions>cpp,ino</cpp-extensions>
+            <header-extensions>h</header-extensions>
+            <sourceEncoding>UTF-8</sourceEncoding>
+            <make-dep-projects/>
+            <sourceRootList>
+                <sourceRootElem>.</sourceRootElem>
+            </sourceRootList>
+            <confList>
+                <confElem>
+                    <name>Default</name>
+                    <type>0</type>
+                </confElem>
+            </confList>
+        </data>
+    </configuration>
+</project>