From 8a13a13a7c0752a72a163a8ec991364f3751878b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Mon, 23 Nov 2020 18:51:44 +0100
Subject: [PATCH] Introduce CPP macros for AVR IN/OUT registers

---
 firmware/common.h   |  8 ++++++++
 firmware/keyboard.c | 13 +++++++------
 firmware/keyboard.h | 12 +++++-------
 firmware/led.c      | 21 +++++++++++----------
 firmware/led.h      | 12 +++++-------
 firmware/rtc.c      |  5 +++--
 firmware/rtc.h      |  8 ++------
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/firmware/common.h b/firmware/common.h
index 8f133d4..c4a0013 100644
--- a/firmware/common.h
+++ b/firmware/common.h
@@ -6,4 +6,12 @@
 #define __PROJ_DATE__ "2020"
 #define __PROJ_REV__ "rev:1.0"
 
+#define R_PORT(P) __R_PORT(P)
+#define R_DDR(P) __R_DDR(P)
+#define R_PIN(P) __R_PIN(P)
+
+#define __R_PORT(P) (PORT ## P)
+#define __R_DDR(P) (DDR ## P)
+#define __R_PIN(P) (PIN ## P)
+
 #endif
\ No newline at end of file
diff --git a/firmware/keyboard.c b/firmware/keyboard.c
index ab78922..e56cce5 100644
--- a/firmware/keyboard.c
+++ b/firmware/keyboard.c
@@ -1,4 +1,5 @@
 #include <avr/io.h>
+#include "common.h"
 #include "config.h"
 #include "keyboard.h"
 #include "debounce.h"
@@ -31,14 +32,14 @@ void inc_brightness(void)
 
 void kbd_init(void)
 {
-  KEYBOARD_DIR &= ~(KEY_INC_HOUR | KEY_INC_MINUTE | KEY_INC_SECOND | KEY_INC_BRIGHTNESS);
-  PORTB |= KEY_INC_HOUR | KEY_INC_MINUTE | KEY_INC_SECOND | KEY_INC_BRIGHTNESS;
+  R_DDR(KEYBOARD_PORT) &= ~(1<<KEY_INC_HOUR | 1<<KEY_INC_MINUTE | 1<<KEY_INC_SECOND | 1<<KEY_INC_BRIGHTNESS);
+  R_PORT(KEYBOARD_PORT) |= 1<<KEY_INC_HOUR | 1<<KEY_INC_MINUTE | 1<<KEY_INC_SECOND | 1<<KEY_INC_BRIGHTNESS;
 }
 
 void kbd_handle_event(void)
 {
-  SuperDebounce(&k_inc_hour, &KEYBOARD_PIN, KEY_INC_HOUR, 20, 0, &inc_hour, 0);
-  SuperDebounce(&k_inc_minute, &KEYBOARD_PIN, KEY_INC_MINUTE, 20, 0, &inc_minute, 0);
-  SuperDebounce(&k_inc_second, &KEYBOARD_PIN, KEY_INC_SECOND, 20, 0, &inc_second, 0);
-  SuperDebounce(&k_inc_brightness, &KEYBOARD_PIN, KEY_INC_BRIGHTNESS, 20, 0, &inc_brightness, 0);
+  SuperDebounce(&k_inc_hour, &R_PIN(KEYBOARD_PORT), 1<<KEY_INC_HOUR, 20, 0, &inc_hour, 0);
+  SuperDebounce(&k_inc_minute, &R_PIN(KEYBOARD_PORT), 1<<KEY_INC_MINUTE, 20, 0, &inc_minute, 0);
+  SuperDebounce(&k_inc_second, &R_PIN(KEYBOARD_PORT), 1<<KEY_INC_SECOND, 20, 0, &inc_second, 0);
+  SuperDebounce(&k_inc_brightness, &R_PIN(KEYBOARD_PORT), 1<<KEY_INC_BRIGHTNESS, 20, 0, &inc_brightness, 0);
 }
\ No newline at end of file
diff --git a/firmware/keyboard.h b/firmware/keyboard.h
index 2e401bd..4f1a352 100644
--- a/firmware/keyboard.h
+++ b/firmware/keyboard.h
@@ -1,13 +1,11 @@
 #ifndef __KEYBOARD_H__
 #define __KEYBOARD_H__
 
-#define KEYBOARD_DIR DDRB
-#define KEYBOARD_PIN PINB
-#define KEYBOARD_PORT PORTB
-#define KEY_INC_HOUR (1<<PB0)
-#define KEY_INC_MINUTE (1<<PB1)
-#define KEY_INC_SECOND (1<<PB2)
-#define KEY_INC_BRIGHTNESS (1<<PB3)
+#define KEYBOARD_PORT B
+#define KEY_INC_HOUR 0
+#define KEY_INC_MINUTE 1
+#define KEY_INC_SECOND 2
+#define KEY_INC_BRIGHTNESS 3
 
 void kbd_init(void);
 void kbd_handle_event(void);
