From fe0e7fa223d04090c743655ef52c80ce1245350b Mon Sep 17 00:00:00 2001
From: hugogogo <hugogogo@protonmail.com>
Date: Sat, 8 Mar 2025 16:29:30 +0100
Subject: [PATCH] wip adding headers

---
 Makefile                |  3 +-
 module01/ex02/headers.h | 67 +++++++++++++++++++++++++++++++++++++
 module01/ex02/main.c    | 74 +++--------------------------------------
 3 files changed, 73 insertions(+), 71 deletions(-)
 create mode 100644 module01/ex02/headers.h

diff --git a/Makefile b/Makefile
index b24ce9b..3054d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 F_CPU = 16000000UL
 TARGET = main
 CC = avr-gcc
+INCLUDES = -I.
 
 AVRGCC_MCU_TYPE = atmega328p
 AVRDUDE_MCU_TYPE = m328p
@@ -34,7 +35,7 @@ hex: $(TARGET).hex
 #	-D : defines a preprocessor macro (#define F_CPU <value>)
 #	-o : output filename
 $(TARGET).bin: $(TARGET).c
-	$(CC) -mmcu=$(AVRGCC_MCU_TYPE) -D F_CPU=$(F_CPU) $(TARGET).c -Os -o $(TARGET).bin
+	$(CC) -mmcu=$(AVRGCC_MCU_TYPE) -D F_CPU=$(F_CPU) $(INCLUDES) $(TARGET).c -Os -o $(TARGET).bin
 
 # avr-objcopy : man avr-jobcopy, https://linux.die.net/man/1/avr-objcopy
 #	-O : specifies output format, Intel HEX
diff --git a/module01/ex02/headers.h b/module01/ex02/headers.h
new file mode 100644
index 0000000..140fb1f
--- /dev/null
+++ b/module01/ex02/headers.h
@@ -0,0 +1,67 @@
+#ifndef MYHEADER_H
+#define MYHEADER_H
+
+// stringify
+#define STRINGIFY_HELPER(x)		#x
+#define STRINGIFY(x)			STRINGIFY_HELPER(x)
+
+// concatenate
+#define CONCAT_HELPER(x, y)		x ## y
+#define CONCAT(x, y)			CONCAT_HELPER(x, y)
+
+// get argument
+#define ARG_1(v1, v2)			v1
+#define ARG_2(v1, v2)			v2
+#define GET_PORT(args)			ARG_1 args
+#define GET_BIT(args)			ARG_2 args
+
+// actions on registers
+#define SET(register, bit)		register |= 1 << bit
+#define CLEAR(register, bit)	register &= ~(1 << bit)
+#define TEST(register, bit)		register & 1 << bit
+#define TOGGLE(register, bit)	register ^= 1 << bit
+
+// actions on elements
+#define SET_ELEM(elem)			SET(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
+#define CLEAR_ELEM(elem)		CLEAR(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
+#define TEST_ELEM(elem)			TEST(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
+#define TOGGLE_ELEM(elem)		TOGGLE(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
+#define MODE_OUTPUT(elem)		SET(CONCAT(DDR, GET_PORT(elem)), GET_BIT(elem))
+#define MODE_INPUT(elem)		CLEAR(CONCAT(DDR, GET_PORT(elem)), GET_BIT(elem))
+#define TOGGLE_PIN(elem)		SET(CONCAT(PIN, GET_PORT(elem)), GET_BIT(elem))
+#define TEST_PIN(elem)			(TEST(CONCAT(PIN, GET_PORT(elem)), GET_BIT(elem)))
+#define IS_PIN_SET(elem)		(TEST_PIN(elem) == 0)
+#define IS_PIN_CLEAR(elem)		(TEST_PIN(elem) == 1)
+
+// bits
+#define D1	0
+#define D2	1
+#define D3	2
+#define D4	4
+#define SW1	2
+#define SW2	4
+
+// elements (port, bit)
+#define LED1	(B, D1)
+#define LED2	(B, D2)
+#define LED3	(B, D3)
+#define LED4	(B, D4)
+#define BUTTON1	(D, SW1)
+#define BUTTON2	(D, SW2)
+
+// TIME
+#define PRESCALE_VALUE				1024		// can be 1, 8, 64, 256, 1024
+// table 16-5 : prescale sets
+#define PRESCALE_SET(value)  \
+									((value) == 1   ? (0<<CS12 | 0<<CS11 | 1<<CS10) : \
+									 (value) == 8   ? (0<<CS12 | 1<<CS11 | 0<<CS10) : \
+									 (value) == 64  ? (0<<CS12 | 1<<CS11 | 1<<CS10) : \
+									 (value) == 256 ? (1<<CS12 | 0<<CS11 | 0<<CS10) : \
+									 (value) == 1024? (1<<CS12 | 0<<CS11 | 1<<CS10) : \
+													  (0<<CS12 | 0<<CS11 | 0<<CS10))
+#define TIME_MS(ms)					(((F_CPU / PRESCALE_VALUE) * ms) / 1000)
+#define PERIOD						1000
+#define DUTY_CYCLE					10
+#define PERCENT(percent, period)	(((float)percent / 100) * period)
+
+#endif
\ No newline at end of file
diff --git a/module01/ex02/main.c b/module01/ex02/main.c
index e6c58c7..34cd5a4 100644
--- a/module01/ex02/main.c
+++ b/module01/ex02/main.c
@@ -1,71 +1,7 @@
 #include <avr/io.h>
