From 2e345d9f664e83ef88e889f7fc6e74a700dafd31 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Tue, 25 Jan 2022 17:04:07 -0500 Subject: [PATCH] movement: slight reorganization --- movement/make/Makefile | 28 +++++++++---------- .../blinky_face.c | 0 .../blinky_face.h | 0 .../countdown_face.c | 0 .../countdown_face.h | 0 .../day_one_face.c | 0 .../day_one_face.h | 0 .../pulsometer_face.c | 0 .../pulsometer_face.h | 0 .../stopwatch_face.c | 0 .../stopwatch_face.h | 0 .../sunrise_sunset_face.c | 0 .../sunrise_sunset_face.h | 0 .../totp_face.c | 0 .../totp_face.h | 0 .../{demos => demo}/character_set_face.c | 0 .../{demos => demo}/character_set_face.h | 0 .../watch_faces/{demos => demo}/demo_face.c | 0 .../watch_faces/{demos => demo}/demo_face.h | 0 .../{demos => demo}/hello_there_face.c | 0 .../{demos => demo}/hello_there_face.h | 0 .../{demos => demo}/lis2dh_logging_face.c | 0 .../{demos => demo}/lis2dh_logging_face.h | 0 .../{demos => demo}/voltage_face.c | 0 .../{demos => demo}/voltage_face.h | 0 25 files changed, 14 insertions(+), 14 deletions(-) rename movement/watch_faces/{complications => complication}/blinky_face.c (100%) rename movement/watch_faces/{complications => complication}/blinky_face.h (100%) rename movement/watch_faces/{complications => complication}/countdown_face.c (100%) rename movement/watch_faces/{complications => complication}/countdown_face.h (100%) rename movement/watch_faces/{complications => complication}/day_one_face.c (100%) rename movement/watch_faces/{complications => complication}/day_one_face.h (100%) rename movement/watch_faces/{complications => complication}/pulsometer_face.c (100%) rename movement/watch_faces/{complications => complication}/pulsometer_face.h (100%) rename movement/watch_faces/{complications => complication}/stopwatch_face.c (100%) rename movement/watch_faces/{complications => complication}/stopwatch_face.h (100%) rename movement/watch_faces/{complications => complication}/sunrise_sunset_face.c (100%) rename movement/watch_faces/{complications => complication}/sunrise_sunset_face.h (100%) rename movement/watch_faces/{complications => complication}/totp_face.c (100%) rename movement/watch_faces/{complications => complication}/totp_face.h (100%) rename movement/watch_faces/{demos => demo}/character_set_face.c (100%) rename movement/watch_faces/{demos => demo}/character_set_face.h (100%) rename movement/watch_faces/{demos => demo}/demo_face.c (100%) rename movement/watch_faces/{demos => demo}/demo_face.h (100%) rename movement/watch_faces/{demos => demo}/hello_there_face.c (100%) rename movement/watch_faces/{demos => demo}/hello_there_face.h (100%) rename movement/watch_faces/{demos => demo}/lis2dh_logging_face.c (100%) rename movement/watch_faces/{demos => demo}/lis2dh_logging_face.h (100%) rename movement/watch_faces/{demos => demo}/voltage_face.c (100%) rename movement/watch_faces/{demos => demo}/voltage_face.h (100%) diff --git a/movement/make/Makefile b/movement/make/Makefile index e489a09a..0834eec5 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -13,9 +13,9 @@ INCLUDES += \ -I../watch_faces/ \ -I../watch_faces/clock/ \ -I../watch_faces/settings/ \ - -I../watch_faces/complications/ \ + -I../watch_faces/complication/ \ -I../watch_faces/thermistor/ \ - -I../watch_faces/demos/ \ + -I../watch_faces/demo/ \ -I../lib/TOTP-MCU/ \ -I../lib/sunriset/ \ @@ -35,21 +35,21 @@ SRCS += \ ../watch_faces/clock/beats_face.c \ ../watch_faces/settings/preferences_face.c \ ../watch_faces/settings/set_time_face.c \ - ../watch_faces/complications/pulsometer_face.c \ ../watch_faces/thermistor/thermistor_driver.c \ ../watch_faces/thermistor/thermistor_readout_face.c \ ../watch_faces/thermistor/thermistor_logging_face.c \ - ../watch_faces/demos/character_set_face.c \ - ../watch_faces/demos/voltage_face.c \ - ../watch_faces/demos/lis2dh_logging_face.c \ - ../watch_faces/demos/demo_face.c \ - ../watch_faces/demos/hello_there_face.c \ - ../watch_faces/complications/day_one_face.c \ - ../watch_faces/complications/stopwatch_face.c \ - ../watch_faces/complications/totp_face.c \ - ../watch_faces/complications/sunrise_sunset_face.c \ - ../watch_faces/complications/countdown_face.c \ - ../watch_faces/complications/blinky_face.c \ + ../watch_faces/demo/character_set_face.c \ + ../watch_faces/demo/voltage_face.c \ + ../watch_faces/demo/lis2dh_logging_face.c \ + ../watch_faces/demo/demo_face.c \ + ../watch_faces/demo/hello_there_face.c \ + ../watch_faces/complication/pulsometer_face.c \ + ../watch_faces/complication/day_one_face.c \ + ../watch_faces/complication/stopwatch_face.c \ + ../watch_faces/complication/totp_face.c \ + ../watch_faces/complication/sunrise_sunset_face.c \ + ../watch_faces/complication/countdown_face.c \ + ../watch_faces/complication/blinky_face.c \ # Leave this line at the bottom of the file; it has all the targets for making your project. include $(TOP)/rules.mk diff --git a/movement/watch_faces/complications/blinky_face.c b/movement/watch_faces/complication/blinky_face.c similarity index 100% rename from movement/watch_faces/complications/blinky_face.c rename to movement/watch_faces/complication/blinky_face.c diff --git a/movement/watch_faces/complications/blinky_face.h b/movement/watch_faces/complication/blinky_face.h similarity index 100% rename from movement/watch_faces/complications/blinky_face.h rename to movement/watch_faces/complication/blinky_face.h diff --git a/movement/watch_faces/complications/countdown_face.c b/movement/watch_faces/complication/countdown_face.c similarity index 100% rename from movement/watch_faces/complications/countdown_face.c rename to movement/watch_faces/complication/countdown_face.c diff --git a/movement/watch_faces/complications/countdown_face.h b/movement/watch_faces/complication/countdown_face.h similarity index 100% rename from movement/watch_faces/complications/countdown_face.h rename to movement/watch_faces/complication/countdown_face.h diff --git a/movement/watch_faces/complications/day_one_face.c b/movement/watch_faces/complication/day_one_face.c similarity index 100% rename from movement/watch_faces/complications/day_one_face.c rename to movement/watch_faces/complication/day_one_face.c diff --git a/movement/watch_faces/complications/day_one_face.h b/movement/watch_faces/complication/day_one_face.h similarity index 100% rename from movement/watch_faces/complications/day_one_face.h rename to movement/watch_faces/complication/day_one_face.h diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complication/pulsometer_face.c similarity index 100% rename from movement/watch_faces/complications/pulsometer_face.c rename to movement/watch_faces/complication/pulsometer_face.c diff --git a/movement/watch_faces/complications/pulsometer_face.h b/movement/watch_faces/complication/pulsometer_face.h similarity index 100% rename from movement/watch_faces/complications/pulsometer_face.h rename to movement/watch_faces/complication/pulsometer_face.h diff --git a/movement/watch_faces/complications/stopwatch_face.c b/movement/watch_faces/complication/stopwatch_face.c similarity index 100% rename from movement/watch_faces/complications/stopwatch_face.c rename to movement/watch_faces/complication/stopwatch_face.c diff --git a/movement/watch_faces/complications/stopwatch_face.h b/movement/watch_faces/complication/stopwatch_face.h similarity index 100% rename from movement/watch_faces/complications/stopwatch_face.h rename to movement/watch_faces/complication/stopwatch_face.h diff --git a/movement/watch_faces/complications/sunrise_sunset_face.c b/movement/watch_faces/complication/sunrise_sunset_face.c similarity index 100% rename from movement/watch_faces/complications/sunrise_sunset_face.c rename to movement/watch_faces/complication/sunrise_sunset_face.c diff --git a/movement/watch_faces/complications/sunrise_sunset_face.h b/movement/watch_faces/complication/sunrise_sunset_face.h similarity index 100% rename from movement/watch_faces/complications/sunrise_sunset_face.h rename to movement/watch_faces/complication/sunrise_sunset_face.h diff --git a/movement/watch_faces/complications/totp_face.c b/movement/watch_faces/complication/totp_face.c similarity index 100% rename from movement/watch_faces/complications/totp_face.c rename to movement/watch_faces/complication/totp_face.c diff --git a/movement/watch_faces/complications/totp_face.h b/movement/watch_faces/complication/totp_face.h similarity index 100% rename from movement/watch_faces/complications/totp_face.h rename to movement/watch_faces/complication/totp_face.h diff --git a/movement/watch_faces/demos/character_set_face.c b/movement/watch_faces/demo/character_set_face.c similarity index 100% rename from movement/watch_faces/demos/character_set_face.c rename to movement/watch_faces/demo/character_set_face.c diff --git a/movement/watch_faces/demos/character_set_face.h b/movement/watch_faces/demo/character_set_face.h similarity index 100% rename from movement/watch_faces/demos/character_set_face.h rename to movement/watch_faces/demo/character_set_face.h diff --git a/movement/watch_faces/demos/demo_face.c b/movement/watch_faces/demo/demo_face.c similarity index 100% rename from movement/watch_faces/demos/demo_face.c rename to movement/watch_faces/demo/demo_face.c diff --git a/movement/watch_faces/demos/demo_face.h b/movement/watch_faces/demo/demo_face.h similarity index 100% rename from movement/watch_faces/demos/demo_face.h rename to movement/watch_faces/demo/demo_face.h diff --git a/movement/watch_faces/demos/hello_there_face.c b/movement/watch_faces/demo/hello_there_face.c similarity index 100% rename from movement/watch_faces/demos/hello_there_face.c rename to movement/watch_faces/demo/hello_there_face.c diff --git a/movement/watch_faces/demos/hello_there_face.h b/movement/watch_faces/demo/hello_there_face.h similarity index 100% rename from movement/watch_faces/demos/hello_there_face.h rename to movement/watch_faces/demo/hello_there_face.h diff --git a/movement/watch_faces/demos/lis2dh_logging_face.c b/movement/watch_faces/demo/lis2dh_logging_face.c similarity index 100% rename from movement/watch_faces/demos/lis2dh_logging_face.c rename to movement/watch_faces/demo/lis2dh_logging_face.c diff --git a/movement/watch_faces/demos/lis2dh_logging_face.h b/movement/watch_faces/demo/lis2dh_logging_face.h similarity index 100% rename from movement/watch_faces/demos/lis2dh_logging_face.h rename to movement/watch_faces/demo/lis2dh_logging_face.h diff --git a/movement/watch_faces/demos/voltage_face.c b/movement/watch_faces/demo/voltage_face.c similarity index 100% rename from movement/watch_faces/demos/voltage_face.c rename to movement/watch_faces/demo/voltage_face.c diff --git a/movement/watch_faces/demos/voltage_face.h b/movement/watch_faces/demo/voltage_face.h similarity index 100% rename from movement/watch_faces/demos/voltage_face.h rename to movement/watch_faces/demo/voltage_face.h