diff --git a/firmware/led.c b/firmware/led.c
index 59d2553..d0f46e8 100644
--- a/firmware/led.c
+++ b/firmware/led.c
@@ -1,5 +1,6 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include "common.h"
 #include "config.h"
 #include "led.h"
 
@@ -10,12 +11,12 @@ static struct LED_DIGS display;
 void led_init(void) 
 {
   // Set outputs
-  ANODES_DIR |= DIG0_ANODE | DIG1_ANODE | DIG2_ANODE; 
-  LED_DIR |= 0x3F; // 0b00111111
+  R_DDR(ANODES_PORT) |= 1<<DIG0_ANODE | 1<<DIG1_ANODE | 1<<DIG2_ANODE; 
+  R_DDR(LED_PORT) |= 0x3F; // 0b00111111
 
   // Clear LEDs
-  ANODES_PORT = DIG0_ANODE | DIG1_ANODE | DIG2_ANODE;
-  LED_PORT |= 0x3F; // 0b00111111
+  R_PORT(ANODES_PORT) = 1<<DIG0_ANODE | 1<<DIG1_ANODE | 1<<DIG2_ANODE;
+  R_PORT(LED_PORT) |= 0x3F; // 0b00111111
   
   TCCR0 |= (1<<CS00);
   TIMSK |= (1<<TOIE0);
@@ -41,16 +42,16 @@ ISR(TIMER0_OVF_vect)
   switch(curr_anode) 
   {
     case 1: 
-      LED_PORT = ~display.dig0;   
-      ANODES_PORT = led_btnes >= pwm_counter ? ~DIG0_ANODE : 0xFF;
+      R_PORT(LED_PORT) = ~display.dig0;   
+      R_PORT(ANODES_PORT) = led_btnes >= pwm_counter ? ~(1<<DIG0_ANODE) : 0xFF;
       break;
     case 2: 
-      LED_PORT = ~display.dig1;   
-      ANODES_PORT = led_btnes >= pwm_counter ? ~DIG1_ANODE : 0xFF;  
+      R_PORT(LED_PORT) = ~display.dig1;   
+      R_PORT(ANODES_PORT) = led_btnes >= pwm_counter ? ~(1<<DIG1_ANODE) : 0xFF;  
       break;
     case 4: 
-      LED_PORT = ~display.dig2;
-      ANODES_PORT = led_btnes >= pwm_counter ? ~DIG2_ANODE : 0xFF; 
+      R_PORT(LED_PORT) = ~display.dig2;      
+      R_PORT(ANODES_PORT) = led_btnes >= pwm_counter ? ~(1<<DIG2_ANODE) : 0xFF; 
       break;
   }
 
diff --git a/firmware/led.h b/firmware/led.h
index d393c2b..4aa9040 100644
--- a/firmware/led.h
+++ b/firmware/led.h
@@ -1,14 +1,12 @@
 #ifndef __LED_H__
 #define __LED_H__
 
-#define LED_PORT PORTA
-#define LED_DIR DDRA
+#define LED_PORT A
 
-#define ANODES_PORT PORTD
-#define ANODES_DIR DDRD
-#define DIG0_ANODE (1<<PD5)
-#define DIG1_ANODE (1<<PD6)
-#define DIG2_ANODE (1<<PD7)
+#define ANODES_PORT D
+#define DIG0_ANODE 5
+#define DIG1_ANODE 6
+#define DIG2_ANODE 7
 
 struct LED_DIGS
 {
diff --git a/firmware/rtc.c b/firmware/rtc.c
index 81f9a9f..a88a8b9 100644
--- a/firmware/rtc.c
+++ b/firmware/rtc.c
@@ -2,6 +2,7 @@
 #include <avr/pgmspace.h>
 #include <avr/io.h>
 #include <stdlib.h>
+#include "common.h"
 #include "rtc.h"
 #include "i2c.h"
 
@@ -21,8 +22,8 @@ void rtc_invoke_handler(void);
 void rtc_int0_init(void)
 {
   MCUCR |= (1<<ISC01);
-  INT0_DIR &= ~(1<<INT0_PIN);
-  INT0_PORT |= (1<<INT0_PIN);  
+  R_DDR(INT0_PORT) &= ~(1<<INT0_IN);
+  R_PORT(INT0_PORT) |= (1<<INT0_IN);  
 
   rtc_invoke_handler();
 }
diff --git a/firmware/rtc.h b/firmware/rtc.h
index 29146b3..f378c12 100644
--- a/firmware/rtc.h
+++ b/firmware/rtc.h
@@ -7,12 +7,8 @@
 
 #define DATE_SEPARATOR '.'
 
-#define INT0_PORT PORTD
-#define INT0_DIR DDRD
-#define INT0_PIN PD2
-#define INT1_PORT PORTD
-#define INT1_DIR DDRD
-#define INT1_PIN PD3
+#define INT0_PORT D
+#define INT0_IN 2
 
 #define SECOND 0x02
 #define MINUTE 0x03