initial work on segment LCD

diff --git a/Smol Watch Project/My Project/driver_init.h b/Smol Watch Project/My Project/driver_init.h
index 54b83950d5a82ebf2303f525868fb86a84ab753f..4761a929f35a09d91f7c6255c8c2caf41bf3bd33 100644 (file)
--- a/Smol Watch Project/My Project/driver_init.h
+++ b/Smol Watch Project/My Project/driver_init.h
@@ -69,6 +69,8 @@ void PWM_1_PORT_init(void);
 void PWM_1_CLOCK_init(void);
 void PWM_1_init(void);
 
+void SEGMENT_LCD_0_init(void);
+
 /**
  * \brief Perform system initialization, initialize pins and clocks for
  * peripherals

diff --git a/Smol Watch Project/My Project/main.c b/Smol Watch Project/My Project/main.c
index 27f773179f0abd12bc38abf2c5730e5c0a6374c9..ede6d12bd4285e89d0531a02461c56b2749055c4 100644 (file)
--- a/Smol Watch Project/My Project/main.c
+++ b/Smol Watch Project/My Project/main.c
@@ -15,13 +15,18 @@ int main(void)
        date_time.time.sec = 0;
 
        watch_init(&watch);
-       watch_enable_led();
-       watch_enable_date_time();
+
+       watch_enable_led(&watch);
+
+       watch_enable_date_time(&watch);
        watch_set_date_time(date_time);
+
        watch_enable_digital_output(A0);
        gpio_set_pin_level(A0, true);
-       watch_enable_i2c();
-       
+
+       watch_enable_display(&watch);
+/*     
+       watch_enable_i2c(&watch);
        uint8_t chipID = 0;
        uint8_t ChipIdRegister = 0xD0;
        watch_i2c_send(0x77, &ChipIdRegister, 1);
@@ -29,7 +34,7 @@ int main(void)
        if (chipID == 0x60) {
                watch_set_led_green();
        }
-
+*/
        uint8_t last = date_time.time.sec;
        
        while (1) {
@@ -37,9 +42,11 @@ int main(void)
                if (date_time.time.sec != last) {
                        last = date_time.time.sec;
                        if (last % 2 == 0) {
-                               watch_set_led_red();
+                               watch_set_led_color(50, 0);
+                               watch_display_string(&watch, watch.main_display, " Hello");
                        } else {
-                               watch_set_led_green();
+                               watch_set_led_color(0, 50);
+                               watch_display_string(&watch, watch.main_display, " there");
                        }
                }
        }

diff --git a/Smol Watch Project/My Project/watch-library/watch.c b/Smol Watch Project/My Project/watch-library/watch.c
index 154653b61b7e3f40174d3f5f0da207259f1e2838..7dbfed445273a61a5513463c0ed6b55cc3401553 100644 (file)
--- a/Smol Watch Project/My Project/watch-library/watch.c
+++ b/Smol Watch Project/My Project/watch-library/watch.c
@@ -6,29 +6,212 @@
  */ \r
 \r
 #include "watch.h"\r
-#include "driver_init.h"
+#include "driver_init.h"\r
+#include <stdlib.h>\r
+#include <string.h>\r
 \r
 void watch_init(Watch *watch) {\r
+       memset(watch, 0, sizeof(*watch));\r
 }\r
 \r
