Adding a wiichuck server

madhephaestus · Mar 17, 2018 · 1fb3a9c · 1fb3a9c
1 parent 2a989c5
commit 1fb3a9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/examples/ControllerServer/ControllerServer.ino b/examples/ControllerServer/ControllerServer.ino
@@ -8,18 +8,16 @@
 const char *networkName = "RBE_Team_1";
 const char *networkPswd = "thisissecret";
 #define CONTROLLER_ID 2
-//Classic controller;
-Nunchuck nunchuck;
 void setup() {
-	//launchControllerServer(networkName, networkPswd,new WiiClassicServerEvent(&controller,CONTROLLER_ID));
-	launchControllerServer(networkName, networkPswd,new WiiChuckServerEvent(&nunchuck,CONTROLLER_ID));
+	//launchControllerServer(networkName, networkPswd,new WiiClassicServerEvent(CONTROLLER_ID));
+	launchControllerServer(networkName, networkPswd,new WiiChuckServerEvent(CONTROLLER_ID));
 
 }
 
 void loop() {
 	loopServer();
-	Serial.println("\n\n");
-	for(int i=0;i<60;i++){
-		Serial.println("Val "+String(i)+" = "+String( getControllerStatus()[i]));
-	}
+	//Serial.println("\n\n");
+	//for(int i=0;i<60;i++){
+	//	Serial.println("Val "+String(i)+" = "+String( getControllerStatus()[i]));
+	//}
 }
diff --git a/src/server/ServerStatus.h b/src/server/ServerStatus.h
@@ -7,6 +7,7 @@
 
 #ifndef LIBRARIES_ESPWII_SRC_SERVER_SERVERSTATUS_H_
 #define LIBRARIES_ESPWII_SRC_SERVER_SERVERSTATUS_H_
+#define WII_CLASSIC_SERVER 1970
 
 #include <stdint.h>
 

diff --git a/src/server/WiiChuckServer.h b/src/server/WiiChuckServer.h
@@ -5,8 +5,8 @@
  *      Author: hephaestus
  */
 
-#ifndef ESWPIISERV
-#define ESWPIISERV
+#ifndef ESWPIISERVCHUCK
+#define ESWPIISERVCHUCK
 #include <stdint.h>
 #include <stdio.h>
 #include <vector>
@@ -15,7 +15,6 @@
 #include <cmath>        // std::abs
 #include <WiiChuck.h>
 
-#define WII_CLASSIC_SERVER 1970
 #include "ServerStatus.h"
 
 class WiiChuckServerEvent: public PacketEventAbstract {