Diff: main.cpp

Revision:

69:12b1170b510a

Parent:

62:67e2353604be

Child:

70:c6b61c5cadf4

--- a/main.cpp	Thu Mar 23 13:06:41 2017 +0000
+++ b/main.cpp	Fri Mar 24 10:58:11 2017 +0100
@@ -176,8 +176,8 @@
 	uint8_t id1, id2;
 
 	/* Determine ID of Humidity & Temperature Sensor */
-	CALL_METH(humidity_sensor, ReadID, &id1, 0x0);
-	CALL_METH(temp_sensor1, ReadID, &id2, 0x0);
+	CALL_METH(humidity_sensor, read_id, &id1, 0x0);
+	CALL_METH(temp_sensor1, read_id, &id2, 0x0);
     	printf("Humidity  | Temperature Sensor ID = %s (0x%x | 0x%x)\n", 
 	       ((id1 == I_AM_HTS221) ? "HTS221 " : "UNKNOWN"),
 	       id1, id2
@@ -187,8 +187,8 @@
 	/* Determine ID of Gyro & Motion Sensor */
 	assert((mems_expansion_board->gyro_lsm6ds0 == NULL) ||
 	       (mems_expansion_board->gyro_lsm6ds3 == NULL));
-	CALL_METH(gyroscope, ReadID, &id1, 0x0);
-	CALL_METH(accelerometer, ReadID, &id2, 0x0);
+	CALL_METH(gyroscope, read_id, &id1, 0x0);
+	CALL_METH(accelerometer, read_id, &id2, 0x0);
     	printf("Gyroscope | Motion Sensor ID      = %s (0x%x | 0x%x)\n", 
 	       ((id1 == I_AM_LSM6DS3_XG) ? "LSM6DS3" : 
 		((id1 == I_AM_LSM6DS0_XG) ? "LSM6DS0" : "UNKNOWN")),
@@ -223,13 +223,13 @@
 	printf("===\n");
 
 	/* Determine Environmental Values */
-	ret |= (!CALL_METH(temp_sensor1, GetTemperature, &TEMPERATURE_Value, 0.0f) ? 0x0 : 0x1);
-	ret |= (!CALL_METH(humidity_sensor, GetHumidity, &HUMIDITY_Value, 0.0f) ? 0x0 : 0x2);;
-	ret |= (!CALL_METH(pressure_sensor, GetPressure, &PRESSURE_Value, 0.0f) ? 0x0 : 0x4);;
-	ret |= (!CALL_METH(temp_sensor2, GetFahrenheit, &PRESSURE_Temp_Value, 0.0f) ? 0x0 : 0x8);;
-	ret |= (!CALL_METH(magnetometer, Get_M_Axes, (int32_t *)&MAG_Value, 0) ? 0x0 : 0x10);;
-	ret |= (!CALL_METH(accelerometer, Get_X_Axes, (int32_t *)&ACC_Value, 0) ? 0x0 : 0x20);;
-	ret |= (!CALL_METH(gyroscope, Get_G_Axes, (int32_t *)&GYR_Value, 0) ? 0x0 : 0x40);
+	ret |= (!CALL_METH(temp_sensor1, get_temperature, &TEMPERATURE_Value, 0.0f) ? 0x0 : 0x1);
+	ret |= (!CALL_METH(humidity_sensor, get_humidity, &HUMIDITY_Value, 0.0f) ? 0x0 : 0x2);;
+	ret |= (!CALL_METH(pressure_sensor, get_pressure, &PRESSURE_Value, 0.0f) ? 0x0 : 0x4);;
+	ret |= (!CALL_METH(temp_sensor2, get_fahrenheit, &PRESSURE_Temp_Value, 0.0f) ? 0x0 : 0x8);;
+	ret |= (!CALL_METH(magnetometer, get_m_axes, (int32_t *)&MAG_Value, 0) ? 0x0 : 0x10);;
+	ret |= (!CALL_METH(accelerometer, get_x_axes, (int32_t *)&ACC_Value, 0) ? 0x0 : 0x20);;
+	ret |= (!CALL_METH(gyroscope, get_g_axes, (int32_t *)&GYR_Value, 0) ? 0x0 : 0x40);
 
 	/* Print Values Out */
         printf("I2C [errors]: 0x%.2x    X         Y         Z\n", ret);