-void watch_enable_led() {\r
-       PWM_0_init();
-       pwm_set_parameters(&PWM_0, 10000, 0);
-       pwm_enable(&PWM_0);
+const uint8_t Character_Set[] =\r
+{\r
+    0b00000000, //  \r
+    0b00000000, // !\r
+    0b00100010, // "\r
+    0b00000000, // #\r
+    0b00000000, // $\r
+    0b00000000, // %\r
+    0b01000100, // &\r
+    0b00100000, // '\r
+    0b00000000, // (\r
+    0b00000000, // )\r
+    0b00000000, // *\r
+    0b11000000, // +\r
+    0b00010000, // ,\r
+    0b01000000, // -\r
+    0b00000100, // .\r
+    0b00010010, // /\r
+    0b00111111, // 0\r
+    0b00000110, // 1\r
+    0b01011011, // 2\r
+    0b01001111, // 3\r
+    0b01100110, // 4\r
+    0b01101101, // 5\r
+    0b01111101, // 6\r
+    0b00000111, // 7\r
+    0b01111111, // 8\r
+    0b01101111, // 9\r
+    0b00000000, // :\r
+    0b00000000, // ;\r
+    0b01011000, // <\r
+    0b01001000, // =\r
+    0b01001100, // >\r
+    0b01010011, // ?\r
+    0b11111111, // @\r
+    0b01110111, // A\r
+    0b01111111, // B\r
+    0b00111001, // C\r
+    0b00111111, // D\r
+    0b01111001, // E\r
+    0b01110001, // F\r
+    0b00111101, // G\r
+    0b01110110, // H\r
+    0b10001001, // I\r
+    0b00001110, // J\r
+    0b11101010, // K\r
+    0b00111000, // L\r
+    0b10110111, // M\r
+    0b00110111, // N\r
+    0b00111111, // O\r
+    0b01110011, // P\r
+    0b01100111, // Q\r
+    0b11110111, // R\r
+    0b01101101, // S\r
+    0b10000001, // T\r
+    0b00111110, // U\r
+    0b00111110, // V\r
+    0b10111110, // W\r
+    0b01111110, // X\r
+    0b01101110, // Y\r
+    0b00011011, // Z\r
+    0b00111001, // [\r
+    0b00100100, // backslash\r
+    0b00001111, // ]\r
+    0b00100110, // ^\r
+    0b00001000, // _\r
+    0b00000010, // `\r
+    0b01011111, // a\r
+    0b01111100, // b\r
+    0b01011000, // c\r
+    0b01011110, // d\r
+    0b01111011, // e\r
+    0b01110001, // f\r
+    0b01101111, // g\r
+    0b01110100, // h\r
+    0b00010000, // i\r
+    0b01000010, // j\r
+    0b11101010, // k\r
+    0b00110000, // l\r
+    0b10110111, // m\r
+    0b01010100, // n\r
+    0b01011100, // o\r
+    0b01110011, // p\r
+    0b01100111, // q\r
+    0b01010000, // r\r
+    0b01101101, // s\r
+    0b01111000, // t\r
+    0b01100010, // u\r
+    0b01100010, // v\r
+    0b10111110, // w\r
+    0b01111110, // x\r
+    0b01101110, // y\r
+    0b00011011, // z\r
+    0b00111001, // {\r
+    0b00110000, // |\r
+    0b00001111, // }\r
+    0b00000001, // ~\r
+};\r
+\r
+void watch_enable_display(Watch *watch) {\r
+       if (watch->display_enabled) return;\r
+\r
+       static const uint64_t main_segmap[] = {\r
+               0xc053921252139352, // Position 0\r
+               0xc054511415559594, // Position 1\r
+               0xc057965616179716, // Position 2\r
+               0xc041804000018a81, // Position 3\r
+               0xc043420203048382, // Position 4\r
+               0xc045440506468584, // Position 5\r
+       };\r
+       watch->main_display.num_chars = 6;\r
+       watch->main_display.chars = malloc(6);\r
+       watch->main_display.segment_map = &main_segmap[0];\r
+\r
+       static const uint64_t day_segmap[] = {\r
+               0xc049c00a49890949, // Position 6\r
+               0xc048088886874707, // Position 7\r
+       };\r
+       watch->day_display.num_chars = 2;\r
+       watch->day_display.chars = malloc(2);\r
+       watch->day_display.segment_map = &day_segmap[0];\r
+\r
+       static const uint64_t date_segmap[] = {\r
+               0x4e4f0e8e8f8d4d0d, // Position 8\r
+               0xc8c4c4c8b4b4b0b, // Position 9\r
+       };\r
+       watch->date_display.num_chars = 2;\r
+       watch->date_display.chars = malloc(2);\r
+       watch->date_display.segment_map = &date_segmap[0];\r
+\r
+       SEGMENT_LCD_0_init();
+       slcd_sync_enable(&SEGMENT_LCD_0);
+       watch->display_enabled = true;
 }\r
 \r
-void watch_disable_led() {\r
-       gpio_set_pin_function(RED, GPIO_PIN_FUNCTION_OFF);
-       gpio_set_pin_function(GREEN, GPIO_PIN_FUNCTION_OFF);
+void watch_display_pixel(Watch *watch, WatchDisplay display, uint8_t com, uint8_t seg) {
+       slcd_sync_seg_on(&SEGMENT_LCD_0, SLCD_SEGID(com, seg));
+}
+\r
+void watch_clear_pixel(Watch *watch, WatchDisplay display, uint8_t com, uint8_t seg) {
+       slcd_sync_seg_off(&SEGMENT_LCD_0, SLCD_SEGID(com, seg));
+}
+\r
+void watch_display_character(Watch *watch, WatchDisplay display, uint8_t character, uint8_t position) {
+    uint64_t segmap = display.segment_map[position];\r
+    uint64_t segdata = Character_Set[character - 0x20];\r
+    \r
+    for (int i = 0; i < 8; i++) {\r
+           uint8_t com = (segmap & 0xFF) >> 6;\r
+           if (com > 2) {\r
+                       // COM3 means no segment exists; skip it.\r
+                   segmap = segmap >> 8;\r
+                   segdata = segdata >> 1;\r
+                   continue;\r
+           }\r
+           uint8_t seg = segmap & 0x3F;\r
+               slcd_sync_seg_off(&SEGMENT_LCD_0, SLCD_SEGID(com, seg));
+           if (segdata & 1) slcd_sync_seg_on(&SEGMENT_LCD_0, SLCD_SEGID(com, seg));\r
+           segmap = segmap >> 8;\r
+           segdata = segdata >> 1;\r
+    }\r
+}
+\r
+void watch_display_string(Watch *watch, WatchDisplay display, char *string) {
+       size_t i = 0;
+       while(string[i] != 0) {
+               watch_display_character(watch, display, string[i], i);
+               i++;
+               if (i >= display.num_chars) break;
+       }
+}
+\r
+void watch_enable_led(Watch *watch) {\r
+       if (watch->led_enabled) return;\r
+\r
+       PWM_0_init();\r
+       pwm_set_parameters(&PWM_0, 10000, 0);\r
+       pwm_enable(&PWM_0);\r
+       \r
+       watch->led_enabled = true;\r
+}\r
+\r
+void watch_disable_led(Watch *watch) {\r
+       if (!watch->led_enabled) return;\r
+\r
+       gpio_set_pin_function(RED, GPIO_PIN_FUNCTION_OFF);\r
+       gpio_set_pin_function(GREEN, GPIO_PIN_FUNCTION_OFF);\r
 \r
        pwm_disable(&PWM_0);\r
+       \r
+       watch->led_enabled = false;\r
 }\r
 \r
 void watch_set_led_color(uint16_t red, uint16_t green) {\r
-       TC3->COUNT16.CC[0].reg = red;
-       TC3->COUNT16.CC[1].reg = green;
-}
-
+       TC3->COUNT16.CC[0].reg = red;\r
+       TC3->COUNT16.CC[1].reg = green;\r
+}\r
+\r
 void watch_set_led_red() {\r
        watch_set_led_color(65535, 0);\r
 }\r
@@ -37,62 +220,67 @@ void watch_set_led_green() {
        watch_set_led_color(0, 65535);\r
 }\r
 \r
-void watch_enable_date_time() {\r
-       CALENDAR_0_init();
-       calendar_enable(&CALENDAR_0);
-}
+void watch_enable_date_time(Watch *watch) {\r
+       if (watch->calendar_enabled) return;\r
+       CALENDAR_0_init();\r
+       calendar_enable(&CALENDAR_0);\r
+       \r
+       watch->calendar_enabled = true;\r
+}\r
 \r
 void watch_set_date_time(struct calendar_date_time date_time) {\r
-       calendar_set_date(&CALENDAR_0, &date_time.date);
-       calendar_set_time(&CALENDAR_0, &date_time.time);
-}
-
-void watch_get_date_time(struct calendar_date_time *date_time) {
-       calendar_get_date_time(&CALENDAR_0, date_time);
-}
-
-void watch_enable_analog(const uint8_t pin) {
-       ADC_0_init(); // todo: only call this once
-       switch (pin) {
-               case A0:
-               gpio_set_pin_function(A0, PINMUX_PB04B_ADC_AIN12);
-               break;
-               case A1:
-               gpio_set_pin_function(A1, PINMUX_PB01B_ADC_AIN9);
-               break;
-               case A2:
-               gpio_set_pin_function(A2, PINMUX_PB02B_ADC_AIN10);
-               break;
-               default:
-               return;
-       }
-       gpio_set_pin_direction(pin, GPIO_DIRECTION_OFF);
-}
-
-void watch_enable_digital_input(const uint8_t pin) {
-       gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
-       gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_OFF);
-}
-
-void watch_enable_digital_output(const uint8_t pin) {
-       gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
-       gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_OFF);
-}
-
-struct io_descriptor *I2C_0_io;
-
-void watch_enable_i2c() {
-       I2C_0_init();
-       i2c_m_sync_get_io_descriptor(&I2C_0, &I2C_0_io);
-       i2c_m_sync_enable(&I2C_0);
-}
-
-void watch_i2c_send(int16_t addr, uint8_t *buf, uint16_t length) {
-       i2c_m_sync_set_slaveaddr(&I2C_0, addr, I2C_M_SEVEN);
-       io_write(I2C_0_io, buf, length);
-}
-
-void watch_i2c_receive(int16_t addr, uint8_t *buf, uint16_t length) {
-       i2c_m_sync_set_slaveaddr(&I2C_0, addr, I2C_M_SEVEN);
-       io_read(I2C_0_io, buf, length);
-}
+       calendar_set_date(&CALENDAR_0, &date_time.date);\r
+       calendar_set_time(&CALENDAR_0, &date_time.time);\r
+}\r
+\r
+void watch_get_date_time(struct calendar_date_time *date_time) {\r
+       calendar_get_date_time(&CALENDAR_0, date_time);\r
+}\r
+\r
+void watch_enable_analog(Watch *watch, const uint8_t pin) {\r
+       if (!watch->adc_enabled) ADC_0_init();\r
+\r
+       switch (pin) {\r
+               case A0:\r
+                       gpio_set_pin_function(A0, PINMUX_PB04B_ADC_AIN12);\r
+                       break;\r
+               case A1:\r
+                       gpio_set_pin_function(A1, PINMUX_PB01B_ADC_AIN9);\r
+                       break;\r
+               case A2:\r
+                       gpio_set_pin_function(A2, PINMUX_PB02B_ADC_AIN10);\r
+                       break;\r
+               default:\r
+                       return;\r
+       }\r
+       gpio_set_pin_direction(pin, GPIO_DIRECTION_OFF);\r
+}\r
+\r
+void watch_enable_digital_input(const uint8_t pin) {\r
+       gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);\r
+       gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_OFF);\r
+}\r
+\r
+void watch_enable_digital_output(const uint8_t pin) {\r
+       gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);\r
+       gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_OFF);\r
+}\r
+\r
+struct io_descriptor *I2C_0_io;\r
+\r
+void watch_enable_i2c(Watch *watch) {\r
+       if (watch->i2c_enabled) return;\r
+       I2C_0_init();\r
+       i2c_m_sync_get_io_descriptor(&I2C_0, &I2C_0_io);\r
+       i2c_m_sync_enable(&I2C_0);\r
+}\r
+\r
+void watch_i2c_send(int16_t addr, uint8_t *buf, uint16_t length) {\r
+       i2c_m_sync_set_slaveaddr(&I2C_0, addr, I2C_M_SEVEN);\r
+       io_write(I2C_0_io, buf, length);\r
+}\r
+\r
+void watch_i2c_receive(int16_t addr, uint8_t *buf, uint16_t length) {\r
+       i2c_m_sync_set_slaveaddr(&I2C_0, addr, I2C_M_SEVEN);\r
+       io_read(I2C_0_io, buf, length);\r
+}\r

