hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

rpn_calculator: fix compiler warnings

Browse Source
This commit is contained in:
Jeremy O'Brien 2023-01-14 13:20:38 -05:00
parent 9ebea46300
commit 8f4de405ed
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
movement/watch_faces/complication/rpn_calculator_face.c
View File

@ -79,7 +79,7 @@ static void next_op(rpn_calculator_state_t *state) {
// FIXME: this converts the number to string and back, there might // FIXME: this converts the number to string and back, there might
// be better ways to do this // be better ways to do this
static float inc_digit(float num, uint8_t position) { static float inc_digit(float num, uint8_t position) {
char buf[7]; char buf[8];
if (position > 5) { if (position > 5) {
return 0.0; return 0.0;
} }
@ -203,7 +203,7 @@ static void run_op(rpn_calculator_state_t *state) {
state->mode = rpn_calculator_err; state->mode = rpn_calculator_err;
} }
static void draw(rpn_calculator_state_t *state, uint8_t subsecond, movement_settings_t *settings) { static void draw(rpn_calculator_state_t *state, uint8_t subsecond) {
char buf[16]; char buf[16];
switch (state->mode) { switch (state->mode) {
case rpn_calculator_err: case rpn_calculator_err:
@ -234,6 +234,7 @@ static void draw(rpn_calculator_state_t *state, uint8_t subsecond, movement_sett
void rpn_calculator_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { void rpn_calculator_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
(void) settings; (void) settings;
(void) watch_face_index;
if (*context_ptr == NULL) { if (*context_ptr == NULL) {
*context_ptr = malloc(sizeof(rpn_calculator_state_t)); *context_ptr = malloc(sizeof(rpn_calculator_state_t));
memset(*context_ptr, 0, sizeof(rpn_calculator_state_t)); memset(*context_ptr, 0, sizeof(rpn_calculator_state_t));
@ -246,29 +247,30 @@ void rpn_calculator_face_setup(movement_settings_t *settings, uint8_t watch_face
void rpn_calculator_face_activate(movement_settings_t *settings, void *context) { void rpn_calculator_face_activate(movement_settings_t *settings, void *context) {
(void) settings; (void) settings;
rpn_calculator_state_t *state = (rpn_calculator_state_t *)context; (void) context;
(void) state;
// Handle any tasks related to your watch face coming on screen. // Handle any tasks related to your watch face coming on screen.
} }
bool rpn_calculator_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { bool rpn_calculator_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
(void) settings;
rpn_calculator_state_t *state = (rpn_calculator_state_t *)context; rpn_calculator_state_t *state = (rpn_calculator_state_t *)context;
switch (event.event_type) { switch (event.event_type) {
case EVENT_ACTIVATE: case EVENT_ACTIVATE:
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
case EVENT_TICK: case EVENT_TICK:
if (state->mode == rpn_calculator_number) { if (state->mode == rpn_calculator_number) {
draw(state, event.subsecond, settings); draw(state, event.subsecond);
} }
break; break;
case EVENT_MODE_BUTTON_UP: case EVENT_MODE_BUTTON_UP:
switch (state->mode) { switch (state->mode) {
case rpn_calculator_number: case rpn_calculator_number:
state->mode = rpn_calculator_waiting; state->mode = rpn_calculator_waiting;
draw(state, event.subsecond, settings); draw(state, event.subsecond);
movement_request_tick_frequency(1); movement_request_tick_frequency(1);
break; break;
default: default:
@ -282,15 +284,15 @@ bool rpn_calculator_face_loop(movement_event_t event, movement_settings_t *setti
switch (state->mode) { switch (state->mode) {
case rpn_calculator_waiting: case rpn_calculator_waiting:
state->mode = rpn_calculator_op; state->mode = rpn_calculator_op;
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
case rpn_calculator_number: case rpn_calculator_number:
state->selection = (state->selection + 1) % 6; state->selection = (state->selection + 1) % 6;
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
case rpn_calculator_op: case rpn_calculator_op:
next_op(state); next_op(state);
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
default: default:
movement_illuminate_led(); movement_illuminate_led();
@ -303,21 +305,21 @@ bool rpn_calculator_face_loop(movement_event_t event, movement_settings_t *setti
state->mode = rpn_calculator_number; state->mode = rpn_calculator_number;
state->selection = 2; state->selection = 2;
stack_push(state, 0); stack_push(state, 0);
draw(state, event.subsecond, settings); draw(state, event.subsecond);
movement_request_tick_frequency(4); movement_request_tick_frequency(4);
break; break;
case rpn_calculator_number: case rpn_calculator_number:
state->stack[state->top] = inc_digit(state->stack[state->top], state->selection); state->stack[state->top] = inc_digit(state->stack[state->top], state->selection);
printf_stack(state); printf_stack(state);
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
case rpn_calculator_err: case rpn_calculator_err:
state->mode = rpn_calculator_waiting; state->mode = rpn_calculator_waiting;
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
case rpn_calculator_op: case rpn_calculator_op:
run_op(state); run_op(state);
draw(state, event.subsecond, settings); draw(state, event.subsecond);
break; break;
default: default:
break; break;