+#include "headers.h"
 
-// stringify
-#define STRINGIFY_HELPER(x)		#x
-#define STRINGIFY(x)			STRINGIFY_HELPER(x)
-
-// concatenate
-#define CONCAT_HELPER(x, y)		x ## y
-#define CONCAT(x, y)			CONCAT_HELPER(x, y)
-
-// get argument
-#define ARG_1(v1, v2)			v1
-#define ARG_2(v1, v2)			v2
-#define GET_PORT(args)			ARG_1 args
-#define GET_BIT(args)			ARG_2 args
-
-// actions on registers
-#define SET(register, bit)		register |= 1 << bit
-#define CLEAR(register, bit)	register &= ~(1 << bit)
-#define TEST(register, bit)		register & 1 << bit
-#define TOGGLE(register, bit)	register ^= 1 << bit
-
-// actions on elements
-#define SET_ELEM(elem)			SET(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
-#define CLEAR_ELEM(elem)		CLEAR(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
-#define TEST_ELEM(elem)			TEST(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
-#define TOGGLE_ELEM(elem)		TOGGLE(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem))
-#define MODE_OUTPUT(elem)		SET(CONCAT(DDR, GET_PORT(elem)), GET_BIT(elem))
-#define MODE_INPUT(elem)		CLEAR(CONCAT(DDR, GET_PORT(elem)), GET_BIT(elem))
-#define TOGGLE_PIN(elem)		SET(CONCAT(PIN, GET_PORT(elem)), GET_BIT(elem))
-#define TEST_PIN(elem)			(TEST(CONCAT(PIN, GET_PORT(elem)), GET_BIT(elem)))
-#define IS_PIN_SET(elem)		(TEST_PIN(elem) == 0)
-#define IS_PIN_CLEAR(elem)		(TEST_PIN(elem) == 1)
-
-// bits
-#define D1	0
-#define D2	1
-#define D3	2
-#define D4	4
-#define SW1	2
-#define SW2	4
-
-// elements (port, bit)
-#define LED1	(B, D1)
-#define LED2	(B, D2)
-#define LED3	(B, D3)
-#define LED4	(B, D4)
-#define BUTTON1	(D, SW1)
-#define BUTTON2	(D, SW2)
-
-// TIME
-#define PRESCALE_VALUE				1024		// can be 1, 8, 64, 256, 1024
-// table 16-5 : prescale sets
-#define PRESCALE_SET(value)  \
-									((value) == 1   ? (0<<CS12 | 0<<CS11 | 1<<CS10) : \
-									 (value) == 8   ? (0<<CS12 | 1<<CS11 | 0<<CS10) : \
-									 (value) == 64  ? (0<<CS12 | 1<<CS11 | 1<<CS10) : \
-									 (value) == 256 ? (1<<CS12 | 0<<CS11 | 0<<CS10) : \
-									 (value) == 1024? (1<<CS12 | 0<<CS11 | 1<<CS10) : \
-													  (0<<CS12 | 0<<CS11 | 0<<CS10))
-#define TIME_MS(ms)					(((F_CPU / PRESCALE_VALUE) * ms) / 1000)
-#define PERIOD						1000
-#define DUTY_CYCLE					10
-#define PERCENT(percent, period)	(((float)percent / 100) * period)
-
-// END MACROS
-
-
+// turns on led2 at 1Hz and duty cycle of 10%, not using PORTx, with empty infinite loop
 int main() {
 	MODE_OUTPUT(LED2);
 
@@ -79,9 +15,7 @@ int main() {
     
     OCR1A = TIME_MS(PERCENT(DUTY_CYCLE, PERIOD));	// 16.9.3 : set the duty cycle to DUTY_CYCLE% of the time on channel A -> OC1A (alternate function of PORTB1, aka LED2) is cleared when TCNT1 (the counter value) equals OCR1A
 
-    TCCR1B |= (PRESCALE_SET(PRESCALE_VALUE));						// start the timer with the prescaler
+    TCCR1B |= (PRESCALE_SET(PRESCALE_VALUE));		// start the timer with the prescaler
 
-	while(1) {
-		continue;
-	}
+	while(1);
 }
\ No newline at end of file