From 45c1297a9179c82d1047d20daaadc30a080b4f1d Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Wed, 2 Oct 2013 00:49:46 +0200 Subject: [PATCH] Removed all unnecessary includes since there is no need to do that anymore Also renamed all example extensions to .ino --- examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino | 16 +------------- .../USBHIDBootKbdAndMouse.ino | 2 +- ...SBHIDBootMouse.pde => USBHIDBootMouse.ino} | 14 +----------- .../HID/USBHIDJoystick/USBHIDJoystick.ino | 4 +--- .../HID/USBHIDJoystick/hidjoystickrptparser.h | 1 - .../{USBHID_desc.pde => USBHID_desc.ino} | 16 +------------- examples/HID/le3dp/le3dp.ino | 16 +------------- examples/HID/le3dp/le3dp_rptparser.h | 20 +---------------- examples/HID/scale/scale.ino | 16 +------------- examples/HID/scale/scale_rptparser.h | 22 ++----------------- examples/PS3USB/PS3USB.ino | 1 + .../USB_desc/{USB_desc.pde => USB_desc.ino} | 7 ------ examples/Xbox/XBOXRECV/XBOXRECV.ino | 1 + examples/Xbox/XBOXUSB/XBOXUSB.ino | 1 + .../{acm_terminal.pde => acm_terminal.ino} | 15 +------------ .../adk/ArduinoBlinkLED/ArduinoBlinkLED.ino | 2 -- .../{adk_barcode.pde => adk_barcode.ino} | 11 +--------- .../{demokit_20.pde => demokit_20.ino} | 15 +------------ .../{term_test.pde => term_test.ino} | 10 +-------- .../{term_time.pde => term_time.ino} | 10 +-------- examples/board_qc/board_qc.ino | 12 ---------- ...SBFTDILoopback.pde => USBFTDILoopback.ino} | 15 +------------ .../hub_demo/{hub_demo.pde => hub_demo.ino} | 7 ------ ..._terminal.pde => pl2303_gprs_terminal.ino} | 12 ---------- .../{pl2303_gps.pde => pl2303_gps.ino} | 12 ---------- ...{pl2303_tinygps.pde => pl2303_tinygps.ino} | 13 ----------- ..._terminal.pde => pl2303_xbee_terminal.ino} | 12 ---------- examples/testusbhostFAT/testusbhostFAT.ino | 0 28 files changed, 19 insertions(+), 264 deletions(-) rename examples/HID/USBHIDBootMouse/{USBHIDBootMouse.pde => USBHIDBootMouse.ino} (85%) rename examples/HID/USBHID_desc/{USBHID_desc.pde => USBHID_desc.ino} (83%) rename examples/USB_desc/{USB_desc.pde => USB_desc.ino} (98%) rename examples/acm/acm_terminal/{acm_terminal.pde => acm_terminal.ino} (89%) rename examples/adk/adk_barcode/{adk_barcode.pde => adk_barcode.ino} (91%) rename examples/adk/demokit_20/{demokit_20.pde => demokit_20.ino} (88%) rename examples/adk/term_test/{term_test.pde => term_test.ino} (88%) rename examples/adk/term_time/{term_time.pde => term_time.ino} (85%) rename examples/ftdi/USBFTDILoopback/{USBFTDILoopback.pde => USBFTDILoopback.ino} (89%) rename examples/hub_demo/{hub_demo.pde => hub_demo.ino} (98%) rename examples/pl2303/pl2303_gprs_terminal/{pl2303_gprs_terminal.pde => pl2303_gprs_terminal.ino} (89%) rename examples/pl2303/pl2303_gps/{pl2303_gps.pde => pl2303_gps.ino} (88%) rename examples/pl2303/pl2303_tinygps/{pl2303_tinygps.pde => pl2303_tinygps.ino} (96%) rename examples/pl2303/pl2303_xbee_terminal/{pl2303_xbee_terminal.pde => pl2303_xbee_terminal.ino} (91%) mode change 100755 => 100644 examples/testusbhostFAT/testusbhostFAT.ino diff --git a/examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino b/examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino index 3820eb5c..f990a1eb 100644 --- a/examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino +++ b/examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino @@ -1,19 +1,5 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include - -#include -#include -#include -#include +#include class KbdRptParser : public KeyboardReportParser { diff --git a/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino b/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino index 586d4132..cd136cb0 100644 --- a/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino +++ b/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino @@ -1,5 +1,5 @@ -#include #include +#include class MouseRptParser : public MouseReportParser { diff --git a/examples/HID/USBHIDBootMouse/USBHIDBootMouse.pde b/examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino similarity index 85% rename from examples/HID/USBHIDBootMouse/USBHIDBootMouse.pde rename to examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino index 2227a29b..decf15df 100644 --- a/examples/HID/USBHIDBootMouse/USBHIDBootMouse.pde +++ b/examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino @@ -1,17 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include class MouseRptParser : public MouseReportParser { diff --git a/examples/HID/USBHIDJoystick/USBHIDJoystick.ino b/examples/HID/USBHIDJoystick/USBHIDJoystick.ino index 79497b52..b8160635 100644 --- a/examples/HID/USBHIDJoystick/USBHIDJoystick.ino +++ b/examples/HID/USBHIDJoystick/USBHIDJoystick.ino @@ -1,11 +1,9 @@ - -#include #include #include +#include #include "hidjoystickrptparser.h" - USB Usb; USBHub Hub(&Usb); HIDUniversal Hid(&Usb); diff --git a/examples/HID/USBHIDJoystick/hidjoystickrptparser.h b/examples/HID/USBHIDJoystick/hidjoystickrptparser.h index 028d6c89..733b8f8d 100644 --- a/examples/HID/USBHIDJoystick/hidjoystickrptparser.h +++ b/examples/HID/USBHIDJoystick/hidjoystickrptparser.h @@ -1,7 +1,6 @@ #if !defined(__HIDJOYSTICKRPTPARSER_H__) #define __HIDJOYSTICKRPTPARSER_H__ -#include #include struct GamePadEventData { diff --git a/examples/HID/USBHID_desc/USBHID_desc.pde b/examples/HID/USBHID_desc/USBHID_desc.ino similarity index 83% rename from examples/HID/USBHID_desc/USBHID_desc.pde rename to examples/HID/USBHID_desc/USBHID_desc.ino index 0870d077..d7510c5f 100644 --- a/examples/HID/USBHID_desc/USBHID_desc.pde +++ b/examples/HID/USBHID_desc/USBHID_desc.ino @@ -1,21 +1,7 @@ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include +#include #include "pgmstrings.h" diff --git a/examples/HID/le3dp/le3dp.ino b/examples/HID/le3dp/le3dp.ino index b52bb28d..4414f60c 100644 --- a/examples/HID/le3dp/le3dp.ino +++ b/examples/HID/le3dp/le3dp.ino @@ -1,25 +1,11 @@ /* Simplified Logitech Extreme 3D Pro Joystick Report Parser */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include #include "le3dp_rptparser.h" -#include -#include -#include -#include - USB Usb; USBHub Hub(&Usb); HIDUniversal Hid(&Usb); diff --git a/examples/HID/le3dp/le3dp_rptparser.h b/examples/HID/le3dp/le3dp_rptparser.h index dfb89271..2400364e 100644 --- a/examples/HID/le3dp/le3dp_rptparser.h +++ b/examples/HID/le3dp/le3dp_rptparser.h @@ -1,25 +1,7 @@ #if !defined(__HIDJOYSTICKRPTPARSER_H__) #define __HIDJOYSTICKRPTPARSER_H__ -#include -#include -#include "avrpins.h" -#include "max3421e.h" -#include "usbhost.h" -#include "usb_ch9.h" -#include "Usb.h" - -#if defined(ARDUINO) && ARDUINO >=100 -#include "Arduino.h" -#else -#include -#endif - -#include "printhex.h" -#include "hexdump.h" -#include "message.h" -#include "confdescparser.h" -#include "hid.h" +#include struct GamePadEventData { diff --git a/examples/HID/scale/scale.ino b/examples/HID/scale/scale.ino index dcc8ded8..a88e7196 100644 --- a/examples/HID/scale/scale.ino +++ b/examples/HID/scale/scale.ino @@ -1,26 +1,12 @@ /* Digital Scale Output. Written for Stamps.com Model 510 */ /* 5lb Digital Scale; any HID scale with Usage page 0x8d should work */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include #include "scale_rptparser.h" -#include -#include -#include -#include - USB Usb; USBHub Hub(&Usb); HIDUniversal Hid(&Usb); diff --git a/examples/HID/scale/scale_rptparser.h b/examples/HID/scale/scale_rptparser.h index 277ea66e..db69e656 100644 --- a/examples/HID/scale/scale_rptparser.h +++ b/examples/HID/scale/scale_rptparser.h @@ -1,26 +1,8 @@ #if !defined(__SCALERPTPARSER_H__) #define __SCALERPTPARSER_H__ -#include -#include -#include "avrpins.h" -#include "max3421e.h" -#include "usbhost.h" -#include "usb_ch9.h" -#include "Usb.h" -#include "Max_LCD.h" - -#if defined(ARDUINO) && ARDUINO >=100 -#include "Arduino.h" -#else -#include -#endif - -#include "printhex.h" -#include "hexdump.h" -#include "message.h" -#include "confdescparser.h" -#include "hid.h" +#include +#include /* Scale status constants */ #define REPORT_FAULT 0x01 diff --git a/examples/PS3USB/PS3USB.ino b/examples/PS3USB/PS3USB.ino index c4f32187..65569187 100644 --- a/examples/PS3USB/PS3USB.ino +++ b/examples/PS3USB/PS3USB.ino @@ -5,6 +5,7 @@ */ #include + USB Usb; /* You can create the instance of the class in two ways */ PS3USB PS3(&Usb); // This will just create the instance diff --git a/examples/USB_desc/USB_desc.pde b/examples/USB_desc/USB_desc.ino similarity index 98% rename from examples/USB_desc/USB_desc.pde rename to examples/USB_desc/USB_desc.ino index 770e421c..75fbaa25 100644 --- a/examples/USB_desc/USB_desc.pde +++ b/examples/USB_desc/USB_desc.ino @@ -1,11 +1,4 @@ -#include -#include -#include -#include -#include #include -#include -#include #include "pgmstrings.h" diff --git a/examples/Xbox/XBOXRECV/XBOXRECV.ino b/examples/Xbox/XBOXRECV/XBOXRECV.ino index 8490800f..eb98e19a 100644 --- a/examples/Xbox/XBOXRECV/XBOXRECV.ino +++ b/examples/Xbox/XBOXRECV/XBOXRECV.ino @@ -6,6 +6,7 @@ */ #include + USB Usb; XBOXRECV Xbox(&Usb); diff --git a/examples/Xbox/XBOXUSB/XBOXUSB.ino b/examples/Xbox/XBOXUSB/XBOXUSB.ino index 2f209ce3..f78d1d06 100644 --- a/examples/Xbox/XBOXUSB/XBOXUSB.ino +++ b/examples/Xbox/XBOXUSB/XBOXUSB.ino @@ -5,6 +5,7 @@ */ #include + USB Usb; XBOXUSB Xbox(&Usb); diff --git a/examples/acm/acm_terminal/acm_terminal.pde b/examples/acm/acm_terminal/acm_terminal.ino similarity index 89% rename from examples/acm/acm_terminal/acm_terminal.pde rename to examples/acm/acm_terminal/acm_terminal.ino index a60115c6..782a51a4 100644 --- a/examples/acm/acm_terminal/acm_terminal.pde +++ b/examples/acm/acm_terminal/acm_terminal.ino @@ -1,18 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include - #include - -#include -#include -#include -#include +#include #include "pgmstrings.h" diff --git a/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino b/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino index 5a1e38e5..14f29b38 100644 --- a/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino +++ b/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino @@ -1,7 +1,5 @@ // The source for the Android application can be found at the following link: https://github.com/Lauszus/ArduinoBlinkLED // The code for the Android application is heavily based on this guide: http://allaboutee.com/2011/12/31/arduino-adk-board-blink-an-led-with-your-phone-code-and-explanation/ by Miguel - -#include #include USB Usb; diff --git a/examples/adk/adk_barcode/adk_barcode.pde b/examples/adk/adk_barcode/adk_barcode.ino similarity index 91% rename from examples/adk/adk_barcode/adk_barcode.pde rename to examples/adk/adk_barcode/adk_barcode.ino index 02d68728..481d35b6 100644 --- a/examples/adk/adk_barcode/adk_barcode.pde +++ b/examples/adk/adk_barcode/adk_barcode.ino @@ -1,18 +1,9 @@ /**/ /* A sketch demonstrating data exchange between two USB devices - a HID barcode scanner and ADK-compatible Android phone */ /**/ -#include -#include -#include -#include -#include -#include -#include -#include - #include - #include +#include USB Usb; USBHub Hub1(&Usb); diff --git a/examples/adk/demokit_20/demokit_20.pde b/examples/adk/demokit_20/demokit_20.ino similarity index 88% rename from examples/adk/demokit_20/demokit_20.pde rename to examples/adk/demokit_20/demokit_20.ino index b1f47294..a92097c6 100644 --- a/examples/adk/demokit_20/demokit_20.pde +++ b/examples/adk/demokit_20/demokit_20.ino @@ -1,18 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include - #include - -#include -#include -#include -#include +#include USB Usb; USBHub hub0(&Usb); diff --git a/examples/adk/term_test/term_test.pde b/examples/adk/term_test/term_test.ino similarity index 88% rename from examples/adk/term_test/term_test.pde rename to examples/adk/term_test/term_test.ino index fa863337..492dfb15 100644 --- a/examples/adk/term_test/term_test.pde +++ b/examples/adk/term_test/term_test.ino @@ -1,13 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include - #include +#include USB Usb; //USBHub Hub(&Usb); diff --git a/examples/adk/term_time/term_time.pde b/examples/adk/term_time/term_time.ino similarity index 85% rename from examples/adk/term_time/term_time.pde rename to examples/adk/term_time/term_time.ino index 071d5c6b..c9657561 100644 --- a/examples/adk/term_time/term_time.pde +++ b/examples/adk/term_time/term_time.ino @@ -1,13 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include - #include +#include USB Usb; diff --git a/examples/board_qc/board_qc.ino b/examples/board_qc/board_qc.ino index b99d6a31..71e14f82 100644 --- a/examples/board_qc/board_qc.ino +++ b/examples/board_qc/board_qc.ino @@ -3,19 +3,7 @@ /* for GPIO test to pass you need to connect GPIN0 to GPOUT7, GPIN1 to GPOUT6, etc. */ /* otherwise press any key after getting GPIO error to complete the test */ /**/ -#include -#include -#include -#include -#include #include -#include -#include - -#include -#include -#include -#include /* variables */ uint8_t rcode; diff --git a/examples/ftdi/USBFTDILoopback/USBFTDILoopback.pde b/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino similarity index 89% rename from examples/ftdi/USBFTDILoopback/USBFTDILoopback.pde rename to examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino index 8e305754..27dc1df6 100644 --- a/examples/ftdi/USBFTDILoopback/USBFTDILoopback.pde +++ b/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino @@ -1,18 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include - #include - -#include -#include -#include -#include +#include #include "pgmstrings.h" diff --git a/examples/hub_demo/hub_demo.pde b/examples/hub_demo/hub_demo.ino similarity index 98% rename from examples/hub_demo/hub_demo.pde rename to examples/hub_demo/hub_demo.ino index 0a8665ba..10078b95 100644 --- a/examples/hub_demo/hub_demo.pde +++ b/examples/hub_demo/hub_demo.ino @@ -1,11 +1,4 @@ -#include -#include -#include -#include -#include #include -#include -#include #include "pgmstrings.h" USB Usb; diff --git a/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.pde b/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino similarity index 89% rename from examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.pde rename to examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino index d6ce279a..97718214 100644 --- a/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.pde +++ b/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino @@ -1,21 +1,9 @@ /* Arduino terminal for PL2303 USB to serial converter and DealeXtreme GPRS modem. */ /* USB support */ -#include -#include -#include -#include -#include #include -#include -#include /* CDC support */ #include #include -/* Debug support */ -#include -#include -#include -#include class PLAsyncOper : public CDCAsyncOper { diff --git a/examples/pl2303/pl2303_gps/pl2303_gps.pde b/examples/pl2303/pl2303_gps/pl2303_gps.ino similarity index 88% rename from examples/pl2303/pl2303_gps/pl2303_gps.pde rename to examples/pl2303/pl2303_gps/pl2303_gps.ino index 8cf26fd5..5c8548fc 100644 --- a/examples/pl2303/pl2303_gps/pl2303_gps.pde +++ b/examples/pl2303/pl2303_gps/pl2303_gps.ino @@ -1,22 +1,10 @@ /* USB Host to PL2303-based USB GPS unit interface */ /* Navibee GM720 receiver - Sirf Star III */ /* USB support */ -#include -#include -#include -#include -#include #include -#include -#include /* CDC support */ #include #include -/* Debug support */ -#include -#include -#include -#include class PLAsyncOper : public CDCAsyncOper { diff --git a/examples/pl2303/pl2303_tinygps/pl2303_tinygps.pde b/examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino similarity index 96% rename from examples/pl2303/pl2303_tinygps/pl2303_tinygps.pde rename to examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino index 85798192..6724141c 100644 --- a/examples/pl2303/pl2303_tinygps/pl2303_tinygps.pde +++ b/examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino @@ -4,25 +4,12 @@ /* test_with_gps_device library example modified for PL2302 access */ /* USB support */ -#include -#include -#include -#include -#include #include -#include -#include /* CDC support */ #include #include -/* Debug support */ -#include -#include -#include -#include - #include /* This sample code demonstrates the normal use of a TinyGPS object. diff --git a/examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.pde b/examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino similarity index 91% rename from examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.pde rename to examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino index 1cf3ac57..741a2f2c 100644 --- a/examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.pde +++ b/examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino @@ -1,22 +1,10 @@ /* Arduino terminal for PL2303 USB to serial converter and XBee radio. */ /* Inserts linefeed after carriage return in data sent to and received from Xbee */ /* USB support */ -#include -#include -#include -#include -#include #include -#include -#include /* CDC support */ #include #include -/* Debug support */ -#include -#include -#include -#include class PLAsyncOper : public CDCAsyncOper { diff --git a/examples/testusbhostFAT/testusbhostFAT.ino b/examples/testusbhostFAT/testusbhostFAT.ino old mode 100755 new mode 100644