Optimize display write

4 files changed, 56 insertions, 48 deletions

diff --git a/src/display.c b/src/display.c
index 271d6a3..9579ff8 100644
--- a/src/display.c
+++ b/src/display.c
@@ -30,43 +30,51 @@ volatile uint8_t current_digit = 0;
 
 // Render current digit
 void display_render(void) {
-  write_time(minutes, seconds, current_digit);
+  write_time(current_digit);
 
   // Cycle through the 4 digits
   current_digit = (current_digit + 1) % 4;
 }
 
-// TODO: Wtf. Fix the names
+// Special segments index position
+#define SPECIAL_SEGMENT_1 5
+#define SPECIAL_SEGMENT_2 6
 
-#define DSEGMENT_1 6
-#define DSEGMENT_MASK_1 ((1 << 6) | (1 << 7))
-#define DSEGMENT_2 5
-#define DSEGMENT_MASK_2 ((1 << 5) | (1 << 10))
+// Special segment masked pins
+#define SPECIAL_SEGMENT_MASK_1 ((1 << 5) | (1 << 10))
+#define SPECIAL_SEGMENT_MASK_2 ((1 << 6) | (1 << 7))
 
-#define ALL_DUAL_PURPOSE_PINS (DSEGMENT_MASK_1 | DSEGMENT_MASK_2)
+// All special segment pings
+#define SPECIAL_SEGMENT_PINS (SPECIAL_SEGMENT_MASK_1 | SPECIAL_SEGMENT_MASK_2)
 
-uint8_t dual_purpose_pins[] = {6, 7, 5, 10};
-uint8_t dual_purpose_antipins[] = {7, 6, 10, 5};
+// Digit position -> special segment pin
+static uint8_t special_segment_pins[] = {5, 10, 6, 7};
 
