From e0b9ea89cb8daf11442f38d2cfb615bf8a155956 Mon Sep 17 00:00:00 2001 From: Oleg Mazurov Date: Wed, 18 Dec 2013 15:04:13 -0700 Subject: [PATCH 1/4] dec18 --- examples/testusbhostFAT/Arduino_Makefile_master | 2 +- examples/testusbhostFAT/generic_storage | 2 +- examples/testusbhostFAT/xmem2 | 2 +- settings.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/testusbhostFAT/Arduino_Makefile_master b/examples/testusbhostFAT/Arduino_Makefile_master index 7f1fe2f8..f379bae0 160000 --- a/examples/testusbhostFAT/Arduino_Makefile_master +++ b/examples/testusbhostFAT/Arduino_Makefile_master @@ -1 +1 @@ -Subproject commit 7f1fe2f8ec3db4d1bd0a5c516dd379e2539d1303 +Subproject commit f379bae02aa3d9c3da558ba2041558b88db95bbb diff --git a/examples/testusbhostFAT/generic_storage b/examples/testusbhostFAT/generic_storage index db5de2fe..071b65b9 160000 --- a/examples/testusbhostFAT/generic_storage +++ b/examples/testusbhostFAT/generic_storage @@ -1 +1 @@ -Subproject commit db5de2fe3c2e0d2d96de98864b1b6e00e172f727 +Subproject commit 071b65b923b2656bb1e1b622de5272b4ed9a4996 diff --git a/examples/testusbhostFAT/xmem2 b/examples/testusbhostFAT/xmem2 index 16374f68..8bcf5f90 160000 --- a/examples/testusbhostFAT/xmem2 +++ b/examples/testusbhostFAT/xmem2 @@ -1 +1 @@ -Subproject commit 16374f681b31d411661b7bd9ff5e578b2dff6843 +Subproject commit 8bcf5f90f8bd967378b6eeebd7fd943f125fbc18 diff --git a/settings.h b/settings.h index add3ee03..e47b1c43 100644 --- a/settings.h +++ b/settings.h @@ -14,7 +14,7 @@ //////////////////////////////////////////////////////////////////////////////// /* Set this to 1 to activate serial debugging */ -#define ENABLE_UHS_DEBUGGING 0 +#define ENABLE_UHS_DEBUGGING 1 /* This can be used to select which serial port to use for debugging if * multiple serial ports are available. From d35b83e5a536499d52cd33c27ba610847066bf3d Mon Sep 17 00:00:00 2001 From: Kristian Lauszus Date: Tue, 19 Aug 2014 22:57:18 -0700 Subject: [PATCH 2/4] Support new revision of Balanduino PCB --- avrpins.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/avrpins.h b/avrpins.h index c59e9c52..da80349d 100644 --- a/avrpins.h +++ b/avrpins.h @@ -672,10 +672,19 @@ public: // http://balanduino.net/ #define P0 Pd0 /* 0 - PD0 */ #define P1 Pd1 /* 1 - PD1 */ -#define P2 Pb2 /* 2 - PB2 */ -#define P3 Pd6 /* 3 - PD6 */ -#define P4 Pd7 /* 4 - PD7 */ -#define P5 Pb3 /* 5 - PB3 */ + +#if BALANDUINO_REVISION < 13 + #define P2 Pb2 /* 2 - PB2 */ + #define P3 Pd6 /* 3 - PD6 */ + #define P4 Pd7 /* 4 - PD7 */ + #define P5 Pb3 /* 5 - PB3 */ +#else + #define P2 Pd2 /* 2 - PD2 */ + #define P3 Pd3 /* 3 - PD3 */ + #define P4 Pd6 /* 4 - PD6 */ + #define P5 Pd7 /* 5 - PD7 */ +#endif + #define P6 Pb4 /* 6 - PB4 */ #define P7 Pa0 /* 7 - PA0 */ #define P8 Pa1 /* 8 - PA1 */ @@ -685,8 +694,15 @@ public: #define P12 Pa5 /* 12 - PA5 */ #define P13 Pc1 /* 13 - PC1 */ #define P14 Pc0 /* 14 - PC0 */ -#define P15 Pd2 /* 15 - PD2 */ -#define P16 Pd3 /* 16 - PD3 */ + +#if BALANDUINO_REVISION < 13 + #define P15 Pd2 /* 15 - PD2 */ + #define P16 Pd3 /* 16 - PD3 */ +#else + #define P15 Pb2 /* 15 - PB2 */ + #define P16 Pb3 /* 16 - PB2 */ +#endif + #define P17 Pd4 /* 17 - PD4 */ #define P18 Pd5 /* 18 - PD5 */ #define P19 Pc2 /* 19 - PC2 */ From 8cf054cd616603551864cca7f97dce041f0b6a70 Mon Sep 17 00:00:00 2001 From: Kristian Lauszus Date: Sun, 24 Aug 2014 00:37:46 -0700 Subject: [PATCH 3/4] Disable debugging again and updated submodules --- examples/testusbhostFAT/Arduino_Makefile_master | 2 +- examples/testusbhostFAT/generic_storage | 2 +- examples/testusbhostFAT/xmem2 | 2 +- settings.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/testusbhostFAT/Arduino_Makefile_master b/examples/testusbhostFAT/Arduino_Makefile_master index f379bae0..7ada91a9 160000 --- a/examples/testusbhostFAT/Arduino_Makefile_master +++ b/examples/testusbhostFAT/Arduino_Makefile_master @@ -1 +1 @@ -Subproject commit f379bae02aa3d9c3da558ba2041558b88db95bbb +Subproject commit 7ada91a90027ccb7558b74087fb68d3940ecf64d diff --git a/examples/testusbhostFAT/generic_storage b/examples/testusbhostFAT/generic_storage index 071b65b9..72b5bf46 160000 --- a/examples/testusbhostFAT/generic_storage +++ b/examples/testusbhostFAT/generic_storage @@ -1 +1 @@ -Subproject commit 071b65b923b2656bb1e1b622de5272b4ed9a4996 +Subproject commit 72b5bf467a1c2479ba7354ee4d864e382c167425 diff --git a/examples/testusbhostFAT/xmem2 b/examples/testusbhostFAT/xmem2 index 8bcf5f90..2bf8f633 160000 --- a/examples/testusbhostFAT/xmem2 +++ b/examples/testusbhostFAT/xmem2 @@ -1 +1 @@ -Subproject commit 8bcf5f90f8bd967378b6eeebd7fd943f125fbc18 +Subproject commit 2bf8f633e7f9bc5a7bf4c00f3f45c7b79484198e diff --git a/settings.h b/settings.h index 3ab12541..e3d0ed1d 100644 --- a/settings.h +++ b/settings.h @@ -24,7 +24,7 @@ e-mail : support@circuitsathome.com //////////////////////////////////////////////////////////////////////////////// /* Set this to 1 to activate serial debugging */ -#define ENABLE_UHS_DEBUGGING 1 +#define ENABLE_UHS_DEBUGGING 0 /* This can be used to select which serial port to use for debugging if * multiple serial ports are available. From 980109f756f46c7b632af591d207a81ca1ac12a4 Mon Sep 17 00:00:00 2001 From: Kristian Lauszus Date: Sun, 24 Aug 2014 17:26:49 -0700 Subject: [PATCH 4/4] Disable some of the functions in PS3BT and Wii library examples so it always compile on Arduino Uno --- examples/Bluetooth/PS3BT/PS3BT.ino | 4 ++++ examples/Bluetooth/Wii/Wii.ino | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/Bluetooth/PS3BT/PS3BT.ino b/examples/Bluetooth/PS3BT/PS3BT.ino index 982eb384..2878b504 100644 --- a/examples/Bluetooth/PS3BT/PS3BT.ino +++ b/examples/Bluetooth/PS3BT/PS3BT.ino @@ -118,13 +118,16 @@ void loop() { printAngle = !printAngle; } } +#if 0 // Set this to 1 in order to see the angle of the controller if (printAngle) { Serial.print(F("\r\nPitch: ")); Serial.print(PS3.getAngle(Pitch)); Serial.print(F("\tRoll: ")); Serial.print(PS3.getAngle(Roll)); } +#endif } +#if 0 // Set this to 1 in order to enable support for the Playstation Move controller else if (PS3.PS3MoveConnected) { if (PS3.getAnalogButton(T)) { Serial.print(F("\r\nT: ")); @@ -177,4 +180,5 @@ void loop() { Serial.print(PS3.getTemperature()); } } +#endif } diff --git a/examples/Bluetooth/Wii/Wii.ino b/examples/Bluetooth/Wii/Wii.ino index f4d68a62..bbd5dc03 100644 --- a/examples/Bluetooth/Wii/Wii.ino +++ b/examples/Bluetooth/Wii/Wii.ino @@ -78,6 +78,7 @@ void loop() { Serial.print(F("\r\nB")); } } +#if 0 // Set this to 1 in order to see the angle of the controllers if (printAngle) { Serial.print(F("\r\nPitch: ")); Serial.print(Wii.getPitch()); @@ -94,7 +95,9 @@ void loop() { Serial.print(Wii.getNunchuckRoll()); } } +#endif } +#if 0 // Set this to 1 if you are using a Nunchuck controller if (Wii.nunchuckConnected) { if (Wii.getButtonClick(Z)) Serial.print(F("\r\nZ")); @@ -107,4 +110,5 @@ void loop() { Serial.print(Wii.getAnalogHat(HatY)); } } +#endif }