diff --git a/module04/ex00/bitmanip.h b/module04/ex00/bitmanip.h deleted file mode 100644 index ce33649..0000000 --- a/module04/ex00/bitmanip.h +++ /dev/null @@ -1,61 +0,0 @@ -#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))) - -// 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 -// // version with "LED1 B, D1" without parenthesis -// #define ARG_1(v1, ...) v1 -// #define ARG_2(v1, v2, ...) v2 -// #define GET_PORT(...) ARG_1(__VA_ARGS__) -// #define GET_BIT(...) ARG_2(__VA_ARGS__) - -// Actions on elements -// #define SET_ELEM(...) SET(CONCAT(PORT, GET_PORT(__VA_ARGS__)), GET_BIT(__VA_ARGS__)) // version for "LED1 B, D1" without parenthesis -#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) -#define PULLUP_ON(elem) SET(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) -#define PULLUP_OFF(elem) CLEAR(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) - -// Bit definitions -#define D1 0 -#define D2 1 -#define D3 2 -#define D4 4 -#define SW1 2 -#define SW2 4 -#define D5B 3 -#define D5R 5 -#define D5G 6 - -// 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) -#define RGB5_BLUE (D, D5B) -#define RGB5_RED (D, D5R) -#define RGB5_GEEN (D, D5G) - -#endif // BITMANIP_H \ No newline at end of file diff --git a/module04/ex00/interrupt.h b/module04/ex00/interrupt.h deleted file mode 100644 index 9668ef7..0000000 --- a/module04/ex00/interrupt.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H - -// 7.3.1 : SREG – AVR Status Register -#define ENABLE_GLOBAL_INTERRUPT (1<= 'A' && (ch) <= 'Z') || ((ch) >= 'a' && (ch) <= 'z') ? ((ch) ^ (1 << 5)) : (ch)) - -// boolean -#define TRUE 1 -#define FALSE 0 - -#endif // UTILS_H \ No newline at end of file diff --git a/module04/ex01/bitmanip.h b/module04/ex01/bitmanip.h deleted file mode 100644 index 0808aec..0000000 --- a/module04/ex01/bitmanip.h +++ /dev/null @@ -1,61 +0,0 @@ -#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))) - -// 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 -// // version with "LED1 B, D1" without parenthesis -// #define ARG_1(v1, ...) v1 -// #define ARG_2(v1, v2, ...) v2 -// #define GET_PORT(...) ARG_1(__VA_ARGS__) -// #define GET_BIT(...) ARG_2(__VA_ARGS__) - -// Actions on elements -// #define SET_ELEM(...) SET(CONCAT(PORT, GET_PORT(__VA_ARGS__)), GET_BIT(__VA_ARGS__)) // version for "LED1 B, D1" without parenthesis -#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) -#define PULLUP_ON(elem) SET(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) -#define PULLUP_OFF(elem) CLEAR(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) - -// Bit definitions ( // ) -#define D1 0 // PB0 -#define D2 1 // PB1 -#define D3 2 // PB2 -#define D4 4 // PB4 -#define SW1 2 // PD2 -#define SW2 4 // PD4 -#define D5B 3 // PD3 -#define D5R 5 // PD5 -#define D5G 6 // PD6 - -// 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) -#define RGB5_BLUE (D, D5B) -#define RGB5_RED (D, D5R) -#define RGB5_GEEN (D, D5G) - -#endif // BITMANIP_H \ No newline at end of file diff --git a/module04/ex01/interrupt.h b/module04/ex01/interrupt.h deleted file mode 100644 index 9668ef7..0000000 --- a/module04/ex01/interrupt.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H - -// 7.3.1 : SREG – AVR Status Register -#define ENABLE_GLOBAL_INTERRUPT (1<= 'A' && (ch) <= 'Z') || ((ch) >= 'a' && (ch) <= 'z') ? ((ch) ^ (1 << 5)) : (ch)) - -// boolean -#define TRUE 1 -#define FALSE 0 - -#endif // UTILS_H \ No newline at end of file diff --git a/module04/ex02/bitmanip.h b/module04/ex02/bitmanip.h deleted file mode 100644 index 0808aec..0000000 --- a/module04/ex02/bitmanip.h +++ /dev/null @@ -1,61 +0,0 @@ -#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))) - -// 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 -// // version with "LED1 B, D1" without parenthesis -// #define ARG_1(v1, ...) v1 -// #define ARG_2(v1, v2, ...) v2 -// #define GET_PORT(...) ARG_1(__VA_ARGS__) -// #define GET_BIT(...) ARG_2(__VA_ARGS__) - -// Actions on elements -// #define SET_ELEM(...) SET(CONCAT(PORT, GET_PORT(__VA_ARGS__)), GET_BIT(__VA_ARGS__)) // version for "LED1 B, D1" without parenthesis -#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) -#define PULLUP_ON(elem) SET(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) -#define PULLUP_OFF(elem) CLEAR(CONCAT(PORT, GET_PORT(elem)), GET_BIT(elem)) - -// Bit definitions ( // ) -#define D1 0 // PB0 -#define D2 1 // PB1 -#define D3 2 // PB2 -#define D4 4 // PB4 -#define SW1 2 // PD2 -#define SW2 4 // PD4 -#define D5B 3 // PD3 -#define D5R 5 // PD5 -#define D5G 6 // PD6 - -// 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) -#define RGB5_BLUE (D, D5B) -#define RGB5_RED (D, D5R) -#define RGB5_GEEN (D, D5G) - -#endif // BITMANIP_H \ No newline at end of file diff --git a/module04/ex02/interrupt.h b/module04/ex02/interrupt.h deleted file mode 100644 index 9668ef7..0000000 --- a/module04/ex02/interrupt.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H - -// 7.3.1 : SREG – AVR Status Register -#define ENABLE_GLOBAL_INTERRUPT (1<= 'A' && (ch) <= 'Z') || ((ch) >= 'a' && (ch) <= 'z') ? ((ch) ^ (1 << 5)) : (ch)) - -// boolean -#define TRUE 1 -#define FALSE 0 - -#endif // UTILS_H \ No newline at end of file