implmented complementary filter
Revision 14:3a88e2ff556d, committed 2018-12-13
- Comitter:
- bjbance
- Date:
- Thu Dec 13 11:16:40 2018 +0000
- Parent:
- 13:346783d1f8e1
- Commit message:
- temp
Changed in this revision
max32630fthr.cpp | Show annotated file Show diff for this revision Revisions of this file |
max32630fthr.h | Show annotated file Show diff for this revision Revisions of this file |
diff -r 346783d1f8e1 -r 3a88e2ff556d max32630fthr.cpp --- a/max32630fthr.cpp Tue Dec 04 09:51:09 2018 +0000 +++ b/max32630fthr.cpp Thu Dec 13 11:16:40 2018 +0000 @@ -38,12 +38,12 @@ #include "max32630fthr.h" //****************************************************************************** -MAX32630FTHR::MAX32630FTHR() : i2c(P5_7, P6_0), max14690(&i2c) -{ -} +//MAX32630FTHR::MAX32630FTHR() : i2c(P5_7, P6_0), max14690(&i2c) +//{ +//} //****************************************************************************** -MAX32630FTHR::MAX32630FTHR(vio_t vio) : i2c(P5_7, P6_0), max14690(&i2c) +MAX32630FTHR::MAX32630FTHR(vio_t vio) : i2c(P5_7, P6_0) //,max14690(&i2c) { init(vio); } @@ -54,9 +54,10 @@ } //****************************************************************************** + int MAX32630FTHR::init(vio_t hdrVio) { - // Override the default values + /*/ Override the default values max14690.ldo2Millivolts = 3300; max14690.ldo3Millivolts = 3300; max14690.ldo2Mode = MAX14690::LDO_ENABLED; @@ -69,7 +70,7 @@ if (max14690.init() == MAX14690_ERROR) { printf("Error initializing MAX14690"); } - +*/ // Set micro SD card pins to 3.3V vddioh(P0_4, VIO_3V3); vddioh(P0_5, VIO_3V3);
diff -r 346783d1f8e1 -r 3a88e2ff556d max32630fthr.h --- a/max32630fthr.h Tue Dec 04 09:51:09 2018 +0000 +++ b/max32630fthr.h Thu Dec 13 11:16:40 2018 +0000 @@ -35,7 +35,7 @@ #define _MAX32630FTHR_H_ #include "mbed.h" -#include "MAX14690.h" +//#include "MAX14690.h" /** * @brief MAX32630FTHR Board Support Library @@ -125,7 +125,7 @@ I2C i2c; /// MAX14690 PMIC Instance - MAX14690 max14690; + //MAX14690 max14690; };