This is an automated email from the ASF dual-hosted git repository.
vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 15786c7 Revert accidental sensor_test app changes
15786c7 is described below
commit 15786c71772a86541a3e6d119e3b3a5a6f7eb246
Author: Vipul Rahane <vipulrah...@apache.org>
AuthorDate: Thu Feb 22 13:44:15 2018 -0800
Revert accidental sensor_test app changes
- Reverting accidental sensor_test app changes made by #718
---
apps/sensors_test/src/main.c | 38 --------------------------------------
1 file changed, 38 deletions(-)
diff --git a/apps/sensors_test/src/main.c b/apps/sensors_test/src/main.c
index 6b3af90..fe4a862 100755
--- a/apps/sensors_test/src/main.c
+++ b/apps/sensors_test/src/main.c
@@ -36,8 +36,6 @@
#include <id/id.h>
#include <os/os_time.h>
#include <defs/error.h>
-#include <sensor/accel.h>
-#include <sensor/sensor.h>
#if MYNEWT_VAL(BNO055_CLI)
#include <bno055/bno055.h>
@@ -82,10 +80,6 @@ static const oc_handler_t sensor_oic_handler = {
/* Application-specified header. */
#include "bleprph.h"
-struct sensor_type_traits stt;
-struct sensor_accel_data sad_low;
-struct sensor_accel_data sad_high;
-
#if MYNEWT_VAL(SENSOR_OIC)
static int sensor_oic_gap_event(struct ble_gap_event *event, void *arg);
#endif
@@ -278,9 +272,6 @@ sensor_oic_gap_event(struct ble_gap_event *event, void *arg)
oc_ble_coap_conn_del(event->disconnect.conn.conn_handle);
- sensor_clear_low_thresh("lis2dh12_0", SENSOR_TYPE_ACCELEROMETER);
- sensor_clear_high_thresh("lis2dh12_0", SENSOR_TYPE_ACCELEROMETER);
-
/* Connection terminated; resume advertising. */
sensor_oic_advertise();
return 0;
@@ -534,35 +525,6 @@ main(int argc, char **argv)
/* log reboot */
reboot_start(hal_reset_cause());
- stt = (struct sensor_type_traits) {
- .stt_sensor_type = SENSOR_TYPE_ACCELEROMETER,
- .stt_low_thresh.sad = &sad_low,
- .stt_high_thresh.sad = &sad_high,
- .stt_algo = SENSOR_THRESH_ALGO_WATERMARK
- };
-
- /* The thresholds are specified in m/s^2 */
-
- sad_low = (struct sensor_accel_data) {
- .sad_x = 0.6712,
- .sad_x_is_valid = 1,
- .sad_y = 0.6712,
- .sad_y_is_valid = 1,
- .sad_z = 0.6712,
- .sad_z_is_valid = 1
- };
-
- sad_high = (struct sensor_accel_data) {
- .sad_x = 0.6712,
- .sad_x_is_valid = 1,
- .sad_y = 0.6712,
- .sad_y_is_valid = 1,
- .sad_z = 0.6712,
- .sad_z_is_valid = 1
- };
-
- sensor_set_thresh("lis2dh12_0", &stt);
-
/*
* As the last thing, process events from default event queue.
*/
--
To stop receiving notification emails like this one, please contact
vipulrah...@apache.org.
