Maxim Integrated / ard2pmod

Library for MAXREFDES72# that supports configuration of shield for different PMOD types and the DS3231 RTC

Dependencies:   ds3231 max14661

Dependents:   ard2pmod_demo max14724_hello_world ALS_Proximity_Demo

Ard2Pmod Shield Component Page

Files at this revision

API Documentation at this revision

Revision 16:abb327ca5580, committed 2015-03-19

Comitter:
j3
Date:
Thu Mar 19 21:53:04 2015 +0000
Parent:
15:014ab2d734e0
Commit message:
moved enum into class, updated max14661 and ds3231 libs

Changed in this revision

ard2pmod.h Show annotated file Show diff for this revision Revisions of this file
ds3231.lib Show annotated file Show diff for this revision Revisions of this file
max14661.lib Show annotated file Show diff for this revision Revisions of this file 
diff -r 014ab2d734e0 -r abb327ca5580 ard2pmod.h
--- a/ard2pmod.h	Thu Mar 12 19:37:18 2015 +0000
+++ b/ard2pmod.h	Thu Mar 19 21:53:04 2015 +0000
@@ -57,23 +57,6 @@
 
 #define ARD2PMOD_SDA D14
 #define ARD2PMOD_SCL D15
-
-
-/**
-* pmod_type_t - enumerated PMOD types
-*/
-typedef enum
-{
-	PMOD_TYPE_I2C_A,
-	PMOD_TYPE_I2C_B,
-	PMOD_TYPE_I2C_AB,
-	PMOD_TYPE_1_GPIO,
-	PMOD_TYPE_2_SPI,
-	PMOD_TYPE_3_UART,
-	PMOD_TYPE_4_UART,
-	PMOD_TYPE_5_HBRIDGE,
-	PMOD_TYPE_6_HBRIDGE
-}pmod_type_t;
 	
 	
 /******************************************************************//**
@@ -116,6 +99,24 @@
 class Ard2Pmod : public Max14661, public Ds3231
 {
     public:
+        
+        /**
+		* pmod_type_t - enumerated PMOD types
+		*/
+		typedef enum
+		{
+			PMOD_TYPE_I2C_A,
+			PMOD_TYPE_I2C_B,
+			PMOD_TYPE_I2C_AB,
+			PMOD_TYPE_1_GPIO,
+			PMOD_TYPE_2_SPI,
+			PMOD_TYPE_3_UART,
+			PMOD_TYPE_4_UART,
+			PMOD_TYPE_5_HBRIDGE,
+			PMOD_TYPE_6_HBRIDGE
+		}pmod_type_t;
+
+
     	/**************************************************************//**
 	    * Default constructor for Ard2Pmod Class, all mux switches open
 	    * Use with Max14661 member functions for custom mux settings

diff -r 014ab2d734e0 -r abb327ca5580 ds3231.lib
--- a/ds3231.lib	Thu Mar 12 19:37:18 2015 +0000
+++ b/ds3231.lib	Thu Mar 19 21:53:04 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/Maxim-Integrated/code/ds3231/#b9f13fd8c1b6
+http://developer.mbed.org/teams/Maxim-Integrated/code/ds3231/#11630748e2f2

diff -r 014ab2d734e0 -r abb327ca5580 max14661.lib
--- a/max14661.lib	Thu Mar 12 19:37:18 2015 +0000
+++ b/max14661.lib	Thu Mar 19 21:53:04 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/Maxim-Integrated/code/max14661/#44257d87fa9e
+http://developer.mbed.org/teams/Maxim-Integrated/code/max14661/#27cfbbce3094