Added several variables to BluetoothService class

Also moved attachOnInit function into BluetoothService class, but this really belong somewhere else

BTD.cpp

@@ -511,6 +511,7 @@ void BTD::HCI_event_task() {
                                                 if(remote_name[i] == '\0') // End of string
                                                         break;
                                         }
+                                        // TODO: Altid sæt '\0' i remote name!
                                         hci_set_flag(HCI_FLAG_REMOTE_NAME_COMPLETE);
                                 }
                                 break;

BTD.h

@@ -205,20 +205,56 @@
 #define UHS_ACL_HANDLE_OK(x, y) ((x[0] == (y & 0xff)) && (x[1] == ((y >> 8) | 0x20)))
 #endif
 
+class BTD;
+
 /** All Bluetooth services should inherit this class. */
 class BluetoothService {
 public:
+        BluetoothService(BTD *p) : pBtd(p) {};
         /**
          * Used to pass acldata to the Bluetooth service.
          * @param ACLData Pointer to the incoming acldata.
          */
-        virtual void ACLData(uint8_t* ACLData);
+        virtual void ACLData(uint8_t* ACLData) = 0;
         /** Used to run the different state machines in the Bluetooth service. */
-        virtual void Run();
+        virtual void Run() = 0;
         /** Used to reset the Bluetooth service. */
-        virtual void Reset();
+        virtual void Reset() = 0;
         /** Used to disconnect both the L2CAP Channel and the HCI Connection for the Bluetooth service. */
-        virtual void disconnect();
+        virtual void disconnect() = 0;
+
+        /**
+         * Used to call your own function when the device is successfully initialized.
+         * @param funcOnInit Function to call.
+         */
+        void attachOnInit(void (*funcOnInit)(void)) {
+                pFuncOnInit = funcOnInit; // TODO: This really belong in a class of it's own as it is repeated several times
+        };
+
+protected:
+        /**
+         * Called when a device is successfully initialized.
+         * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
+         * This is useful for instance if you want to set the LEDs in a specific way.
+         */
+        virtual void onInit() = 0;
+
+        // TODO: Implement "UHS_ACL_HANDLE_OK" function
+
+        /** Pointer to function called in onInit(). */
+        void (*pFuncOnInit)(void);
+
+        /** Pointer to BTD instance. */
+        BTD *pBtd;
+
+        /** The HCI Handle for the connection. */
+        uint16_t hci_handle;
+
+        /** L2CAP flags of received Bluetooth events. */
+        uint32_t l2cap_event_flag;
+
+        /** Identifier for L2CAP commands. */
+        uint8_t identifier;
 };
 
 /**

BTHID.cpp

@@ -21,7 +21,7 @@
 //#define PRINTREPORT // Uncomment to print the report send by the HID device
 
 BTHID::BTHID(BTD *p, bool pair, const char *pin) :
-pBtd(p), // pointer to USB class instance - mandatory
+BluetoothService(p), // Pointer to USB class instance - mandatory
 protocolMode(HID_BOOT_PROTOCOL) {
         for(uint8_t i = 0; i < NUM_PARSERS; i++)
                 pRptParser[i] = NULL;

BTHID.h

@@ -37,15 +37,6 @@ public:
         BTHID(BTD *p, bool pair = false, const char *pin = "0000");
 
         /** @name BluetoothService implementation */
-        /**
-         * Used to pass acldata to the services.
-         * @param ACLData Incoming acldata.
-         */
-        virtual void ACLData(uint8_t* ACLData);
-        /** Used to run part of the state machine. */
-        virtual void Run();
-        /** Use this to reset the service. */
-        virtual void Reset();
         /** Used this to disconnect the devices. */
         virtual void disconnect();
         /**@}*/
@@ -97,15 +88,29 @@ public:
                         pBtd->pairWithHID();
         };
 
