Skip to content

Commit

Permalink
add accelerometer interrupt counter (#452)
Browse files Browse the repository at this point in the history
  • Loading branch information
joeycastillo authored Sep 18, 2024
1 parent bf4d461 commit fc2f9c5
Show file tree
Hide file tree
Showing 5 changed files with 225 additions and 2 deletions.
1 change: 1 addition & 0 deletions movement/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ SRCS += \
../watch_faces/complication/simple_calculator_face.c \
../watch_faces/sensor/alarm_thermometer_face.c \
../watch_faces/demo/beeps_face.c \
../watch_faces/sensor/accel_interrupt_count_face.c \
# New watch faces go above this line.

# Leave this line at the bottom of the file; it has all the targets for making your project.
Expand Down
1 change: 1 addition & 0 deletions movement/movement_faces.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
#include "simple_calculator_face.h"
#include "alarm_thermometer_face.h"
#include "beeps_face.h"
#include "accel_interrupt_count_face.h"
// New includes go above this line.

#endif // MOVEMENT_FACES_H_
5 changes: 3 additions & 2 deletions movement/watch_faces/demo/lis2dw_logging_face.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ static void _lis2dw_logging_face_update_display(movement_settings_t *settings, l
watch_display_string(buf, 0);
if (set_leading_zero)
watch_display_string("0", 4);
printf("%s\n", buf);
}

static void _lis2dw_logging_face_log_data(lis2dw_logger_state_t *logger_state) {
Expand Down Expand Up @@ -142,7 +143,7 @@ void lis2dw_logging_face_activate(movement_settings_t *settings, void *context)

logger_state->display_index = 0;
logger_state->log_ticks = 0;
watch_enable_digital_input(A0);
watch_enable_digital_input(A4);
}

bool lis2dw_logging_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
Expand Down Expand Up @@ -196,7 +197,7 @@ bool lis2dw_logging_face_loop(movement_event_t event, movement_settings_t *setti
void lis2dw_logging_face_resign(movement_settings_t *settings, void *context) {
(void) settings;
(void) context;
watch_disable_digital_input(A0);
watch_disable_digital_input(A4);
}

bool lis2dw_logging_face_wants_background_task(movement_settings_t *settings, void *context) {
Expand Down
162 changes: 162 additions & 0 deletions movement/watch_faces/sensor/accel_interrupt_count_face.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
/*
* MIT License
*
* Copyright (c) 2022 Joey Castillo
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#include <stdlib.h>
#include <string.h>
#include "accel_interrupt_count_face.h"
#include "lis2dw.h"
#include "watch.h"

// hacky hacky!
uint32_t *ptr_to_count = 0;

void accel_interrupt_handler(void);
void accel_interrupt_handler(void) {
(*ptr_to_count)++;
}

static void _accel_interrupt_count_face_update_display(accel_interrupt_count_state_t *state) {
char buf[11];

if (state->running) {
watch_set_indicator(WATCH_INDICATOR_SIGNAL);
} else {
watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
}

// "AC"celerometer "IN"terrupts
snprintf(buf, 11, "AC1N%6ld", state->count);
watch_display_string(buf, 0);
printf("%s\n", buf);
}

static void _accel_interrupt_count_face_configure_threshold(uint8_t threshold) {
lis2dw_configure_wakeup_int1(threshold, false, true);
}

void accel_interrupt_count_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
(void) settings;
(void) watch_face_index;
if (*context_ptr == NULL) {
*context_ptr = malloc(sizeof(accel_interrupt_count_state_t));
memset(*context_ptr, 0, sizeof(accel_interrupt_count_state_t));
ptr_to_count = &((accel_interrupt_count_state_t *)*context_ptr)->count;
watch_enable_i2c();
lis2dw_begin();
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_low_noise_mode(true); // consumes a little more power
lis2dw_set_range(LIS2DW_CTRL6_VAL_RANGE_4G);
lis2dw_set_data_rate(LIS2DW_DATA_RATE_25_HZ); // is this enough?

// threshold is 1/64th of full scale, so for a FS of ±4G this is 1.25G
((accel_interrupt_count_state_t *)*context_ptr)->threshold = 10;
_accel_interrupt_count_face_configure_threshold(((accel_interrupt_count_state_t *)*context_ptr)->threshold);
}
}

void accel_interrupt_count_face_activate(movement_settings_t *settings, void *context) {
accel_interrupt_count_state_t *state = (accel_interrupt_count_state_t *)context;

// never in settings mode at the start
state->is_setting = false;

// force LE interval to never sleep
settings->bit.le_interval = 0;
}

bool accel_interrupt_count_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
accel_interrupt_count_state_t *state = (accel_interrupt_count_state_t *)context;

if (state->is_setting) {
switch (event.event_type) {
case EVENT_LIGHT_BUTTON_DOWN:
state->new_threshold = (state->new_threshold + 1) % 64;
// fall through
case EVENT_TICK:
{
char buf[11];
snprintf(buf, 11, "TH %4d ", state->new_threshold);
watch_display_string(buf, 0);
printf("%s\n", buf);
}
break;
case EVENT_ALARM_BUTTON_UP:
lis2dw_configure_wakeup_int1(state->threshold, false, true);
state->threshold = state->new_threshold;
state->is_setting = false;
break;
default:
movement_default_loop_handler(event, settings);
break;
}
} else {
switch (event.event_type) {
case EVENT_LIGHT_BUTTON_DOWN:
movement_illuminate_led();

// if stopped, reset the count
if (!state->running) {
state->count = 0;
}
_accel_interrupt_count_face_update_display(state);
break;
case EVENT_ALARM_BUTTON_UP:
if (state->running) {
state->running = false;
watch_register_interrupt_callback(A4, NULL, INTERRUPT_TRIGGER_RISING);
} else {
state->running = true;
watch_register_interrupt_callback(A4, accel_interrupt_handler, INTERRUPT_TRIGGER_RISING);
}
_accel_interrupt_count_face_update_display(state);
break;
case EVENT_ACTIVATE:
case EVENT_TICK:
_accel_interrupt_count_face_update_display(state);
break;
case EVENT_ALARM_LONG_PRESS:
if (!state->running) {
state->new_threshold = state->threshold;
state->is_setting = true;
}
return false;
default:
movement_default_loop_handler(event, settings);
break;
}
}

return true;
}

void accel_interrupt_count_face_resign(movement_settings_t *settings, void *context) {
(void) settings;
(void) context;
}

bool accel_interrupt_count_face_wants_background_task(movement_settings_t *settings, void *context) {
(void) settings;
(void) context;
return false;
}
58 changes: 58 additions & 0 deletions movement/watch_faces/sensor/accel_interrupt_count_face.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* MIT License
*
* Copyright (c) 2022 Joey Castillo
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#pragma once

/*
* Accelerometer Interrupt Counter
*
* This is an experimental watch face for counting the number of interrupts that
* the Sensor Watch Motion acceleromoeter board fires. I expect it will be removed
* once we integrate accelerometer functionality more deeply into Movement.
*/

#include "movement.h"
#include "watch.h"

typedef struct {
uint32_t count;
uint8_t new_threshold;
uint8_t threshold;
bool running;
bool is_setting;
} accel_interrupt_count_state_t;

void accel_interrupt_count_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
void accel_interrupt_count_face_activate(movement_settings_t *settings, void *context);
bool accel_interrupt_count_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
void accel_interrupt_count_face_resign(movement_settings_t *settings, void *context);
bool accel_interrupt_count_face_wants_background_task(movement_settings_t *settings, void *context);

#define accel_interrupt_count_face ((const watch_face_t){ \
accel_interrupt_count_face_setup, \
accel_interrupt_count_face_activate, \
accel_interrupt_count_face_loop, \
accel_interrupt_count_face_resign, \
accel_interrupt_count_face_wants_background_task, \
})

0 comments on commit fc2f9c5

Please sign in to comment.