1 files changed, 24 insertions, 35 deletions

diff --git a/apps/accelerometer-test/app.c b/apps/accelerometer-test/app.c
index 8bd6537e..4dee3fe5 100644
--- a/apps/accelerometer-test/app.c
+++ b/apps/accelerometer-test/app.c
@@ -3,21 +3,15 @@
 #include <stdlib.h>
 #include <math.h>
 #include "watch.h"
-#include "lis2dh.h"
+#include "lis2dw.h"
 
-// This application displays data from the old Sensor Watch Motion sensor board.
-// Note that this board required A0 to be set high to power the sensor.
-// Future accelerometer boards will be powered directly from VCC.
-// Also note that this board has its INT1 pin wired to A1, which is not an external
-// wake pin. Future accelerometer boards will wire interrupt pins to A2 and A4.
-
-void cb_light_pressed(void) {
+static void cb_light_pressed(void) {
 }
 
-void cb_mode_pressed(void) {
+static void cb_mode_pressed(void) {
 }
 
-void cb_alarm_pressed(void) {
+static void cb_alarm_pressed(void) {
 }
 
 uint8_t interrupts = 0;
@@ -25,25 +19,24 @@ uint8_t last_interrupts = 0;
 uint8_t ticks = 0;
 char buf[13] = {0};
 
-void cb_interrupt_1(void) {
-    interrupts++;
-}
-
-void cb_tick(void) {
-    if (++ticks == 30) {
-        last_interrupts = interrupts;
-        interrupts = 0;
-        ticks = 0;
-    }
+static void cb_tick(void) {
+    watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
+    if (!lis2dw_have_new_data()) return;
+
+    watch_set_indicator(WATCH_INDICATOR_SIGNAL);
+    lis2dw_reading raw_reading;
+    lis2dw_acceleration_measurement measurement = lis2dw_get_acceleration_measurement(&raw_reading);
+    printf("%f, %f, %f\n", measurement.x, measurement.y, measurement.z);
+    char buf[128];
+    sprintf(buf, "%f, %f, %f\n", measurement.x, measurement.y, measurement.z);
+    watch_debug_puts(buf);
 }
 
 void app_init(void) {
-    gpio_set_pin_direction(A0, GPIO_DIRECTION_OUT);
-    gpio_set_pin_function(A0, GPIO_PIN_FUNCTION_OFF);
-    gpio_set_pin_level(A0, true);
+    watch_enable_debug_uart(9600);
 
     watch_enable_display();
-    watch_display_string("IN 0  0  0", 0);
+    watch_display_string("AC  Strean", 0);
 
     watch_enable_external_interrupts();
     watch_register_interrupt_callback(BTN_MODE, cb_mode_pressed, INTERRUPT_TRIGGER_RISING);
@@ -51,17 +44,13 @@ void app_init(void) {
     watch_register_interrupt_callback(BTN_ALARM, cb_alarm_pressed, INTERRUPT_TRIGGER_RISING);
 
     watch_enable_i2c();
+    lis2dw_begin();
+    lis2dw_set_data_rate(LIS2DW_DATA_RATE_25_HZ); // is this enough for training?
+    lis2dw_set_low_noise_mode(true); // consumes a little more power
+    lis2dw_set_low_power_mode(LIS2DW_LP_MODE_2); // lowest power 14-bit mode, 25 Hz is 3.5 µA @ 1.8V w/ low noise, 3µA without
+    lis2dw_set_range(LIS2DW_CTRL6_VAL_RANGE_4G);
 
-    lis2dh_begin();
-    lis2dh_set_data_rate(LIS2DH_DATA_RATE_10_HZ);
-    lis2dh_configure_aoi_int1(
-        LIS2DH_INTERRUPT_CONFIGURATION_OR |
-        LIS2DH_INTERRUPT_CONFIGURATION_X_HIGH_ENABLE |
-        LIS2DH_INTERRUPT_CONFIGURATION_Y_HIGH_ENABLE |
-        LIS2DH_INTERRUPT_CONFIGURATION_Z_HIGH_ENABLE, 96, 0, true);
-
-    watch_register_interrupt_callback(A1, cb_interrupt_1, INTERRUPT_TRIGGER_RISING);
-    watch_rtc_register_tick_callback(cb_tick);
+    watch_rtc_register_periodic_callback(cb_tick, 64);
 }
 
 void app_wake_from_backup(void) {
@@ -77,7 +66,7 @@ void app_wake_from_standby(void) {
 }
 
 bool app_loop(void) {
-    sprintf(buf, "IN%2d%3d%3d", ticks, interrupts, last_interrupts);
+    // TODO: interrupt configuration for LIS2DW
     watch_display_string(buf, 0);
 
     return true;