-        /**
-         * Used to call your own function when the device is successfully initialized.
-         * @param funcOnInit Function to call.
-         */
-        void attachOnInit(void (*funcOnInit)(void)) {
-                pFuncOnInit = funcOnInit;
-        };
-
 protected:
+        /** @name BluetoothService implementation */
+        /**
+         * Used to pass acldata to the services.
+         * @param ACLData Incoming acldata.
+         */
+        virtual void ACLData(uint8_t* ACLData);
+        /** Used to run part of the state machine. */
+        virtual void Run();
+        /** Use this to reset the service. */
+        virtual void Reset();
+        /**
+         * Called when a device is successfully initialized.
+         * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
+         * This is useful for instance if you want to set the LEDs in a specific way.
+         */
+        virtual void onInit() {
+                if(pFuncOnInit)
+                        pFuncOnInit(); // Call the user function
+                OnInitBTHID();
+        };
+        /**@}*/
+
         /** @name Overridable functions */
         /**
          * Used to parse Bluetooth HID data to any class that inherits this class.
@@ -125,14 +130,7 @@ protected:
         }
         /**@}*/
 
-        /** Pointer to BTD instance */
-        BTD *pBtd;
-
-        /** HCI Handle for connection */
-        uint16_t hci_handle;
-
         /** L2CAP source CID for HID_Control */
-
         uint8_t control_scid[2];
 
         /** L2CAP source CID for HID_Interrupt */
@@ -145,18 +143,6 @@ private:
         void setProtocol();
         uint8_t protocolMode;
 
-        /**
-         * Called when a device is successfully initialized.
-         * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
-         * This is useful for instance if you want to set the LEDs in a specific way.
-         */
-        void onInit() {
-                if(pFuncOnInit)
-                        pFuncOnInit(); // Call the user function
-                OnInitBTHID();
-        };
-        void (*pFuncOnInit)(void); // Pointer to function called in onInit()
-
         void L2CAP_task(); // L2CAP state machine
 
         bool activeConnection; // Used to indicate if it already has established a connection
@@ -164,8 +150,6 @@ private:
         /* Variables used for L2CAP communication */
         uint8_t control_dcid[2]; // L2CAP device CID for HID_Control - Always 0x0070
         uint8_t interrupt_dcid[2]; // L2CAP device CID for HID_Interrupt - Always 0x0071
-        uint8_t identifier; // Identifier for connection
         uint8_t l2cap_state;
-        uint32_t l2cap_event_flag; // l2cap flags of received Bluetooth events
 };
 #endif

PS3BT.cpp

@@ -21,7 +21,7 @@
 //#define PRINTREPORT // Uncomment to print the report send by the PS3 Controllers
 
 PS3BT::PS3BT(BTD *p, uint8_t btadr5, uint8_t btadr4, uint8_t btadr3, uint8_t btadr2, uint8_t btadr1, uint8_t btadr0) :
