added integration for Energia (only tested with MSP432 Launchpad)

Author: ndroid

PS2X_lib/PS2X_lib.cpp

@@ -2,15 +2,6 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdint.h>
-#ifdef __AVR__
-#include <avr/io.h>
-#endif
-#if ARDUINO > 22
-  #include "Arduino.h"
-#else
-  #include "WProgram.h"
-  #include "pins_arduino.h"
-#endif
 
 static byte enter_config[]={0x01,0x43,0x00,0x01,0x00};
 static byte set_mode[]={0x01,0x44,0x00,0x01,0x03,0x00,0x00,0x00,0x00};
@@ -57,6 +48,9 @@ byte PS2X::Analog(byte button) {
 /****************************************************************************************/
 unsigned char PS2X::_gamepad_shiftinout (char byte) {
    unsigned char tmp = 0;
+#ifdef ENERGIA
+   noInterrupts();
+#endif
    for(unsigned char i=0;i<8;i++) {
       if(CHK(byte,i)) CMD_SET();
       else CMD_CLR();
@@ -73,6 +67,9 @@ unsigned char PS2X::_gamepad_shiftinout (char byte) {
 #endif
    }
    CMD_SET();
+#ifdef ENERGIA
+   interrupts();
+#endif
    delayMicroseconds(CTRL_BYTE_DELAY);
    return tmp;
 }
@@ -152,7 +149,7 @@ boolean PS2X::read_gamepad(boolean motor1, byte motor2) {
 
    last_buttons = buttons; //store the previous buttons states
 
-#if defined(__AVR__)
+#if defined(__AVR__) || defined(ENERGIA)
    buttons = *(uint16_t*)(PS2data+3);   //store as one value for multiple functions
 #else
    buttons =  (uint16_t)(PS2data[4] << 8) + PS2data[3];   //store as one value for multiple functions
@@ -171,7 +168,12 @@ byte PS2X::config_gamepad(uint8_t clk, uint8_t cmd, uint8_t att, uint8_t dat, bo
 
   byte temp[sizeof(type_read)];
 
-#ifdef __AVR__
+#if defined(ENERGIA) 
+  _clk_pin = clk;
+  _cmd_pin = cmd;
+  _att_pin = att;
+  _dat_pin = dat;
+#elif defined(__AVR__)
   _clk_mask = digitalPinToBitMask(clk);
   _clk_oreg = portOutputRegister(digitalPinToPort(clk));
   _cmd_mask = digitalPinToBitMask(cmd);
@@ -180,8 +182,7 @@ byte PS2X::config_gamepad(uint8_t clk, uint8_t cmd, uint8_t att, uint8_t dat, bo
   _att_oreg = portOutputRegister(digitalPinToPort(att));
   _dat_mask = digitalPinToBitMask(dat);
   _dat_ireg = portInputRegister(digitalPinToPort(dat));
-#else
-#ifdef ESP8266
+#elif defined(ESP8266)
   _clk_pin = clk;
   _cmd_pin = cmd;
   _att_pin = att;
@@ -205,13 +206,12 @@ byte PS2X::config_gamepad(uint8_t clk, uint8_t cmd, uint8_t att, uint8_t dat, bo
 
   _dat_mask = digitalPinToBitMask(dat);
   _dat_lport = portInputRegister(digitalPinToPort(dat));
-#endif
 #endif
 
   pinMode(clk, OUTPUT); //configure ports
   pinMode(att, OUTPUT);
   pinMode(cmd, OUTPUT);
-#ifdef ESP8266
+#if defined(ESP8266) || defined(ENERGIA)
   pinMode(dat, INPUT_PULLUP); // enable pull-up
 #else
   pinMode(dat, INPUT);
@@ -386,7 +386,7 @@ bool PS2X::enablePressures() {
     return false;
 
   en_Pressures = true;
-    return true;
+  return true;
 }
 
 /****************************************************************************************/
@@ -401,7 +401,7 @@ void PS2X::reconfig_gamepad(){
 }
 
 /****************************************************************************************/
-#ifdef __AVR__
+#if defined(__AVR__)
 inline void  PS2X::CLK_SET(void) {
   register uint8_t old_sreg = SREG;
   cli();
@@ -448,9 +448,8 @@ inline bool PS2X::DAT_CHK(void) {
   return (*_dat_ireg & _dat_mask) ? true : false;
 }
 
-#else
-#ifdef ESP8266
-// Let's just use digitalWrite() on ESP8266.
+#elif defined(ESP8266) || defined(ENERGIA)
+// Let's just use digitalWrite() on ESP8266 and Launchpad
 inline void  PS2X::CLK_SET(void) {
   digitalWrite(_clk_pin, HIGH);
 }
@@ -478,6 +477,7 @@ inline void PS2X::ATT_CLR(void) {
 inline bool PS2X::DAT_CHK(void) {
   return digitalRead(_dat_pin) ? true : false;
 }
+
 #else
 // On pic32, use the set/clr registers to make them atomic...
 inline void  PS2X::CLK_SET(void) {
@@ -509,4 +509,3 @@ inline bool PS2X::DAT_CHK(void) {
 }
 
 #endif
-#endif

PS2X_lib/PS2X_lib.h

@@ -1,5 +1,5 @@
 /******************************************************************
-*  Super amazing PS2 controller Arduino Library v1.8
+*  Super amazing PS2 controller Arduino Library v1.91
 *		details and example sketch: 
 *			http://www.billporter.info/?p=240
 *
@@ -12,6 +12,7 @@
 *	 Contributers:
 *		Eric Wetzel (thewetzel@gmail.com)
 *		Kurt Eckhardt
+*       chris miller
 *
 *  Lib version history
 *    0.1 made into library, added analog stick support. 
@@ -60,6 +61,8 @@
 *    1.9
 *       Kurt - Added detection and recovery from dropping from analog mode, plus
 *       integrated Chipkit (pic32mx...) support
+*    1.91
+*       chris - Added integration for Energia (only tested with MSP432 Launchpad)
 *
 *
 *
@@ -80,22 +83,34 @@ GNU General Public License for more details.
 #ifndef PS2X_lib_h
   #define PS2X_lib_h
 
-#if ARDUINO > 22
-  #include "Arduino.h"
-#else
-  #include "WProgram.h"
+#if defined(ENERGIA) // LaunchPad MSP430/432, Stellaris and Tiva, Experimeter Board FR5739 specific
+    #include "Energia.h"
+#elif defined(ARDUINO) && (ARDUINO >= 100) // Arduino 1.0 and 1.5 specific
+    #include "Arduino.h"
+#elif defined(ARDUINO)  // Arduino 23 specific
+    #include "WProgram.h"
+//#elif defined(MPIDE) // chipKIT specific
+//    #include "WProgram.h"
+//#elif defined(CORE_TEENSY) // Teensy specific
+//    #include "WProgram.h"
+#else // error
+    #error Platform not defined
 #endif
 
 #include <math.h>
 #include <stdio.h>
 #include <stdint.h>
-#ifdef __AVR__
+#if defined(ENERGIA) 
+  // LaunchPad MSP430/432, Stellaris and Tiva, Experimeter Board FR5739 specific
+  #define CTRL_CLK        1
+  #define CTRL_CLK_HIGH   1
+  #define CTRL_BYTE_DELAY 20
+#elif defined(__AVR__)
   // AVR
   #include <avr/io.h>
   #define CTRL_CLK        4
   #define CTRL_BYTE_DELAY 3
-#else
-#ifdef ESP8266
+#elif defined(ESP8266)
   #define CTRL_CLK        5
   #define CTRL_CLK_HIGH   5
   #define CTRL_BYTE_DELAY 18
@@ -105,7 +120,6 @@ GNU General Public License for more details.
   #define CTRL_CLK        5
   #define CTRL_CLK_HIGH   5
   #define CTRL_BYTE_DELAY 4
-#endif 
 #endif
 
 //These are our button constants
@@ -206,7 +220,14 @@ class PS2X {
     unsigned int last_buttons;
     unsigned int buttons;
 
-    #ifdef __AVR__
+    #if defined(ENERGIA) 
+      // LaunchPad MSP430/432, Stellaris and Tiva, Experimeter Board FR5739 specific
+      uint8_t _clk_pin;
+      uint8_t _cmd_pin;
+      uint8_t _att_pin;
+      uint8_t _dat_pin;
+    #elif defined(__AVR__)
+      // AVR
       uint8_t maskToBitNum(uint8_t);
       uint8_t _clk_mask; 
       volatile uint8_t *_clk_oreg;
@@ -216,8 +237,7 @@ class PS2X {
       volatile uint8_t *_att_oreg;
       uint8_t _dat_mask; 
       volatile uint8_t *_dat_ireg;
-    #else
-    #ifdef ESP8266
+    #elif defined(ESP8266)
       int _clk_pin;
       int _cmd_pin;
       int _att_pin;
@@ -236,7 +256,6 @@ class PS2X {
       uint16_t _dat_mask; 
       volatile uint32_t *_dat_lport;
     #endif
-    #endif
 
     unsigned long last_read;
     byte read_delay;