Moved files into /src and /extras folder

NicoHood · Nov 22, 2015 · cafd9c9 · cafd9c9
1 parent 9e7a9a6
commit cafd9c9
Show file tree

Hide file tree

Showing 30 changed files with 27 additions and 27 deletions.
diff --git a/readme.md → Readme.md b/readme.md → Readme.md
@@ -28,6 +28,7 @@ Controller mode means that your Arduino can act as controller.
 
 #####Todo:
 * N64 rumble -> example
+* N64 -> USB example
 
 Download
 ========

diff --git a/examples/N64/N64_Test/N64_Test.ino b/examples/N64/N64_Test/N64_Test.ino
@@ -4,7 +4,6 @@
 
  N64_Test example
  Enter any key into the serial monitor to start reading.
- Press A on the controller to enable rumble.
  */
 
 #include "Nintendo.h"

diff --git a/development/Gamecube.fzz → extras/Gamecube.fzz b/development/Gamecube.fzz → extras/Gamecube.fzz
diff --git a/...nt/Nintendo 64 Controller Information.htm → ...as/Nintendo 64 Controller Information.htm b/...nt/Nintendo 64 Controller Information.htm → ...as/Nintendo 64 Controller Information.htm
diff --git a/...ntroller Information_files/N64Cmd0x00.gif → ...ntroller Information_files/N64Cmd0x00.gif b/...ntroller Information_files/N64Cmd0x00.gif → ...ntroller Information_files/N64Cmd0x00.gif
diff --git a/...ntroller Information_files/N64Cmd0x01.gif → ...ntroller Information_files/N64Cmd0x01.gif b/...ntroller Information_files/N64Cmd0x01.gif → ...ntroller Information_files/N64Cmd0x01.gif
diff --git a/...r Information_files/N64ControllerBits.gif → ...r Information_files/N64ControllerBits.gif b/...r Information_files/N64ControllerBits.gif → ...r Information_files/N64ControllerBits.gif
diff --git a/...Controller Information_files/litechip.jpg → ...Controller Information_files/litechip.jpg b/...Controller Information_files/litechip.jpg → ...Controller Information_files/litechip.jpg
diff --git a/...64 Controller Information_files/n64-n.gif → ...64 Controller Information_files/n64-n.gif b/...64 Controller Information_files/n64-n.gif → ...64 Controller Information_files/n64-n.gif
diff --git a/...oller Information_files/n64controller.gif → ...oller Information_files/n64controller.gif b/...oller Information_files/n64controller.gif → ...oller Information_files/n64controller.gif
diff --git a/...roller Information_files/n64wireframe.gif → ...roller Information_files/n64wireframe.gif b/...roller Information_files/n64wireframe.gif → ...roller Information_files/n64wireframe.gif
diff --git a/... Controller Pinout-Dateien/gc-socket1.gif → ... Controller Pinout-Dateien/gc-socket1.gif b/... Controller Pinout-Dateien/gc-socket1.gif → ... Controller Pinout-Dateien/gc-socket1.gif
diff --git a/...cube Controller Pinout-Dateien/gcbits.jpg → ...cube Controller Pinout-Dateien/gcbits.jpg b/...cube Controller Pinout-Dateien/gcbits.jpg → ...cube Controller Pinout-Dateien/gcbits.jpg
diff --git a/...ontroller Pinout-Dateien/gcdata-small.jpg → ...ontroller Pinout-Dateien/gcdata-small.jpg b/...ontroller Pinout-Dateien/gcdata-small.jpg → ...ontroller Pinout-Dateien/gcdata-small.jpg
diff --git a/...ube Controller Pinout-Dateien/gcprobe.jpg → ...ube Controller Pinout-Dateien/gcprobe.jpg b/...ube Controller Pinout-Dateien/gcprobe.jpg → ...ube Controller Pinout-Dateien/gcprobe.jpg
diff --git a/...cube Controller Pinout-Dateien/timing.gif → ...cube Controller Pinout-Dateien/timing.gif b/...cube Controller Pinout-Dateien/timing.gif → ...cube Controller Pinout-Dateien/timing.gif
diff --git a/...t/Nintendo Gamecube Controller Pinout.htm → ...s/Nintendo Gamecube Controller Pinout.htm b/...t/Nintendo Gamecube Controller Pinout.htm → ...s/Nintendo Gamecube Controller Pinout.htm
diff --git a/...amecube Documentation-Dateien/techdoc.css → ...amecube Documentation-Dateien/techdoc.css b/...amecube Documentation-Dateien/techdoc.css → ...amecube Documentation-Dateien/techdoc.css
diff --git a/...nt/Yet Another Gamecube Documentation.htm → ...as/Yet Another Gamecube Documentation.htm b/...nt/Yet Another Gamecube Documentation.htm → ...as/Yet Another Gamecube Documentation.htm
diff --git a/...ment/gamecube_connector_socket_labels.jpg → extras/gamecube_connector_socket_labels.jpg b/...ment/gamecube_connector_socket_labels.jpg → extras/gamecube_connector_socket_labels.jpg
diff --git a/development/objdump.bat → extras/objdump.bat b/development/objdump.bat → extras/objdump.bat
diff --git a/development/plug.png → extras/plug.png b/development/plug.png → extras/plug.png
diff --git a/Gamecube.cpp → src/Gamecube.cpp b/Gamecube.cpp → src/Gamecube.cpp
diff --git a/Gamecube.h → src/Gamecube.h b/Gamecube.h → src/Gamecube.h
diff --git a/Gamecube_N64.cpp → src/Gamecube_N64.cpp b/Gamecube_N64.cpp → src/Gamecube_N64.cpp
diff --git a/Gamecube_N64.h → src/Gamecube_N64.h b/Gamecube_N64.h → src/Gamecube_N64.h
diff --git a/N64.cpp → src/N64.cpp b/N64.cpp → src/N64.cpp
diff --git a/N64.h → src/N64.h b/N64.h → src/N64.h
@@ -64,10 +64,10 @@ typedef union{
 	uint32_t whole32[];
 
 	struct{
-		uint8_t buttons0 : 4;
 		uint8_t dpad : 4;
-		uint8_t buttons1 : 4;
+		uint8_t buttons0 : 4;
 		uint8_t cpad : 4;
+		uint8_t buttons1 : 4;
 	};
 
 	struct {

diff --git a/Nintendo.cpp → src/Nintendo.cpp b/Nintendo.cpp → src/Nintendo.cpp
@@ -1,24 +1,24 @@
-/*
-Copyright (c) 2014-2015 NicoHood
-See the readme for credit to other people.
-
-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, including 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, INCLUDING 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 "Nintendo.h"
+/*
+Copyright (c) 2014-2015 NicoHood
+See the readme for credit to other people.
+
+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, including 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, INCLUDING 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 "Nintendo.h"
diff --git a/Nintendo.h → src/Nintendo.h b/Nintendo.h → src/Nintendo.h