-pBtd(p) // pointer to USB class instance - mandatory
+BluetoothService(p) // Pointer to USB class instance - mandatory
 {
         if(pBtd)
                 pBtd->registerServiceClass(this); // Register it as a Bluetooth service

PS3BT.h

@@ -41,15 +41,6 @@ public:
         PS3BT(BTD *pBtd, uint8_t btadr5 = 0, uint8_t btadr4 = 0, uint8_t btadr3 = 0, uint8_t btadr2 = 0, uint8_t btadr1 = 0, uint8_t btadr0 = 0);
 
         /** @name BluetoothService implementation */
-        /**
-         * Used to pass acldata to the services.
-         * @param ACLData Incoming acldata.
-         */
-        virtual void ACLData(uint8_t* ACLData);
-        /** Used to run part of the state machine. */
-        virtual void Run();
-        /** Use this to reset the service. */
-        virtual void Reset();
         /** Used this to disconnect any of the controllers. */
         virtual void disconnect();
         /**@}*/
@@ -183,14 +174,6 @@ public:
         uint32_t getLastMessageTime() {
                 return lastMessageTime;
         };
-
-        /**
-         * Used to call your own function when the controller is successfully initialized.
-         * @param funcOnInit Function to call.
-         */
-        void attachOnInit(void (*funcOnInit)(void)) {
-                pFuncOnInit = funcOnInit;
-        };
         /**@}*/
 
         /** Variable used to indicate if the normal Playstation controller is successfully connected. */
@@ -200,32 +183,39 @@ public:
         /** Variable used to indicate if the Navigation controller is successfully connected. */
         bool PS3NavigationConnected;
 
-private:
+protected:
-        /* Mandatory members */
+        /** @name BluetoothService implementation */
-        BTD *pBtd;
+        /**
-
+         * Used to pass acldata to the services.
+         * @param ACLData Incoming acldata.
+         */
+        virtual void ACLData(uint8_t* ACLData);
+        /** Used to run part of the state machine. */
+        virtual void Run();
+        /** Use this to reset the service. */
+        virtual void Reset();
         /**
          * Called when the controller is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        void onInit();
+        virtual void onInit();
-        void (*pFuncOnInit)(void); // Pointer to function called in onInit()
+        /**@}*/
+
+private:
 
         void L2CAP_task(); // L2CAP state machine
 
         /* Variables filled from HCI event management */
-        int16_t hci_handle;
         uint8_t remote_name[30]; // First 30 chars of remote name
         bool activeConnection; // Used to indicate if it's already has established a connection
 
         /* Variables used by high level L2CAP task */
         uint8_t l2cap_state;
-        uint32_t l2cap_event_flag; // L2CAP flags of received Bluetooth events
 
         uint32_t lastMessageTime; // Variable used to store the millis value of the last message.
 
-        unsigned long timer;
+        uint32_t timer;
 
         uint32_t ButtonState;
         uint32_t OldButtonState;
@@ -243,7 +233,6 @@ private:
         uint8_t control_dcid[2]; // 0x0040
         uint8_t interrupt_scid[2]; // L2CAP source CID for HID_Interrupt
         uint8_t interrupt_dcid[2]; // 0x0041
-        uint8_t identifier; // Identifier for connection
 
         /* HID Commands */
         void HID_Command(uint8_t* data, uint8_t nbytes);

PS4BT.h

@@ -46,14 +46,6 @@ public:
                 return BTHID::connected;
         };
 
-        /**
-         * Used to call your own function when the device is successfully initialized.
-         * @param funcOnInit Function to call.
-         */
-        void attachOnInit(void (*funcOnInit)(void)) {
-                pFuncOnInit = funcOnInit;
-        };
-
 protected:
         /** @name BTHID implementation */
         /**
@@ -125,7 +117,5 @@ private:
         void HID_Command(uint8_t *data, uint8_t nbytes) {
                 pBtd->L2CAP_Command(hci_handle, data, nbytes, control_scid[0], control_scid[1]);
         };
-
-        void (*pFuncOnInit)(void); // Pointer to function called in onInit()
 };
 #endif

SPP.cpp

@@ -43,7 +43,7 @@ const uint8_t rfcomm_crc_table[256] PROGMEM = {/* reversed, 8-bit, poly=0x07 */
 };
 
 SPP::SPP(BTD *p, const char* name, const char* pin) :
