Fixup EducationalBP_MKII examples

ncw2k69 · Oct 30, 2015 · 7c01256 · 7c01256
1 parent 1afbec8
commit 7c01256
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.../examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test/EduBP_MKII_Production_Test.ino b/.../examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test/EduBP_MKII_Production_Test.ino
@@ -1,7 +1,8 @@
 
 #include "pitches.h"
+#include <itoa.h>
 #include <Wire.h>
-#include <tmp006.h>
+#include <Adafruit_TMP006.h>
 //#include "OPT3001.h"
 #define USE_USCI_B1 
 #define USING_MSP430F5529_LAUNCHPAD
@@ -281,7 +282,7 @@ float tempReading = 0;
 
 // OPT3001
 //opt3001 opt3001;
-tmp006 tmp006;
+Adafruit_TMP006 tmp006;
 unsigned long readings = 0;
 
 int melody[] = {
@@ -309,7 +310,7 @@ void setup()
   pinMode(BUZZ, OUTPUT);
   Serial.println("Welcome to the Educational BoosterPack MKII Production Test:");
 
-  tmp006.begin(EIGHT_SAMPLES);  // Takes 8 averaged samples for measurement
+  tmp006.begin(TMP006_CFG_8SAMPLE);  // Takes 8 averaged samples for measurement
 //  opt3001.begin(); 
 }
 
@@ -471,7 +472,7 @@ void loop()
   delay(400);
   myScreen.clear(grayColour);
   //TEST TMP006 TEMP SENSOR
-  float temp = tmp006.getTemp();
+  float temp = tmp006.readObjTempC();
   char* tempText;
   char ii;
   tempText = (char*) malloc(10);

diff --git a/build/shared/examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test/pitches.h b/build/shared/examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test/pitches.h
@@ -92,4 +92,4 @@
 #define NOTE_D8  4699
 #define NOTE_DS8 4978
 
-
+
diff --git a/...ducationalBP_MKII/EduBP_MKII_Production_Test_Serial/EduBP_MKII_Production_Test_Serial.ino b/...ducationalBP_MKII/EduBP_MKII_Production_Test_Serial/EduBP_MKII_Production_Test_Serial.ino
@@ -1,7 +1,7 @@
 
 #include "pitches.h"
 #include <Wire.h>
-#include <tmp006.h>
+#include <Adafruit_TMP006.h>
 //#include "OPT3001.h"
 #define USE_USCI_B1 
 #define USING_MSP430F5529_LAUNCHPAD
@@ -281,7 +281,7 @@ float tempReading = 0;
 
 // OPT3001
 //opt3001 opt3001;
-tmp006 tmp006;
+Adafruit_TMP006 tmp006;
 unsigned long readings = 0;
 
 int melody[] = {
@@ -309,7 +309,7 @@ void setup()
   pinMode(BUZZ, OUTPUT);
   Serial.println("Welcome to the Educational BoosterPack MKII Production Test:");
 
-  tmp006.begin(EIGHT_SAMPLES);  // Takes 8 averaged samples for measurement
+  tmp006.begin(TMP006_CFG_8SAMPLE);  // Takes 8 averaged samples for measurement
 //  opt3001.begin(); 
 }
 
@@ -417,7 +417,7 @@ void loop()
   //TEST TMP006 TEMP SENSOR
   Serial.println("Press SW1 to test the TMP006.");
   while(digitalRead(SW1) == 1);
-  float temp = tmp006.getTemp();
+  float temp = tmp006.readObjTempC();
   Serial.print("Temp Reading = ");
   Serial.print(temp);
   Serial.println("*C    ");    

diff --git a/build/shared/examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test_Serial/pitches.h b/build/shared/examples/09.EducationalBP_MKII/EduBP_MKII_Production_Test_Serial/pitches.h
@@ -92,4 +92,4 @@
 #define NOTE_D8  4699
 #define NOTE_DS8 4978
 
-
+
diff --git a/build/shared/examples/09.EducationalBP_MKII/LCD_LifeGame/LCD_LifeGame.ino b/build/shared/examples/09.EducationalBP_MKII/LCD_LifeGame/LCD_LifeGame.ino
@@ -72,10 +72,10 @@ Screen_HX8353E myScreen;
 // Beware of RAM limitations
 #if defined(HX8353E)                                                            // Educational BoosterPack MKII
 
-#if defined(__MSP430F5529__)
+#if defined(__MSP430F5529__) || defined(__CC2650__)
 #define ROWS 32 // max 80
 #define COLS 32 // max 60
-#elif defined(__LM4F120H5QR__) || defined(__TM4C123GH6PM__) 
+#elif defined(__LM4F120H5QR__) || defined(__TM4C123GH6PM__) || defined(__CC3200R1MXRGCR__)
 #define ROWS 64 // max 80
 #define COLS 64 // max 60
 #elif defined(__TM4C1294NCPDT__) || defined(__TM4C1294XNCZAD__) || defined(__MSP432P401R__)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,4 +92,4 @@
		#define NOTE_D8 4699
		#define NOTE_DS8 4978