diff --git a/Smol Watch Project/My Project/watch-library/watch.h b/Smol Watch Project/My Project/watch-library/watch.h
index 1894e6c685b8601807e2b8cf452b75b7326b717b..428cb15181b89e07324d636746d511def7806a74 100644 (file)
--- 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>\r
 #include "hpl_calendar.h"\r
 \r
-#define WATCH_NUM_DISPLAYS (3)\r
-\r
-struct WatchDisplay {\r
+typedef struct WatchDisplay {\r
        uint8_t num_chars;\r
        uint8_t* chars;\r
-};\r
+       const uint64_t* segment_map;\r
+} WatchDisplay;\r
 \r
 typedef struct Watch {\r
-       struct WatchDisplay displays[WATCH_NUM_DISPLAYS];\r
+       struct WatchDisplay main_display; // 6 chars, main line.\r
+       struct WatchDisplay day_display;  // 2 chars, alphanumeric-ish. top center.\r
+       struct WatchDisplay date_display; // 2 chars, only supports numbers 0-39. top right.\r
+\r
+       bool display_enabled;\r
+       bool led_enabled;\r
+       bool buzzer_enabled;\r
+       bool calendar_enabled;\r
+       bool adc_enabled;\r
+       bool i2c_enabled;\r
+       bool spi_enabled;\r
+       bool eic_enabled;\r
 } Watch;\r
 \r
 void watch_init(Watch *watch);\r
 \r
-void watch_enable_led();\r
-void watch_disable_led();\r
+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);
+\r
+void watch_enable_led(Watch *watch);\r
+void watch_disable_led(Watch *watch);\r
 void watch_set_led_color(uint16_t red, uint16_t green);
 void watch_set_led_red();\r
 void watch_set_led_green();\r
 \r
-void watch_enable_date_time();
+void watch_enable_date_time(Watch *watch);
 void watch_set_date_time(struct calendar_date_time date_time);\r
 void watch_get_date_time(struct calendar_date_time *date_time);\r
 \r
-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);\r
 \r