Move Accel probe into class

workspace/TS100/Core/Inc/LIS2DH12.hpp

@@ -1,42 +1,46 @@
-/*
- * LIS2DH12.hpp
- *
- *  Created on: 27Feb.,2018
- *      Author: Ralim
- */
-
-#ifndef LIS2DH12_HPP_
-#define LIS2DH12_HPP_
-#include "stm32f1xx_hal.h"
-#include "FRToSI2C.hpp"
-#include "LIS2DH12_defines.hpp"
-#include "hardware.h"
-
-class LIS2DH12 {
-public:
-	static void initalize();
-	//1 = rh, 2,=lh, 8=flat
-	static Orientation getOrientation() {
-#ifdef MODEL_TS80
-		uint8_t val = (FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,
-		LIS_INT2_SRC) >> 2);
-		if (val == 8)
-			val = 3;
-		else if (val == 1)
-			val = 1;
-		else if (val == 2)
-			val = 0;
-		else
-			val = 3;
-		return static_cast<Orientation>(val);
-#endif
-#ifdef MODEL_TS100
-		return static_cast<Orientation>((FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,LIS_INT2_SRC) >> 2) - 1);
-#endif
-	}
-	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);
-
-private:
-};
-
-#endif /* LIS2DH12_HPP_ */
+/*
+ * LIS2DH12.hpp
+ *
+ *  Created on: 27Feb.,2018
+ *      Author: Ralim
+ */
+
+#ifndef LIS2DH12_HPP_
+#define LIS2DH12_HPP_
+#include "stm32f1xx_hal.h"
+#include "FRToSI2C.hpp"
+#include "LIS2DH12_defines.hpp"
+#include "hardware.h"
+
+#ifdef MODEL_TS80
+#define LIS_ORI_FLIP
+#endif
+class LIS2DH12 {
+public:
+	static bool detect();
+	static void initalize();
+	//1 = rh, 2,=lh, 8=flat
+	static Orientation getOrientation() {
+#ifdef LIS_ORI_FLIP
+		uint8_t val = (FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,
+		LIS_INT2_SRC) >> 2);
+		if (val == 8)
+			val = 3;
+		else if (val == 1)
+			val = 1;
+		else if (val == 2)
+			val = 0;
+		else
+			val = 3;
+		return static_cast<Orientation>(val);
+#endif
+#ifdef MODEL_TS100
+		return static_cast<Orientation>((FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,LIS_INT2_SRC) >> 2) - 1);
+#endif
+	}
+	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);
+
+private:
+};
+
+#endif /* LIS2DH12_HPP_ */

workspace/TS100/Core/Inc/MMA8652FC.hpp

@@ -1,27 +1,28 @@
-/*
- * MMA8652FC.h
- *
- *  Created on: 31Aug.,2017
- *      Author: Ben V. Brown
- */
-
-#ifndef MMA8652FC_HPP_
-#define MMA8652FC_HPP_
-#include "stm32f1xx_hal.h"
-#include "MMA8652FC_defines.h"
-#include "FRToSI2C.hpp"
-#include "hardware.h"
-
-class MMA8652FC {
-
-public:
-
-
-	static void initalize();		// Initalize the system
-	static Orientation getOrientation();// Reads the I2C register and returns the orientation (true == left)
-	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);
-
-private:
-};
-
-#endif /* MMA8652FC_HPP_ */
+/*
+ * MMA8652FC.h
+ *
+ *  Created on: 31Aug.,2017
+ *      Author: Ben V. Brown
+ */
+
+#ifndef MMA8652FC_HPP_
+#define MMA8652FC_HPP_
+#include "stm32f1xx_hal.h"
+#include "MMA8652FC_defines.h"
+#include "FRToSI2C.hpp"
+#include "hardware.h"
+
+class MMA8652FC {
+
+public:
+	//Returns true if this accelerometer is detected
+	static bool detect();
+	//Init any internal state
+	static void initalize();
+	static Orientation getOrientation(); // Reads the I2C register and returns the orientation (true == left)
+	static void getAxisReadings(int16_t &x, int16_t &y, int16_t &z);
+
+private:
+};
+
+#endif /* MMA8652FC_HPP_ */