specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Changed some variable names and simplified the way the weight is calculated

Browse source 
There was actually a bug, as it will return 0 if wiiBalanceBoardRaw[pos] is exactly the same as wiiBalanceBoardCal[1][pos]
This commit is contained in:
Kristian Sloth Lauszus 2015-04-16 19:45:03 +02:00
parent d2511df4a1
commit 7334f7e9a4
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Wii.cpp
View file

@ -399,11 +399,11 @@ void WII::ACLData(uint8_t* l2capinbuf) {
else if(l2capinbuf[13] == 0x00 && l2capinbuf[14] == 0x24 && reportLength == 16) { // First 16-bit else if(l2capinbuf[13] == 0x00 && l2capinbuf[14] == 0x24 && reportLength == 16) { // First 16-bit
for(uint8_t i = 0; i < 2; i++) { for(uint8_t i = 0; i < 2; i++) {
for(uint8_t j = 0; j < 4; j++) for(uint8_t j = 0; j < 4; j++)
balanceBoardCal[i][j] = l2capinbuf[16 + 8 * i + 2 * j] | l2capinbuf[15 + 8 * i + 2 * j] << 8; wiiBalanceBoardCal[i][j] = l2capinbuf[16 + 8 * i + 2 * j] | l2capinbuf[15 + 8 * i + 2 * j] << 8;
} }
} else if(l2capinbuf[13] == 0x00 && l2capinbuf[14] == 0x34 && reportLength == 8) { // Last 8-bit } else if(l2capinbuf[13] == 0x00 && l2capinbuf[14] == 0x34 && reportLength == 8) { // Last 8-bit
for(uint8_t j = 0; j < 4; j++) for(uint8_t j = 0; j < 4; j++)
balanceBoardCal[2][j] = l2capinbuf[16 + 2 * j] | l2capinbuf[15 + 2 * j] << 8; wiiBalanceBoardCal[2][j] = l2capinbuf[16 + 2 * j] | l2capinbuf[15 + 2 * j] << 8;
#ifdef DEBUG_USB_HOST #ifdef DEBUG_USB_HOST
Notify(PSTR("\r\nWii Balance Board calibrated successfully"), 0x80); Notify(PSTR("\r\nWii Balance Board calibrated successfully"), 0x80);
#endif #endif
@ -444,10 +444,10 @@ void WII::ACLData(uint8_t* l2capinbuf) {
break; break;
case 0x32: // Core Buttons with 8 Extension bytes - (a1) 32 BB BB EE EE EE EE EE EE EE EE case 0x32: // Core Buttons with 8 Extension bytes - (a1) 32 BB BB EE EE EE EE EE EE EE EE
// See: http://wiibrew.org/wiki/Wii_Balance_Board#Data_Format // See: http://wiibrew.org/wiki/Wii_Balance_Board#Data_Format
balanceBoardRaw[TopRight] = l2capinbuf[13] | l2capinbuf[12] << 8; // Top right wiiBalanceBoardRaw[TopRight] = l2capinbuf[13] | l2capinbuf[12] << 8; // Top right
balanceBoardRaw[BotRight] = l2capinbuf[15] | l2capinbuf[14] << 8; // Bottom right wiiBalanceBoardRaw[BotRight] = l2capinbuf[15] | l2capinbuf[14] << 8; // Bottom right
balanceBoardRaw[TopLeft] = l2capinbuf[17] | l2capinbuf[16] << 8; // Top left wiiBalanceBoardRaw[TopLeft] = l2capinbuf[17] | l2capinbuf[16] << 8; // Top left
balanceBoardRaw[BotLeft] = l2capinbuf[19] | l2capinbuf[18] << 8; // Bottom left wiiBalanceBoardRaw[BotLeft] = l2capinbuf[19] | l2capinbuf[18] << 8; // Bottom left
break; break;
case 0x33: // Core Buttons with Accelerometer and 12 IR bytes - (a1) 33 BB BB AA AA AA II II II II II II II II II II II II case 0x33: // Core Buttons with Accelerometer and 12 IR bytes - (a1) 33 BB BB AA AA AA II II II II II II II II II II II II
#ifdef WIICAMERA #ifdef WIICAMERA
@ -1133,19 +1133,16 @@ void WII::onInit() {
/************************************************************/ /************************************************************/
float WII::getWeight(BalanceBoardEnum pos) { float WII::getWeight(BalanceBoardEnum pos) {
// Based on: https://github.com/skorokithakis/gr8w8upd8m8/blob/master/gr8w8upd8m8.py // Use interpolating between two points - based on: https://github.com/skorokithakis/gr8w8upd8m8/blob/master/gr8w8upd8m8.py
// calibration[pos][0] is calibration values for 0 kg // wiiBalanceBoardCal[pos][0] is calibration values for 0 kg
// calibration[pos][1] is calibration values for 17 kg // wiiBalanceBoardCal[pos][1] is calibration values for 17 kg
// calibration[pos][2] is calibration values for 34 kg // wiiBalanceBoardCal[pos][2] is calibration values for 34 kg
float val = 0; if(wiiBalanceBoardRaw[pos] < wiiBalanceBoardCal[0][pos])
if(balanceBoardRaw[pos] < balanceBoardCal[0][pos]) return 0.0f; // Below 0 kg
return val; else if(wiiBalanceBoardRaw[pos] < wiiBalanceBoardCal[1][pos]) // Between 0 and 17 kg
else if(balanceBoardRaw[pos] < balanceBoardCal[1][pos]) return 17.0f * (float)(wiiBalanceBoardRaw[pos] - wiiBalanceBoardCal[0][pos]) / (float)(wiiBalanceBoardCal[1][pos] - wiiBalanceBoardCal[0][pos]);
val = 17 * ((balanceBoardRaw[pos] - balanceBoardCal[0][pos]) / float((balanceBoardCal[1][pos] - balanceBoardCal[0][pos]))); else // More than 17 kg
else if(balanceBoardRaw[pos] > balanceBoardCal[1][pos]) return 17.0f + 17.0f * (float)(wiiBalanceBoardRaw[pos] - wiiBalanceBoardCal[1][pos]) / (float)(wiiBalanceBoardCal[2][pos] - wiiBalanceBoardCal[1][pos]);
val = 17 + 17 * ((balanceBoardRaw[pos] - balanceBoardCal[1][pos]) / float((balanceBoardCal[2][pos] - balanceBoardCal[1][pos])));
return val;
}; };
float WII::getTotalWeight() { float WII::getTotalWeight() {

6
Wii.h
View file

@ -292,7 +292,7 @@ public:
* @return Returns the raw reading. * @return Returns the raw reading.
*/ */
uint16_t getWeightRaw(BalanceBoardEnum pos) { uint16_t getWeightRaw(BalanceBoardEnum pos) {
return balanceBoardRaw[pos]; return wiiBalanceBoardRaw[pos];
}; };
/** Indicates when the calibration of the Wii Balance Board is done. */ /** Indicates when the calibration of the Wii Balance Board is done. */
@ -481,8 +481,8 @@ private:
void activateMotionPlus(); void activateMotionPlus();
void calibrateWiiBalanceBoard(); void calibrateWiiBalanceBoard();
uint16_t balanceBoardRaw[4]; // Wii Balance Board raw values uint16_t wiiBalanceBoardRaw[4]; // Wii Balance Board raw values
uint16_t balanceBoardCal[3][4]; // Wii Balance Board calibration values uint16_t wiiBalanceBoardCal[3][4]; // Wii Balance Board calibration values
double compPitch; // Fusioned angle using a complimentary filter if the Motion Plus is connected double compPitch; // Fusioned angle using a complimentary filter if the Motion Plus is connected
double compRoll; // Fusioned angle using a complimentary filter if the Motion Plus is connected double compRoll; // Fusioned angle using a complimentary filter if the Motion Plus is connected