diff --git a/hardware/c2000/variants/launchpad_f28027/pins_energia.h b/hardware/c2000/variants/launchpad_f28027/pins_energia.h
index 39f179e6198..17a11bfed5a 100644
--- a/hardware/c2000/variants/launchpad_f28027/pins_energia.h
+++ b/hardware/c2000/variants/launchpad_f28027/pins_energia.h
@@ -32,6 +32,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#define HAS_40_PIN_BOOSTERPACK
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hardware/c2000/variants/launchpad_f28069/pins_energia.h b/hardware/c2000/variants/launchpad_f28069/pins_energia.h
index dc164b9df17..7ef3fe7da26 100644
--- a/hardware/c2000/variants/launchpad_f28069/pins_energia.h
+++ b/hardware/c2000/variants/launchpad_f28069/pins_energia.h
@@ -31,6 +31,9 @@
 
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
+
+#define HAS_40_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) ((uint32_t) 1 << (x))
 #endif
diff --git a/hardware/cc3200/variants/RedBearLab_CC3200/pins_energia.h b/hardware/cc3200/variants/RedBearLab_CC3200/pins_energia.h
index 6178a562840..d4254148bf0 100755
--- a/hardware/cc3200/variants/RedBearLab_CC3200/pins_energia.h
+++ b/hardware/cc3200/variants/RedBearLab_CC3200/pins_energia.h
@@ -33,6 +33,8 @@
 
 #define TARGET_IS_CC3101 1
 
+// No BoosterPack pins
+
 #ifndef BV
 #define BV(x) (1 << (x)) 
 #endif 
diff --git a/hardware/cc3200/variants/RedBearLab_WiFiMini/pins_energia.h b/hardware/cc3200/variants/RedBearLab_WiFiMini/pins_energia.h
index acb8a5c04df..7f43c4ccd57 100755
--- a/hardware/cc3200/variants/RedBearLab_WiFiMini/pins_energia.h
+++ b/hardware/cc3200/variants/RedBearLab_WiFiMini/pins_energia.h
@@ -33,6 +33,8 @@
 
 #define TARGET_IS_CC3101 1
 
+// No BoosterPack pins
+
 #ifndef BV
 #define BV(x) (1 << (x)) 
 #endif 
diff --git a/hardware/cc3200/variants/launchpad/pins_energia.h b/hardware/cc3200/variants/launchpad/pins_energia.h
index 3da38c515fb..93709538b73 100644
--- a/hardware/cc3200/variants/launchpad/pins_energia.h
+++ b/hardware/cc3200/variants/launchpad/pins_energia.h
@@ -31,6 +31,8 @@
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
 
+#define HAS_40_PIN_BOOSTERPACK
+
 #define TARGET_IS_CC3101 1
 
 #ifndef BV
