Can now turn LED off by calling setLedOn(OFF) for all controllers

Also renamed all enums, so they does not conflict with user code that easily

Author: Lauszus

PS3BT.cpp

@@ -49,26 +49,26 @@ pBtd(p) // pointer to USB class instance - mandatory
         Reset();
 }
 
-bool PS3BT::getButtonPress(Button b) {
-        return (ButtonState & pgm_read_dword(&BUTTONS[(uint8_t)b]));
+bool PS3BT::getButtonPress(ButtonEnum b) {
+        return (ButtonState & pgm_read_dword(&PS3_BUTTONS[(uint8_t)b]));
 }
 
-bool PS3BT::getButtonClick(Button b) {
-        uint32_t button = pgm_read_dword(&BUTTONS[(uint8_t)b]);
+bool PS3BT::getButtonClick(ButtonEnum b) {
+        uint32_t button = pgm_read_dword(&PS3_BUTTONS[(uint8_t)b]);
         bool click = (ButtonClickState & button);
         ButtonClickState &= ~button; // Clear "click" event
         return click;
 }
 
-uint8_t PS3BT::getAnalogButton(Button a) {
-        return (uint8_t)(l2capinbuf[pgm_read_byte(&ANALOGBUTTONS[(uint8_t)a])]);
+uint8_t PS3BT::getAnalogButton(ButtonEnum a) {
+        return (uint8_t)(l2capinbuf[pgm_read_byte(&PS3_ANALOG_BUTTONS[(uint8_t)a])]);
 }
 
-uint8_t PS3BT::getAnalogHat(AnalogHat a) {
+uint8_t PS3BT::getAnalogHat(AnalogHatEnum a) {
         return (uint8_t)(l2capinbuf[(uint8_t)a + 15]);
 }
 
-int16_t PS3BT::getSensor(Sensor a) {
+int16_t PS3BT::getSensor(SensorEnum a) {
         if(PS3Connected) {
                 if(a == aX || a == aY || a == aZ || a == gZ)
                         return ((l2capinbuf[(uint16_t)a] << 8) | l2capinbuf[(uint16_t)a + 1]);
@@ -85,7 +85,7 @@ int16_t PS3BT::getSensor(Sensor a) {
                 return 0;
 }
 
-double PS3BT::getAngle(Angle a) {
+double PS3BT::getAngle(AngleEnum a) {
         double accXval, accYval, accZval;
 
         if(PS3Connected) {
@@ -112,7 +112,7 @@ double PS3BT::getAngle(Angle a) {
                 return (atan2(accXval, accZval) + PI) * RAD_TO_DEG;
 }
 
-double PS3BT::get9DOFValues(Sensor a) { // Thanks to Manfred Piendl
+double PS3BT::get9DOFValues(SensorEnum a) { // Thanks to Manfred Piendl
         if(!PS3MoveConnected)
                 return 0;
         int16_t value = getSensor(a);
@@ -156,7 +156,7 @@ String PS3BT::getTemperature() {
                 return "Error";
 }
 
-bool PS3BT::getStatus(Status c) {
+bool PS3BT::getStatus(StatusEnum c) {
         return (l2capinbuf[(uint16_t)c >> 8] == ((uint8_t)c & 0xff));
 }
 
@@ -544,7 +544,7 @@ void PS3BT::setRumbleOff() {
         HID_Command(HIDBuffer, HID_BUFFERSIZE);
 }
 
-void PS3BT::setRumbleOn(Rumble mode) {
+void PS3BT::setRumbleOn(RumbleEnum mode) {
         uint8_t power[2] = {0xff, 0x00}; // Defaults to RumbleLow
         if(mode == RumbleHigh) {
                 power[0] = 0x00;
@@ -566,18 +566,22 @@ void PS3BT::setLedRaw(uint8_t value) {
         HID_Command(HIDBuffer, HID_BUFFERSIZE);
 }
 
-void PS3BT::setLedOff(LED a) {
-        HIDBuffer[11] &= ~((uint8_t)((pgm_read_byte(&LEDS[(uint8_t)a]) & 0x0f) << 1));
+void PS3BT::setLedOff(LEDEnum a) {
+        HIDBuffer[11] &= ~((uint8_t)((pgm_read_byte(&PS3_LEDS[(uint8_t)a]) & 0x0f) << 1));
         HID_Command(HIDBuffer, HID_BUFFERSIZE);
 }
 
-void PS3BT::setLedOn(LED a) {
-        HIDBuffer[11] |= (uint8_t)((pgm_read_byte(&LEDS[(uint8_t)a]) & 0x0f) << 1);
-        HID_Command(HIDBuffer, HID_BUFFERSIZE);
+void PS3BT::setLedOn(LEDEnum a) {
+        if(a == OFF)
+                setLedRaw(0);
+        else {
+                HIDBuffer[11] |= (uint8_t)((pgm_read_byte(&PS3_LEDS[(uint8_t)a]) & 0x0f) << 1);
+                HID_Command(HIDBuffer, HID_BUFFERSIZE);
+        }
 }
 
-void PS3BT::setLedToggle(LED a) {
-        HIDBuffer[11] ^= (uint8_t)((pgm_read_byte(&LEDS[(uint8_t)a]) & 0x0f) << 1);
+void PS3BT::setLedToggle(LEDEnum a) {
+        HIDBuffer[11] ^= (uint8_t)((pgm_read_byte(&PS3_LEDS[(uint8_t)a]) & 0x0f) << 1);
         HID_Command(HIDBuffer, HID_BUFFERSIZE);
 }
 
@@ -602,7 +606,7 @@ void PS3BT::HIDMove_Command(uint8_t* data, uint8_t nbytes) {
         timerHID = millis();
 }
 
-void PS3BT::moveSetBulb(uint8_t r, uint8_t g, uint8_t b) { //Use this to set the Color using RGB values
+void PS3BT::moveSetBulb(uint8_t r, uint8_t g, uint8_t b) { // Use this to set the Color using RGB values
         // Set the Bulb's values into the write buffer
         HIDMoveBuffer[3] = r;
         HIDMoveBuffer[4] = g;
@@ -611,7 +615,7 @@ void PS3BT::moveSetBulb(uint8_t r, uint8_t g, uint8_t b) { //Use this to set the
         HIDMove_Command(HIDMoveBuffer, HID_BUFFERSIZE);
 }
 
-void PS3BT::moveSetBulb(Colors color) { //Use this to set the Color using the predefined colors in enum
+void PS3BT::moveSetBulb(ColorsEnum color) { // Use this to set the Color using the predefined colors in enum
         moveSetBulb((uint8_t)(color >> 16), (uint8_t)(color >> 8), (uint8_t)(color));
 }
 

PS3BT.h

@@ -56,32 +56,34 @@ class PS3BT : public BluetoothService {
 
         /** @name PS3 Controller functions */
         /**
-         * getButtonPress(Button b) will return true as long as the button is held down.
+         * getButtonPress(ButtonEnum b) will return true as long as the button is held down.
          *
-         * While getButtonClick(Button b) will only return it once.
+         * While getButtonClick(ButtonEnum b) will only return it once.
          *
-         * So you instance if you need to increase a variable once you would use getButtonClick(Button b),
-         * but if you need to drive a robot forward you would use getButtonPress(Button b).
+         * So you instance if you need to increase a variable once you would use getButtonClick(ButtonEnum b),
+         * but if you need to drive a robot forward you would use getButtonPress(ButtonEnum b).
+         * @param  b          ::ButtonEnum to read.
+         * @return            getButtonPress(ButtonEnum b) will return a true as long as a button is held down, while getButtonClick(ButtonEnum b) will return true once for each button press.
          */
-        bool getButtonPress(Button b);
-        bool getButtonClick(Button b);
+        bool getButtonPress(ButtonEnum b);
+        bool getButtonClick(ButtonEnum b);
         /**@}*/
         /** @name PS3 Controller functions */
         /**
          * Used to get the analog value from button presses.
-         * @param  a The ::Button to read.
+         * @param  a The ::ButtonEnum to read.
          * The supported buttons are:
          * ::UP, ::RIGHT, ::DOWN, ::LEFT, ::L1, ::L2, ::R1, ::R2,
          * ::TRIANGLE, ::CIRCLE, ::CROSS, ::SQUARE, and ::T.
          * @return   Analog value in the range of 0-255.
          */
-        uint8_t getAnalogButton(Button a);
+        uint8_t getAnalogButton(ButtonEnum a);
         /**
          * Used to read the analog joystick.
          * @param  a ::LeftHatX, ::LeftHatY, ::RightHatX, and ::RightHatY.
          * @return   Return the analog value in the range of 0-255.
          */
-        uint8_t getAnalogHat(AnalogHat a);
+        uint8_t getAnalogHat(AnalogHatEnum a);
         /**
          * Used to read the sensors inside the Dualshock 3 and Move controller.
          * @param  a
@@ -90,47 +92,47 @@ class PS3BT : public BluetoothService {
          * and a temperature sensor inside.
          * @return   Return the raw sensor value.
          */
-        int16_t getSensor(Sensor a);
+        int16_t getSensor(SensorEnum a);
         /**
          * Use this to get ::Pitch and ::Roll calculated using the accelerometer.
          * @param  a Either ::Pitch or ::Roll.
          * @return   Return the angle in the range of 0-360.
          */
-        double getAngle(Angle a);
+        double getAngle(AngleEnum a);
         /**
          * Read the sensors inside the Move controller.
          * @param  a ::aXmove, ::aYmove, ::aZmove, ::gXmove, ::gYmove, ::gZmove, ::mXmove, ::mYmove, and ::mXmove.
          * @return   The value in SI units.
          */
-        double get9DOFValues(Sensor a);
+        double get9DOFValues(SensorEnum a);
         /**
-         * Get the ::Status from the controller.
-         * @param  c The ::Status you want to read.
+         * Get the status from the controller.
+         * @param  c The ::StatusEnum you want to read.
          * @return   True if correct and false if not.
          */
-        bool getStatus(Status c);
+        bool getStatus(StatusEnum c);
         /**
-         * Read all the available ::Status from the controller.
+         * Read all the available ::StatusEnum from the controller.
          * @return One large string with all the information.
          */
         String getStatusString();
         /**
          * Read the temperature from the Move controller.
-         * @return The temperature in degrees celsius.
+         * @return The temperature in degrees Celsius.
          */
         String getTemperature();
 
-        /** Used to set all LEDs and ::Rumble off. */
+        /** Used to set all LEDs and rumble off. */
         void setAllOff();
-        /** Turn off ::Rumble. */
+        /** Turn off rumble. */
         void setRumbleOff();
         /**
-         * Turn on ::Rumble.
+         * Turn on rumble.
          * @param mode Either ::RumbleHigh or ::RumbleLow.
          */
-        void setRumbleOn(Rumble mode);
+        void setRumbleOn(RumbleEnum mode);
         /**
-         * Turn on ::Rumble using custom duration and power.
+         * Turn on rumble using custom duration and power.
          * @param rightDuration The duration of the right/low rumble effect.
          * @param rightPower The intensity of the right/low rumble effect.
          * @param leftDuration The duration of the left/high rumble effect.
@@ -139,8 +141,8 @@ class PS3BT : public BluetoothService {
         void setRumbleOn(uint8_t rightDuration, uint8_t rightPower, uint8_t leftDuration, uint8_t leftPower);
 
         /**
-         * Set LED value without using the ::LED enum.
-         * @param value See: ::LED enum.
+         * Set LED value without using ::LEDEnum.
+         * @param value See: ::LEDEnum.
          */
         void setLedRaw(uint8_t value);
 
@@ -149,31 +151,31 @@ class PS3BT : public BluetoothService {
                 setLedRaw(0);
         };
         /**
-         * Turn the specific ::LED off.
-         * @param a The ::LED to turn off.
+         * Turn the specific LED off.
+         * @param a The ::LEDEnum to turn off.
          */
-        void setLedOff(LED a);
+        void setLedOff(LEDEnum a);
         /**
-         * Turn the specific ::LED on.
-         * @param a The ::LED to turn on.
+         * Turn the specific LED on.
+         * @param a The ::LEDEnum to turn on.
          */
-        void setLedOn(LED a);
+        void setLedOn(LEDEnum a);
         /**
-         * Toggle the specific ::LED.
-         * @param a The ::LED to toggle.
+         * Toggle the specific LED.
+         * @param a The ::LEDEnum to toggle.
          */
-        void setLedToggle(LED a);
+        void setLedToggle(LEDEnum a);
 
         /**
          * Use this to set the Color using RGB values.
          * @param r,g,b RGB value.
          */
         void moveSetBulb(uint8_t r, uint8_t g, uint8_t b);
         /**
-         * Use this to set the color using the predefined colors in ::Colors.
+         * Use this to set the color using the predefined colors in ::ColorsEnum.
          * @param color The desired color.
          */
-        void moveSetBulb(Colors color);
+        void moveSetBulb(ColorsEnum color);
         /**
          * Set the rumble value inside the Move controller.
          * @param rumble The desired value in the range from 64-255.