-void write_time(uint16_t hour, uint16_t minute, uint8_t digit_index) {
+// Digit position -> special segment anti-pin (pair of pin)
+static uint8_t special_segment_antipins[] = {10, 5, 7, 6};
+
+void write_time(uint8_t digit_index) {
   // reset pins
-  uint32_t ddr = ~ALL_DUAL_PURPOSE_PINS;
+  uint32_t ddr = ~SPECIAL_SEGMENT_PINS;
   uint32_t port = 0;
 
-  uint8_t digit = get_digit(hour, minute, digit_index);
-  uint32_t segments = get_digit_mask(digit);
-  uint8_t pin = dual_purpose_pins[digit_index];
-  uint8_t antipin = dual_purpose_antipins[digit_index];
-  uint8_t segment_pin = digit_index / 2 == 0 ? DSEGMENT_1 : DSEGMENT_2;
-  uint8_t other_segment_pin = digit_index / 2 == 0 ? DSEGMENT_2 : DSEGMENT_1;
-  uint8_t other_segment_mask =
-      digit_index / 2 == 0 ? DSEGMENT_MASK_2 : DSEGMENT_MASK_1;
+  uint8_t digits[] = {seconds_digit1, seconds_digit2, minutes_digit1,
+                      minutes_digit2};
 
-  port = segments;
+  uint8_t digit = digits[digit_index];
+  uint32_t segments = digit_masks[digit];
+  uint8_t pin = special_segment_pins[digit_index];
+  uint8_t antipin = special_segment_antipins[digit_index];
+  uint8_t segment_pin =
+      digit_index / 2 == 0 ? SPECIAL_SEGMENT_1 : SPECIAL_SEGMENT_2;
+  uint8_t other_segment_pin =
+      digit_index / 2 == 0 ? SPECIAL_SEGMENT_2 : SPECIAL_SEGMENT_1;
+  uint8_t other_segment_mask =
+      digit_index / 2 == 0 ? SPECIAL_SEGMENT_MASK_2 : SPECIAL_SEGMENT_MASK_1;
 
-  // Activate dual purpose segment
+  // Activate special segment
   ddr |= (1 << pin);
-  port |= (1 << pin);
+  port = segments | (1 << pin);
   if (segments & (1 << segment_pin)) {
     // If seg inactive, enable other input and enable pull up res
     ddr &= ~(1 << antipin);
@@ -77,16 +85,14 @@ void write_time(uint16_t hour, uint16_t minute, uint8_t digit_index) {
     port &= ~(1 << antipin);
   }
 
-  // Activate other dual purpose segment
+  // Activate other special segment
   if ((segments & (1 << other_segment_pin)) == 0) {
     ddr |= other_segment_mask;
     port &= ~other_segment_mask;
   }
 
-  // cli();
   DDRA = ddr;
   DDRB = ddr >> 8;
   PORTA = port;
   PORTB = port >> 8;
-  // sei();
 }
diff --git a/src/display.h b/src/display.h
index c410731..f01ee73 100644
--- a/src/display.h
+++ b/src/display.h
@@ -2,6 +2,8 @@
 #define _LOADED_DISPLAY
 #include <stdint.h>
 
+#include "rtc.h"
+
 // "_gfedcba"
 // Reversed because a-g is mapped to pa0-6. (pa7 is decimal)
 // Complemented because display is common anode
@@ -10,33 +12,12 @@ static const uint32_t digit_masks[] = {
     0b0010010, 0b0000010, 0b1111000, 0b0000000, 0b0010000,
 };
 
+// Current digit position
 volatile extern uint8_t current_digit;
 
 void display_setup(void);
 
-static inline uint32_t get_digit_mask(uint8_t digit) {
-  return digit_masks[digit % 10];
-}
-
-static inline uint8_t get_digit(uint16_t hour, uint16_t minute,
-                                uint8_t digit_index) {
-  // TODO: use hour
-  // uint8_t hour_digit1 = hour % 10;
-  // uint8_t hour_digit2 = (hour / 10) % 10;
-  switch (digit_index) {
-  case 0:
-    return minute % 10;
-  case 1:
-    return (minute / 10) % 10;
-  case 2:
-    return (minute % 10) + 1;
-  case 3:
-    return ((minute / 10) % 10) + 1;
-  }
-  return 0;
-}
-
-void write_time(uint16_t hour, uint16_t minute, uint8_t digit_index);
+void write_time(uint8_t digit_index);
 
 void display_render(void);
 
diff --git a/src/rtc.c b/src/rtc.c
index 053e651..53a5983 100644
--- a/src/rtc.c
+++ b/src/rtc.c
@@ -23,14 +23,28 @@ volatile uint8_t seconds = 0;
 volatile uint8_t minutes = 0;
 volatile uint8_t hours = 0;
 
+volatile uint8_t seconds_digit1 = 0;
+volatile uint8_t seconds_digit2 = 0;
+volatile uint8_t minutes_digit1 = 0;
+volatile uint8_t minutes_digit2 = 0;
+volatile uint8_t hours_digit1 = 0;
+volatile uint8_t hours_digit2 = 0;
+
 void rtc_increment(void) {
   uint8_t s = seconds + 1;
   seconds = s % 60;
+  // TODO: Remove seconds digits calculation
+  seconds_digit1 = seconds % 10;
+  seconds_digit2 = (seconds / 10) % 10;
   if (s >= 60) {
     uint8_t m = minutes + 1;
     minutes = m % 60;
+    minutes_digit1 = minutes % 10;
+    minutes_digit2 = (minutes / 10) % 10;
     if (m >= 60) {
       hours = (hours + 1) % 24;
+      hours_digit1 = hours % 10;
+      hours_digit2 = (hours / 10) % 10;
     }
   }
 }
diff --git a/src/rtc.h b/src/rtc.h
index f3f8f9c..c1c1730 100644
--- a/src/rtc.h
+++ b/src/rtc.h
@@ -6,6 +6,13 @@ volatile extern uint8_t seconds;
 volatile extern uint8_t minutes;
 volatile extern uint8_t hours;
 
+volatile extern uint8_t seconds_digit1;
+volatile extern uint8_t seconds_digit2;
+volatile extern uint8_t minutes_digit1;
+volatile extern uint8_t minutes_digit2;
+volatile extern uint8_t hours_digit1;
+volatile extern uint8_t hours_digit2;
+
 void rtc_setup(void);
 
 void rtc_increment(void);