-pBtd(p) // Pointer to BTD class instance - mandatory
+BluetoothService(p) // Pointer to BTD class instance - mandatory
 {
         if(pBtd)
                 pBtd->registerServiceClass(this); // Register it as a Bluetooth service
@@ -69,6 +69,7 @@ void SPP::Reset() {
         l2cap_rfcomm_state = L2CAP_RFCOMM_WAIT;
         l2cap_event_flag = 0;
         sppIndex = 0;
+        creditSent = false;
 }
 
 void SPP::disconnect() {
@@ -397,10 +398,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
 #ifdef DEBUG_USB_HOST
                                         Notify(PSTR("\r\nRFCOMM Connection is now established\r\n"), 0x80);
 #endif
-                                        waitForLastCommand = false;
+                                        onInit();
-                                        creditSent = false;
-                                        connected = true; // The RFCOMM channel is now established
-                                        sppIndex = 0;
                                 }
 #ifdef EXTRADEBUG
                                 else if(rfcommChannelType != RFCOMM_DISC) {
@@ -430,13 +428,19 @@ void SPP::Run() {
 #ifdef DEBUG_USB_HOST
                 Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"), 0x80);
 #endif
+                onInit();
+        }
+        send(); // Send all bytes currently in the buffer
+}
+
+void SPP::onInit() {
         creditSent = false;
         waitForLastCommand = false;
         connected = true; // The RFCOMM channel is now established
         sppIndex = 0;
-        }
+        if(pFuncOnInit)
-        send(); // Send all bytes currently in the buffer
+                pFuncOnInit(); // Call the user function
-}
+};
 
 void SPP::SDP_task() {
         switch(l2cap_sdp_state) {

SPP.h

@@ -68,6 +68,11 @@ public:
          */
         SPP(BTD *p, const char *name = "Arduino", const char *pin = "0000");
 
+        /** @name BluetoothService implementation */
+        /** Used this to disconnect the virtual serial port. */
+        virtual void disconnect();
+        /**@}*/
+
         /**
          * Used to provide Boolean tests for the class.
          * @return Return true if SPP communication is connected.
@@ -78,20 +83,6 @@ public:
         /** Variable used to indicate if the connection is established. */
         bool connected;
 
-        /** @name BluetoothService implementation */
-        /**
-         * Used to pass acldata to the services.
-         * @param ACLData Incoming acldata.
-         */
-        virtual void ACLData(uint8_t* ACLData);
-        /** Used to establish the connection automatically. */
-        virtual void Run();
-        /** Use this to reset the service. */
-        virtual void Reset();
-        /** Used this to disconnect the virtual serial port. */
-        virtual void disconnect();
-        /**@}*/
-
         /** @name Serial port profile (SPP) Print functions */
         /**
          * Get number of bytes waiting to be read.
@@ -154,20 +145,33 @@ public:
         void send(void);
         /**@}*/
 
-private:
+protected:
-        /* Bluetooth dongle library pointer */
+        /** @name BluetoothService implementation */
-        BTD *pBtd;
+        /**
+         * Used to pass acldata to the services.
+         * @param ACLData Incoming acldata.
+         */
+        virtual void ACLData(uint8_t* ACLData);
+        /** Used to establish the connection automatically. */
+        virtual void Run();
+        /** Use this to reset the service. */
+        virtual void Reset();
+        /**
+         * Called when a device is successfully initialized.
+         * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
+         * This is useful for instance if you want to set the LEDs in a specific way.
+         */
+        virtual void onInit();
+        /**@}*/
 
+private:
         /* Set true when a channel is created */
         bool SDPConnected;
         bool RFCOMMConnected;
 
-        uint16_t hci_handle; // The HCI Handle for the connection
-
         /* Variables used by L2CAP state machines */
         uint8_t l2cap_sdp_state;
         uint8_t l2cap_rfcomm_state;
-        uint32_t l2cap_event_flag; // l2cap flags of received Bluetooth events
 
         uint8_t l2capoutbuf[BULK_MAXPKTSIZE]; // General purpose buffer for l2cap out data
         uint8_t rfcommbuf[10]; // Buffer for RFCOMM Commands
@@ -177,7 +181,6 @@ private:
         uint8_t sdp_dcid[2]; // 0x0050
         uint8_t rfcomm_scid[2]; // L2CAP source CID for RFCOMM
         uint8_t rfcomm_dcid[2]; // 0x0051
-        uint8_t identifier; // Identifier for command
 
         /* RFCOMM Variables */
         uint8_t rfcommChannel;
@@ -187,7 +190,7 @@ private:
         uint8_t rfcommChannelType;
         uint8_t rfcommPfBit;
 
-        unsigned long timer;
+        uint32_t timer;
         bool waitForLastCommand;
         bool creditSent;
 

Wii.cpp

@@ -83,7 +83,7 @@ const uint32_t WII_PROCONTROLLER_BUTTONS[] PROGMEM = {
 };
 
 WII::WII(BTD *p, bool pair) :
-pBtd(p) // pointer to USB class instance - mandatory
+BluetoothService(p) // Pointer to USB class instance - mandatory
 {
         if(pBtd)
                 pBtd->registerServiceClass(this); // Register it as a Bluetooth service

Wii.h

@@ -55,15 +55,6 @@ public:
         WII(BTD *p, bool pair = false);
 
         /** @name BluetoothService implementation */
-        /**
-         * Used to pass acldata to the services.
-         * @param ACLData Incoming acldata.
-         */
-        virtual void ACLData(uint8_t* ACLData);
-        /** Used to run part of the state machine. */
-        virtual void Run();
-        /** Use this to reset the service. */
-        virtual void Reset();
         /** Used this to disconnect any of the controllers. */
         virtual void disconnect();
         /**@}*/
@@ -189,14 +180,6 @@ public:
         uint8_t getWiiState() {
                 return wiiState;
         };
-
-        /**
-         * Used to call your own function when the controller is successfully initialized.
-         * @param funcOnInit Function to call.
-         */
-        void attachOnInit(void (*funcOnInit)(void)) {
-                pFuncOnInit = funcOnInit;
-        };
         /**@}*/
 
         /**@{*/
@@ -392,26 +375,34 @@ public:
         /**@}*/
 #endif
 
-private:
+protected:
-        BTD *pBtd; // Pointer to BTD instance
+        /** @name BluetoothService implementation */
-
+        /**
+         * Used to pass acldata to the services.
+         * @param ACLData Incoming acldata.
+         */
+        virtual void ACLData(uint8_t* ACLData);
+        /** Used to run part of the state machine. */
+        virtual void Run();
+        /** Use this to reset the service. */
+        virtual void Reset();
         /**
          * Called when the controller is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        void onInit();
+        virtual void onInit();
-        void (*pFuncOnInit)(void); // Pointer to function called in onInit()
+        /**@}*/
+
+private:
 
         void L2CAP_task(); // L2CAP state machine
 
         /* Variables filled from HCI event management */
-        uint16_t hci_handle;
         bool activeConnection; // Used to indicate if it's already has established a connection
 
         /* Variables used by high level L2CAP task */
         uint8_t l2cap_state;
-        uint32_t l2cap_event_flag; // L2CAP flags of received Bluetooth events
         uint8_t wii_event_flag; // Used for Wii flags
 
         uint32_t ButtonState;
@@ -432,7 +423,6 @@ private:
         uint8_t control_dcid[2]; // 0x0060
         uint8_t interrupt_scid[2]; // L2CAP source CID for HID_Interrupt
         uint8_t interrupt_dcid[2]; // 0x0061
-        uint8_t identifier; // Identifier for connection
 
         /* HID Commands */
         void HID_Command(uint8_t* data, uint8_t nbytes);
@@ -457,7 +447,7 @@ private:
 
         bool activateNunchuck;
         bool motionValuesReset; // This bool is true when the gyro values has been reset
-        unsigned long timer;
+        uint32_t timer;
 
         uint8_t wiiState; // Stores the value in l2capinbuf[12] - (0x01: Battery is nearly empty), (0x02:  An Extension Controller is connected), (0x04: Speaker enabled), (0x08: IR enabled), (0x10: LED1, 0x20: LED2, 0x40: LED3, 0x80: LED4)
         uint8_t batteryLevel;