1 files changed, 24 insertions, 10 deletions

diff --git a/Smol Watch Project/My Project/watch-library/watch.h b/Smol Watch Project/My Project/watch-library/watch.h
index 1894e6c6..428cb151 100644
--- a/Smol Watch Project/My Project/watch-library/watch.h
+++ b/Smol Watch Project/My Project/watch-library/watch.h
@@ -11,37 +11,51 @@
 #include <stdint.h>

 #include "hpl_calendar.h"

 

-#define WATCH_NUM_DISPLAYS (3)

-

-struct WatchDisplay {

+typedef struct WatchDisplay {

 	uint8_t num_chars;

 	uint8_t* chars;

-};

+	const uint64_t* segment_map;

+} WatchDisplay;

 

 typedef struct Watch {

-	struct WatchDisplay displays[WATCH_NUM_DISPLAYS];

+	struct WatchDisplay main_display; // 6 chars, main line.

+	struct WatchDisplay day_display;  // 2 chars, alphanumeric-ish. top center.

+	struct WatchDisplay date_display; // 2 chars, only supports numbers 0-39. top right.

+

+	bool display_enabled;

+	bool led_enabled;

+	bool buzzer_enabled;

+	bool calendar_enabled;

+	bool adc_enabled;

+	bool i2c_enabled;

+	bool spi_enabled;

+	bool eic_enabled;

 } Watch;

 

 void watch_init(Watch *watch);

 

-void watch_enable_led();

-void watch_disable_led();

+void watch_enable_display(Watch *watch);
+void watch_display_pixel(Watch *watch, WatchDisplay display, uint8_t com, uint8_t seg);
+void watch_display_string(Watch *watch, WatchDisplay display, char *string);
+

+void watch_enable_led(Watch *watch);

+void watch_disable_led(Watch *watch);

 void watch_set_led_color(uint16_t red, uint16_t green);
 void watch_set_led_red();

 void watch_set_led_green();

 

-void watch_enable_date_time();
+void watch_enable_date_time(Watch *watch);
 void watch_set_date_time(struct calendar_date_time date_time);

 void watch_get_date_time(struct calendar_date_time *date_time);

 

-void watch_enable_analog(const uint8_t pin);
+void watch_enable_analog(Watch *watch, const uint8_t pin);
 
 void watch_enable_digital_input(const uint8_t pin);
 void watch_enable_digital_output(const uint8_t pin);
 
 struct io_descriptor *I2C_0_io;
 
-void watch_enable_i2c();
+void watch_enable_i2c(Watch *watch);
 void watch_i2c_send(int16_t addr, uint8_t *buf, uint16_t length);
 void watch_i2c_receive(int16_t addr, uint8_t *buf, uint16_t length);