From cf26f28cd0a15f2462b36699ba83d97600f1962c Mon Sep 17 00:00:00 2001
From: Joey Castillo <joeycastillo@utexas.edu>
Date: Sat, 17 May 2025 17:55:02 -0400
Subject: [PATCH] irda_demo -> irda_upload

---
 movement_faces.h                               |  2 +-
 watch-faces.mk                                 |  2 +-
 watch-faces/demo/file_demo_face.h              |  2 +-
 .../irda_demo_face.c => io/irda_upload_face.c} | 10 +++++-----
 .../irda_demo_face.h => io/irda_upload_face.h} | 18 +++++++++---------
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename watch-faces/{demo/irda_demo_face.c => io/irda_upload_face.c} (95%)
 rename watch-faces/{demo/irda_demo_face.h => io/irda_upload_face.h} (78%)

diff --git a/movement_faces.h b/movement_faces.h
index c9ebe2e6..a43fbfb1 100644
--- a/movement_faces.h
+++ b/movement_faces.h
@@ -46,7 +46,7 @@
 #include "preferences_face.h"
 #include "settings_face.h"
 #include "light_sensor_face.h"
-#include "irda_demo_face.h"
+#include "irda_upload_face.h"
 #include "file_demo_face.h"
 #include "chirpy_demo_face.h"
 // New includes go above this line.
diff --git a/watch-faces.mk b/watch-faces.mk
index eadd5b5f..b90b33f0 100644
--- a/watch-faces.mk
+++ b/watch-faces.mk
@@ -21,7 +21,7 @@ SRCS += \
   ./watch-faces/settings/preferences_face.c \
   ./watch-faces/settings/settings_face.c \
   ./watch-faces/demo/light_sensor_face.c \
-  ./watch-faces/demo/irda_demo_face.c \
   ./watch-faces/demo/file_demo_face.c \
   ./watch-faces/io/chirpy_demo_face.c \
+  ./watch-faces/io/irda_upload_face.c \
 # New watch faces go above this line.
diff --git a/watch-faces/demo/file_demo_face.h b/watch-faces/demo/file_demo_face.h
index 75995d68..1f06aaaa 100644
--- a/watch-faces/demo/file_demo_face.h
+++ b/watch-faces/demo/file_demo_face.h
@@ -30,7 +30,7 @@
  * FILE DISPLAY DEMO
  *
  * Displays the contents of a file on the watch. 
- * For use with the irda_demo_face that allows uploading files to the watch.
+ * For use with the irda_upload_face that allows uploading files to the watch.
  *
  */
 
diff --git a/watch-faces/demo/irda_demo_face.c b/watch-faces/io/irda_upload_face.c
similarity index 95%
rename from watch-faces/demo/irda_demo_face.c
rename to watch-faces/io/irda_upload_face.c
index d6a0ac5a..89fc3282 100644
--- a/watch-faces/demo/irda_demo_face.c
+++ b/watch-faces/io/irda_upload_face.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "irda_demo_face.h"
+#include "irda_upload_face.h"
 #include "tc.h"
 #include "eic.h"
 #include "usb.h"
@@ -33,7 +33,7 @@
 
 #ifdef HAS_IR_SENSOR
 
-void irda_demo_face_setup(uint8_t watch_face_index, void ** context_ptr) {
+void irda_upload_face_setup(uint8_t watch_face_index, void ** context_ptr) {
     (void) watch_face_index;
     if (*context_ptr == NULL) {
         *context_ptr = malloc(sizeof(irda_demo_state_t));
@@ -42,7 +42,7 @@ void irda_demo_face_setup(uint8_t watch_face_index, void ** context_ptr) {
     }    
 }
 
-void irda_demo_face_activate(void *context) {
+void irda_upload_face_activate(void *context) {
     irda_demo_state_t *state = (irda_demo_state_t *)context;
     (void) state;
     HAL_GPIO_IR_ENABLE_out();
@@ -54,7 +54,7 @@ void irda_demo_face_activate(void *context) {
     uart_enable_instance(0);
 }
 
-bool irda_demo_face_loop(movement_event_t event, void *context) {
+bool irda_upload_face_loop(movement_event_t event, void *context) {
     irda_demo_state_t *state = (irda_demo_state_t *)context;
     (void) state;
 
@@ -131,7 +131,7 @@ bool irda_demo_face_loop(movement_event_t event, void *context) {
     return false;
 }
 
-void irda_demo_face_resign(void *context) {
+void irda_upload_face_resign(void *context) {
     (void) context;
     uart_disable_instance(0);
     HAL_GPIO_IRSENSE_pmuxdis();
diff --git a/watch-faces/demo/irda_demo_face.h b/watch-faces/io/irda_upload_face.h
similarity index 78%
rename from watch-faces/demo/irda_demo_face.h
rename to watch-faces/io/irda_upload_face.h
index 5c345b80..023ef429 100644
--- a/watch-faces/demo/irda_demo_face.h
+++ b/watch-faces/io/irda_upload_face.h
@@ -40,16 +40,16 @@ typedef struct {
     uint8_t unused;
 } irda_demo_state_t;
 
-void irda_demo_face_setup(uint8_t watch_face_index, void ** context_ptr);
-void irda_demo_face_activate(void *context);
-bool irda_demo_face_loop(movement_event_t event, void *context);
-void irda_demo_face_resign(void *context);
+void irda_upload_face_setup(uint8_t watch_face_index, void ** context_ptr);
+void irda_upload_face_activate(void *context);
+bool irda_upload_face_loop(movement_event_t event, void *context);
+void irda_upload_face_resign(void *context);
 
-#define irda_demo_face ((const watch_face_t){ \
-    irda_demo_face_setup, \
-    irda_demo_face_activate, \
-    irda_demo_face_loop, \
-    irda_demo_face_resign, \
+#define irda_upload_face ((const watch_face_t){ \
+    irda_upload_face_setup, \
+    irda_upload_face_activate, \
+    irda_upload_face_loop, \
+    irda_upload_face_resign, \
     NULL, \
 })