From f992d76fe5bd88274ede42f27f023d2505bff0f8 Mon Sep 17 00:00:00 2001
From: hugo LAMY <hugo.lamy@oskey.io>
Date: Sat, 8 Mar 2025 21:37:12 +0100
Subject: [PATCH] update headers ex04

---
 module00/ex04/bitmanip.h | 45 ++++++++++++++++++++++++++++++++++++----
 module00/ex04/elements.h | 42 -------------------------------------
 module00/ex04/main.c     |  1 -
 module00/ex04/utils.h    | 12 +++++------
 4 files changed, 47 insertions(+), 53 deletions(-)
 delete mode 100644 module00/ex04/elements.h

diff --git a/module00/ex04/bitmanip.h b/module00/ex04/bitmanip.h
index 2c00a8e..5e36761 100644
--- a/module00/ex04/bitmanip.h
+++ b/module00/ex04/bitmanip.h
@@ -1,10 +1,47 @@
 #ifndef BITMANIP_H
 #define BITMANIP_H
 
+#include "utils.h"
+
 // Bit operations 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)))
+#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)))
+
+// Get arguments from tuple-like definitions
+#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 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)
+
+// Bit definitions
+#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)
 
 #endif // BITMANIP_H
\ No newline at end of file
diff --git a/module00/ex04/elements.h b/module00/ex04/elements.h
deleted file mode 100644
index a68d55b..0000000
--- a/module00/ex04/elements.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef ELEMENTS_H
-#define ELEMENTS_H
-
-#include "utils.h"
-#include "bitmanip.h"
-
-// Get arguments from tuple-like definitions
-#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 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)
-
-// Bit definitions
-#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)
-
-#endif
\ No newline at end of file
diff --git a/module00/ex04/main.c b/module00/ex04/main.c
index 5bb00d7..357f9d5 100644
--- a/module00/ex04/main.c
+++ b/module00/ex04/main.c
@@ -3,7 +3,6 @@
 
 #include "utils.h"
 #include "bitmanip.h"
-#include "elements.h"
 
 typedef struct {
     int *value;
diff --git a/module00/ex04/utils.h b/module00/ex04/utils.h
index 3a98eb2..ad2e478 100644
--- a/module00/ex04/utils.h
+++ b/module00/ex04/utils.h
@@ -1,12 +1,12 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-// Stringify
-#define STRINGIFY_HELPER(x) #x
-#define STRINGIFY(x) STRINGIFY_HELPER(x)
+// 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)
+// concatenate
+#define CONCAT_HELPER(x, y)		x ## y
+#define CONCAT(x, y)			CONCAT_HELPER(x, y)
 
 #endif // UTILS_H
\ No newline at end of file