diff --git a/hardware/lm4f/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp b/hardware/lm4f/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
index 5ec7a3bc065..39349f0a0ca 100644
--- a/hardware/lm4f/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
+++ b/hardware/lm4f/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
@@ -65,7 +65,8 @@
 #define HX8353E_GETHID   0xd0
 #define HX8353E_SETGAMMA 0xE0
 Screen_HX8353E::Screen_HX8353E() {
-#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+    //#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+#if defined(#define HAS_40_PIN_BOOSTERPACK)
     _pinReset          = 17;
     _pinDataCommand    = 31;
     _pinChipSelect     = 13;
diff --git a/hardware/lm4f/variants/dktm4c129/pins_energia.h b/hardware/lm4f/variants/dktm4c129/pins_energia.h
index 42789f26016..96da1d873e3 100644
--- a/hardware/lm4f/variants/dktm4c129/pins_energia.h
+++ b/hardware/lm4f/variants/dktm4c129/pins_energia.h
@@ -33,6 +33,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#define HAS_40_PIN_BOOSTERPACK
+
 #include <part.h>
 
 #ifndef BV 
diff --git a/hardware/lm4f/variants/launchpad_129/pins_energia.h b/hardware/lm4f/variants/launchpad_129/pins_energia.h
index 348ee4c49c6..bd356af4592 100755
--- a/hardware/lm4f/variants/launchpad_129/pins_energia.h
+++ b/hardware/lm4f/variants/launchpad_129/pins_energia.h
@@ -34,6 +34,7 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#define HAS_40_PIN_BOOSTERPACK
 
 #include <part.h>
 
diff --git a/hardware/lm4f/variants/stellarpad/pins_energia.h b/hardware/lm4f/variants/stellarpad/pins_energia.h
index 3f6eb38b938..ed773805117 100644
--- a/hardware/lm4f/variants/stellarpad/pins_energia.h
+++ b/hardware/lm4f/variants/stellarpad/pins_energia.h
@@ -36,6 +36,8 @@
 #define __LM4F120H5QR__
 #define __TM4C123GH6PM__
 
+#define HAS_40_PIN_BOOSTERPACK
+
 #ifndef BV 
 #define BV(x) (1 << (x)) 
 #endif 
diff --git a/hardware/msp430/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp b/hardware/msp430/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
index 5ec7a3bc065..39349f0a0ca 100644
--- a/hardware/msp430/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
+++ b/hardware/msp430/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
@@ -65,7 +65,8 @@
 #define HX8353E_GETHID   0xd0
 #define HX8353E_SETGAMMA 0xE0
 Screen_HX8353E::Screen_HX8353E() {
-#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+    //#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+#if defined(#define HAS_40_PIN_BOOSTERPACK)
     _pinReset          = 17;
     _pinDataCommand    = 31;
     _pinChipSelect     = 13;
diff --git a/hardware/msp430/variants/fraunchpad/pins_energia.h b/hardware/msp430/variants/fraunchpad/pins_energia.h
index 8962d401aa2..8bacad25d2c 100644
--- a/hardware/msp430/variants/fraunchpad/pins_energia.h
+++ b/hardware/msp430/variants/fraunchpad/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_20_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp430/variants/launchpad/pins_energia.h b/hardware/msp430/variants/launchpad/pins_energia.h
index 5cacb50b1fd..a416accf5e1 100644
--- a/hardware/msp430/variants/launchpad/pins_energia.h
+++ b/hardware/msp430/variants/launchpad/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_20_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp430/variants/launchpad_f5529/pins_energia.h b/hardware/msp430/variants/launchpad_f5529/pins_energia.h
index 097e4c9ccba..32cc8ecc3d8 100644
--- a/hardware/msp430/variants/launchpad_f5529/pins_energia.h
+++ b/hardware/msp430/variants/launchpad_f5529/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_40_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp430/variants/launchpad_fr4133/pins_energia.h b/hardware/msp430/variants/launchpad_fr4133/pins_energia.h
index c4b79edabe9..f66c4ef6d14 100644
--- a/hardware/msp430/variants/launchpad_fr4133/pins_energia.h
+++ b/hardware/msp430/variants/launchpad_fr4133/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_20_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp430/variants/launchpad_fr5969/pins_energia.h b/hardware/msp430/variants/launchpad_fr5969/pins_energia.h
index 478d9860469..34d14bce438 100644
--- a/hardware/msp430/variants/launchpad_fr5969/pins_energia.h
+++ b/hardware/msp430/variants/launchpad_fr5969/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_20_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp430/variants/launchpad_fr6989/pins_energia.h b/hardware/msp430/variants/launchpad_fr6989/pins_energia.h
index f0ba082d8ef..5bf575d642e 100644
--- a/hardware/msp430/variants/launchpad_fr6989/pins_energia.h
+++ b/hardware/msp430/variants/launchpad_fr6989/pins_energia.h
@@ -32,6 +32,9 @@
 
 #ifndef Pins_Energia_h
 #define Pins_Energia_h
+
+#define HAS_40_PIN_BOOSTERPACK
+
 #ifndef BV
 #define BV(x) (1 << (x))
 #endif
diff --git a/hardware/msp432/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp b/hardware/msp432/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
index 5ec7a3bc065..39349f0a0ca 100644
--- a/hardware/msp432/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
+++ b/hardware/msp432/libraries/EduBPMKII_Screen/Screen_HX8353E.cpp
@@ -65,7 +65,8 @@
 #define HX8353E_GETHID   0xd0
 #define HX8353E_SETGAMMA 0xE0
 Screen_HX8353E::Screen_HX8353E() {
-#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+    //#if defined(__LM4F120H5QR__) || defined(__MSP430F5529__) || defined(__TM4C123GH6PM__) || defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__)
+#if defined(#define HAS_40_PIN_BOOSTERPACK)
     _pinReset          = 17;
     _pinDataCommand    = 31;
     _pinChipSelect     = 13;