From: Matheus Afonso Martins Moreira <matheus@matheusmoreira.com>
Date: Sat, 7 Sep 2024 23:38:08 +0000 (-0300)
Subject: Merge PR #454 - add simple calculator watch face
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=941a6ec52302444f9dfe0d154a85d04421869d21;p=sensor-watch.git

Merge PR #454 - add simple calculator watch face

Adds a simple calculator watch face to the sensor watch
capable of addition, subtraction, multiplication, division
and exponentiation.

Reviewed-by: Joey Castillo <joeycastillo@utexas.edu>
Reviewed-by: Matheus Afonso Martins Moreira <matheus@matheusmoreira.com>
Tested-by: Joey Castillo <joeycastillo@utexas.edu>
Tested-on-hardware-by: mcguirepr89 <mcguirepr89@gmail.com>
GitHub-Pull-Request: https://github.com/joeycastillo/Sensor-Watch/pull/454
---

941a6ec52302444f9dfe0d154a85d04421869d21
diff --cc movement/make/Makefile
index 221b39f,40b5be3..0de414e
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -129,14 -129,7 +129,15 @@@ SRCS += 
    ../watch_faces/clock/minute_repeater_decimal_face.c \
    ../watch_faces/complication/tuning_tones_face.c \
    ../watch_faces/complication/kitchen_conversions_face.c \
 +  ../watch_faces/complication/wordle_face.c \
 +  ../watch_faces/complication/endless_runner_face.c \
 +  ../watch_faces/complication/periodic_face.c \
 +  ../watch_faces/complication/deadline_face.c
 +  ../watch_faces/complication/higher_lower_game_face.c \
 +  ../watch_faces/clock/french_revolutionary_face.c \
 +  ../watch_faces/clock/minimal_clock_face.c \
 +  ../watch_faces/complication/simon_face.c \
+   ../watch_faces/complication/simple_calculator_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.
diff --cc movement/movement_faces.h
index f5e463f,55d4124..966d69a
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -104,14 -104,7 +104,15 @@@
  #include "minute_repeater_decimal_face.h"
  #include "tuning_tones_face.h"
  #include "kitchen_conversions_face.h"
 +#include "wordle_face.h"
 +#include "endless_runner_face.h"
 +#include "periodic_face.h"
 +#include "deadline_face.h"
 +#include "higher_lower_game_face.h"
 +#include "french_revolutionary_face.h"
 +#include "minimal_clock_face.h"
 +#include "simon_face.h"
+ #include "simple_calculator_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_