From d2511df4a190d5c9b43d761a01ac4a6fa4ba54d1 Mon Sep 17 00:00:00 2001
From: Kristian Sloth Lauszus <lauszus@gmail.com>
Date: Thu, 16 Apr 2015 17:00:07 +0200
Subject: [PATCH] Move functions into .cpp file

---
 Wii.cpp | 29 ++++++++++++++++++++++++++---
 Wii.h   | 20 ++------------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Wii.cpp b/Wii.cpp
index d7b0b8c0..72c26113 100755
--- a/Wii.cpp
+++ b/Wii.cpp
@@ -880,8 +880,8 @@ void WII::Run() {
 
 /************************************************************/
 /*                    HID Commands                          */
-
 /************************************************************/
+
 void WII::HID_Command(uint8_t* data, uint8_t nbytes) {
         if(motionPlusInside)
                 pBtd->L2CAP_Command(hci_handle, data, nbytes, interrupt_scid[0], interrupt_scid[1]); // It's the new Wiimote with the Motion Plus Inside or Wii U Pro controller
@@ -982,8 +982,8 @@ void WII::statusRequest() {
 
 /************************************************************/
 /*                    Memmory Commands                      */
-
 /************************************************************/
+
 void WII::writeData(uint32_t offset, uint8_t size, uint8_t* data) {
         uint8_t cmd_buf[23];
         cmd_buf[0] = 0xA2; // HID BT DATA_request (0xA0) | Report Type (Output 0x02)
@@ -1077,7 +1077,6 @@ void WII::calibrateWiiBalanceBoard() {
 
 /************************************************************/
 /*                    WII Commands                          */
-
 /************************************************************/
 
 bool WII::getButtonPress(ButtonEnum b) { // Return true when a button is pressed
@@ -1129,6 +1128,30 @@ void WII::onInit() {
                 setLedStatus();
 }
 
+/************************************************************/
+/*                 Wii Balance Board Commands               */
+/************************************************************/
+
+float WII::getWeight(BalanceBoardEnum pos) {
+        // Based on: https://github.com/skorokithakis/gr8w8upd8m8/blob/master/gr8w8upd8m8.py
+        // calibration[pos][0] is calibration values for 0 kg
+        // calibration[pos][1] is calibration values for 17 kg
+        // calibration[pos][2] is calibration values for 34 kg
+        float val = 0;
+        if(balanceBoardRaw[pos] < balanceBoardCal[0][pos])
+            return val;
+        else if(balanceBoardRaw[pos] < balanceBoardCal[1][pos])
+            val = 17 * ((balanceBoardRaw[pos] - balanceBoardCal[0][pos]) / float((balanceBoardCal[1][pos] - balanceBoardCal[0][pos])));
+        else if(balanceBoardRaw[pos] > balanceBoardCal[1][pos])
+            val = 17 + 17 * ((balanceBoardRaw[pos] - balanceBoardCal[1][pos]) / float((balanceBoardCal[2][pos] - balanceBoardCal[1][pos])));
+
+        return val;
+};
+
+float WII::getTotalWeight() {
+        return getWeight(TopRight) + getWeight(BotRight) + getWeight(TopLeft) + getWeight(BotLeft);
+};
+
 /************************************************************/
 /*       The following functions are for the IR camera      */
 /************************************************************/
diff --git a/Wii.h b/Wii.h
index 91026469..3922aca8 100755
--- a/Wii.h
+++ b/Wii.h
@@ -278,29 +278,13 @@ public:
          * @param ::BalanceBoardEnum to read from.
          * @return Returns the weight in kg.
          */
-        float getWeight(BalanceBoardEnum pos) {
-                // Based on: https://github.com/skorokithakis/gr8w8upd8m8/blob/master/gr8w8upd8m8.py
-                // calibration[pos][0] is calibration values for 0 kg
-                // calibration[pos][1] is calibration values for 17 kg
-                // calibration[pos][2] is calibration values for 34 kg
-                float val = 0;
-                if(balanceBoardRaw[pos] < balanceBoardCal[0][pos])
-                    return val;
-                else if(balanceBoardRaw[pos] < balanceBoardCal[1][pos])
-                    val = 17 * ((balanceBoardRaw[pos] - balanceBoardCal[0][pos]) / float((balanceBoardCal[1][pos] - balanceBoardCal[0][pos])));
-                else if(balanceBoardRaw[pos] > balanceBoardCal[1][pos])
-                    val = 17 + 17 * ((balanceBoardRaw[pos] - balanceBoardCal[1][pos]) / float((balanceBoardCal[2][pos] - balanceBoardCal[1][pos])));
-
-                return val;
-        };
+        float getWeight(BalanceBoardEnum pos);
 
         /**
          * Used to get total weight on the Wii Balance Board.
          * @returnReturns the weight in kg.
          */
-        float getTotalWeight() {
-                return getWeight(TopRight) + getWeight(BotRight) + getWeight(TopLeft) + getWeight(BotLeft);
-        };
+        float getTotalWeight();
 
         /**
          * Used to get the raw reading at the specific position on the Wii Balance Board.