From 4a9fe6cd95b307deffb02f462a7ecc1961d7a5bb Mon Sep 17 00:00:00 2001 From: hugo LAMY Date: Thu, 6 Mar 2025 10:26:39 +0100 Subject: [PATCH] updated mains macros --- module00/ex02/main.c | 139 ++++++++++++++++--------------------------- module00/ex03/main.c | 76 ++++++++++++++++------- module00/ex04/main.c | 82 +++++++++++++++++-------- module01/ex00/main.c | 71 +++++++++++++--------- module01/ex01/main.c | 67 +++++++++++++-------- module01/ex02/main.c | 61 +------------------ 6 files changed, 254 insertions(+), 242 deletions(-) diff --git a/module00/ex02/main.c b/module00/ex02/main.c index df70984..4e03d41 100644 --- a/module00/ex02/main.c +++ b/module00/ex02/main.c @@ -1,101 +1,66 @@ #include -#include -// test with https://www.onlinegdb.com/online_c_compiler -// // V1 -// -// // macro to extract port and bit from a single pin -// #define _PORT(pin) ((pin) >> 3) -// #define _BIT(pin) ((pin) & 0x07) // 0x07 is 00000111 -// -// // helper macros for port name concatenation -// #define _CONCAT(a, b) a ## b -// #define PORT_REGISTER(pin) _CONCAT(PORT, _PORT(pin)) -// #define DDR_REGISTER(pin) _CONCAT(DDR, _PORT(pin)) -// #define PIN_REGISTER(pin) _CONCAT(PIN, _PORT(pin)) -// -// // Macros to set/clear/toggle specific bit -// #define SET(REGISTER, PIN) REGISTER |= 1 << _BIT(PIN) -// #define CLEAR(REGISTER, PIN) REGISTER &= ~(1 << _BIT(PIN)) -// #define TOGGLE(REGISTER, PIN) REGISTER ^= 1 << _BIT(PIN) -// #define MODE_OUTPUT(PIN) (DDR_REGISTER(PIN) |= 1 << _BIT(PIN)) -// #define MODE_INPUT(PIN) (DDR_REGISTER(PIN) &= ~(1 << _BIT(PIN))) -// -// // Test and check macros -// #define TEST_PIN(PIN) (PIN_REGISTER(PIN) & (1 << _BIT(PIN))) -// #define IS_SET(PIN) (TEST(PIN) != 0) -// #define IS_CLEAR(PIN) (TEST(PIN) == 0) -// -// // Pin definitions -// #define D1 (0 + (1 << 3)) // Port B, bit 0 -// #define D2 (1 + (1 << 3)) // Port B, bit 1 -// #define D3 (2 + (1 << 3)) // Port B, bit 2 -// #define D4 (4 + (1 << 3)) // Port B, bit 4 -// #define SW1 (2 + (3 << 3)) // Port D, bit 2 -// #define SW2 (4 + (3 << 3)) // Port D, bit 4 +// stringify +#define STRINGIFY_HELPER(x) #x +#define STRINGIFY(x) STRINGIFY_HELPER(x) -// // V2 -// -// // Define the ports -// #define PORT_B 0 // Port A (represented by 0) -// #define PORT_C 1 // Port B (represented by 1) -// #define PORT_D 2 // Port C (represented by 2) -// -// // Macros to extract the port and bit -// #define _PORT_INT(pin) ((pin) >> 3) // Extract the port -// #define _PORT(pin) \ -// ((_PORT_INT(pin)) == PORT_B ? 'B' : \ -// ((_PORT_INT(pin)) == PORT_C ? 'C' : \ -// ((_PORT_INT(pin)) == PORT_D ? 'D' : \ -// 'X'))) -// #define _BIT(pin) ((pin) & 0x07) // Extract the bit -// -// // Macros to set/clear/toggle specific bit -// #define SET(REGISTER, PIN) REGISTER |= 1 << _BIT(PIN) -// #define CLEAR(REGISTER, PIN) REGISTER &= ~(1 << _BIT(PIN)) -// #define TOGGLE(REGISTER, PIN) REGISTER ^= 1 << _BIT(PIN) -// #define MODE_OUTPUT(PIN) (_PORT(PIN) |= 1 << _BIT(PIN)) -// #define MODE_INPUT(PIN) (_PORT(PIN) &= ~(1 << _BIT(PIN))) -// -// // Test and check macros -// #define TEST(PIN) (PIN_REGISTER(PIN) & (1 << _BIT(PIN))) -// #define IS_SET(PIN) (TEST(PIN) != 0) -// #define IS_CLEAR(PIN) (TEST(PIN) == 0) -// -// // Define each LED's port and bit using macros -// #define D1 (PORT_B << 3 | 0) // LED1 is on Port B, bit 0 -// #define D2 (PORT_B << 3 | 1) // LED2 is on Port A, bit 1 -// #define D3 (PORT_B << 3 | 2) // LED3 is on Port C, bit 2 -// #define D4 (PORT_B << 3 | 4) // LED4 is on Port C, bit 4 +// concatenate +#define CONCAT_HELPER(x, y) x ## y +#define CONCAT(x, y) CONCAT_HELPER(x, y) -// V0 +// 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 -#define SET(REGISTER, BIT) REGISTER |= 1 << BIT -#define CLEAR(REGISTER, BIT) REGISTER &= ~(1 << BIT) -#define TEST(REGISTER, BIT) REGISTER & 1 << BIT -#define TEST_PIN(PORT, BIT) PIN ## PORT & 1 << BIT -#define TOGGLE(REGISTER, BIT) REGISTER ^= 1 << BIT -#define MODE_INPUT(PORT, BIT) CLEAR(DDR ## PORT, BIT) -#define MODE_OUTPUT(PORT, BIT) SET(DDR ## PORT, BIT) -#define IS_PIN_SET(PORT, BIT) (TEST_PIN(PORT, BIT)) == 0 -#define IS_PIN_CLEAR(PORT, BIT) (TEST_PIN(PORT, BIT)) == 1 +// 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 -#define D1 0 -#define D2 1 -#define D3 2 -#define D4 4 -#define SW1 2 -#define SW2 4 +// 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) + +#define BUTTON(id) + +// END MACROS int main() { - MODE_OUTPUT(B, D1); - MODE_INPUT(D, SW1); + MODE_OUTPUT(LED1); + MODE_INPUT(BUTTON1); while(1) { - if (IS_PIN_SET(D, SW1)) { - SET(PORTB, D1); + if (IS_PIN_SET(BUTTON1)) { + SET_ELEM(LED1); } else { - CLEAR(PORTB, D1); + CLEAR_ELEM(LED1); } } return 0; diff --git a/module00/ex03/main.c b/module00/ex03/main.c index 76f9f5a..edf82c1 100644 --- a/module00/ex03/main.c +++ b/module00/ex03/main.c @@ -1,32 +1,66 @@ #include #include -#define SET(REGISTER, BIT) REGISTER |= 1 << BIT -#define CLEAR(REGISTER, BIT) REGISTER &= ~(1 << BIT) -#define TEST(REGISTER, BIT) REGISTER & 1 << BIT -#define TEST_PIN(PORT, BIT) PIN ## PORT & 1 << BIT -#define TOGGLE(REGISTER, BIT) REGISTER ^= 1 << BIT -#define TOGGLE_PIN(PORT, BIT) PIN ## PORT |= 1 << BIT -#define MODE_INPUT(PORT, BIT) CLEAR(DDR ## PORT, BIT) -#define MODE_OUTPUT(PORT, BIT) SET(DDR ## PORT, BIT) -#define IS_PIN_SET(PORT, BIT) (TEST_PIN(PORT, BIT)) == 0 -#define IS_PIN_CLEAR(PORT, BIT) (TEST_PIN(PORT, BIT)) == 1 +// stringify +#define STRINGIFY_HELPER(x) #x +#define STRINGIFY(x) STRINGIFY_HELPER(x) -#define D1 0 -#define D2 1 -#define D3 2 -#define D4 4 -#define SW1 2 -#define SW2 4 +// 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) + +#define BUTTON(id) + +// END MACROS int main() { - MODE_OUTPUT(B, D1); - MODE_INPUT(D, SW1); + MODE_OUTPUT(LED1); + MODE_INPUT(BUTTON1); while(1) { - if (IS_PIN_SET(D, SW1)) { - TOGGLE_PIN(B, D1); + if (IS_PIN_SET(BUTTON1)) { + TOGGLE_PIN(LED1); _delay_ms(20); - while(IS_PIN_SET(D, SW1)) { + while(IS_PIN_SET(BUTTON1)) { continue; } _delay_ms(20); diff --git a/module00/ex04/main.c b/module00/ex04/main.c index 3a743fb..200e181 100644 --- a/module00/ex04/main.c +++ b/module00/ex04/main.c @@ -1,23 +1,57 @@ #include #include -#define SET(REGISTER, BIT) REGISTER |= 1 << BIT -#define CLEAR(REGISTER, BIT) REGISTER &= ~(1 << BIT) -#define TEST(REGISTER, BIT) REGISTER & 1 << BIT -#define TEST_PIN(PORT, BIT) PIN ## PORT & 1 << BIT -#define TOGGLE(REGISTER, BIT) REGISTER ^= 1 << BIT -#define TOGGLE_PIN(PORT, BIT) PIN ## PORT |= 1 << BIT -#define MODE_INPUT(PORT, BIT) CLEAR(DDR ## PORT, BIT) -#define MODE_OUTPUT(PORT, BIT) SET(DDR ## PORT, BIT) -#define IS_PIN_SET(PORT, BIT) (TEST_PIN(PORT, BIT)) == 0 -#define IS_PIN_CLEAR(PORT, BIT) (TEST_PIN(PORT, BIT)) == 1 +// stringify +#define STRINGIFY_HELPER(x) #x +#define STRINGIFY(x) STRINGIFY_HELPER(x) -#define D1 0 -#define D2 1 -#define D3 2 -#define D4 4 -#define SW1 2 -#define SW2 4 +// 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) + +#define BUTTON(id) + +// END MACROS typedef struct { int *value; @@ -57,10 +91,10 @@ void decrement_led(void *param) { } void on_press(int bit, void (*action)(void*), void *params) { - if (IS_PIN_SET(D, bit)) { + if ((TEST(PIND, bit)) == 0) { action(params); _delay_ms(20); - while (IS_PIN_SET(D, bit)) { + while ((TEST(PIND, bit)) == 0) { continue; } _delay_ms(20); @@ -68,12 +102,12 @@ void on_press(int bit, void (*action)(void*), void *params) { } int main() { - MODE_OUTPUT(B, D1); - MODE_OUTPUT(B, D2); - MODE_OUTPUT(B, D3); - MODE_OUTPUT(B, D4); - MODE_INPUT(D, SW1); - MODE_INPUT(D, SW2); + MODE_OUTPUT(LED1); + MODE_OUTPUT(LED2); + MODE_OUTPUT(LED3); + MODE_OUTPUT(LED4); + MODE_INPUT(BUTTON1); + MODE_INPUT(BUTTON2); int value = 0; int max = 15; diff --git a/module01/ex00/main.c b/module01/ex00/main.c index bb185c0..67fced5 100644 --- a/module01/ex00/main.c +++ b/module01/ex00/main.c @@ -1,37 +1,52 @@ #include -// #define FIRST_LETTER_IMPL(x) #x[0] -// #define FIRST_LETTER(x) FIRST_LETTER_IMPL(x) -// #define PORT_LETTER(PIN) FIRST_LETTER(PIN) +// stringify +#define STRINGIFY_HELPER(x) #x +#define STRINGIFY(x) STRINGIFY_HELPER(x) -// global registers +// 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 ports -#define TEST_PIN(port, bit) TEST(PIN ## port, bit) -#define TOGGLE_PIN(port, bit) SET(PIN ## port, bit) -#define MODE_INPUT(port, bit) CLEAR(DDR ## port, bit) -#define MODE_OUTPUT(port, bit) SET(DDR ## port, bit) -#define IS_PIN_SET(port, bit) (TEST_PIN(port, bit)) == 0 -#define IS_PIN_CLEAR(port, bit) (TEST_PIN(port, bit)) == 1 -#define TURN_ON(_PORT, BIT) SET(PORT ## _PORT, BIT) -#define TURN_OFF(_PORT, BIT) CLEAR(PORT ## _PORT, 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) -// LEDs -#define TURN_ON_LED(bit) SET(PORTB, bit) -#define TURN_OFF_LED(bit) CLEAR(PORTB, bit) -#define TOGGLE_LED(led) TOGGLE_PIN(B, led) +// bits +#define D1 0 +#define D2 1 +#define D3 2 +#define D4 4 +#define SW1 2 +#define SW2 4 -// ELEMENTS -#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 @@ -48,9 +63,11 @@ #endif #define TIME_MS(ms) (((F_CPU / PRESCALE_VALUE) * ms) / 1000) +// END MACROS + int main() { - MODE_OUTPUT(B, D2); - TURN_OFF_LED(D2); + MODE_OUTPUT(LED2); + CLEAR_ELEM(LED2); TCCR1B |= (PRESCALE_SET); // set timer with prescale // -> 16.4 : set timer with bits CS10-12, in register TCCR1B @@ -58,7 +75,7 @@ int main() { while(1) { if (TCNT1 >= TIME_MS(500)) { // 16.11.4 : read timer with register TCNT1 (read/write allowed), that combines two 8 bits registers - TOGGLE_LED(D2); + TOGGLE_PIN(LED2); TCNT1 = 0; // reset timer value, also in register TCNT1 } } diff --git a/module01/ex01/main.c b/module01/ex01/main.c index e60fb16..ca7bdea 100644 --- a/module01/ex01/main.c +++ b/module01/ex01/main.c @@ -1,37 +1,52 @@ #include -// #define FIRST_LETTER_IMPL(x) #x[0] -// #define FIRST_LETTER(x) FIRST_LETTER_IMPL(x) -// #define PORT_LETTER(PIN) FIRST_LETTER(PIN) +// stringify +#define STRINGIFY_HELPER(x) #x +#define STRINGIFY(x) STRINGIFY_HELPER(x) -// global registers +// 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 ports -#define TEST_PIN(port, bit) TEST(PIN ## port, bit) -#define TOGGLE_PIN(port, bit) SET(PIN ## port, bit) -#define MODE_INPUT(port, bit) CLEAR(DDR ## port, bit) -#define MODE_OUTPUT(port, bit) SET(DDR ## port, bit) -#define IS_PIN_SET(port, bit) (TEST_PIN(port, bit)) == 0 -#define IS_PIN_CLEAR(port, bit) (TEST_PIN(port, bit)) == 1 -#define TURN_ON(_PORT, BIT) SET(PORT ## _PORT, BIT) -#define TURN_OFF(_PORT, BIT) CLEAR(PORT ## _PORT, 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) -// LEDs -#define TURN_ON_LED(bit) SET(PORTB, bit) -#define TURN_OFF_LED(bit) CLEAR(PORTB, bit) -#define TOGGLE_LED(led) TOGGLE_PIN(B, led) +// bits +#define D1 0 +#define D2 1 +#define D3 2 +#define D4 4 +#define SW1 2 +#define SW2 4 -// ELEMENTS -#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 @@ -48,8 +63,10 @@ #endif #define TIME_MS(ms) (((F_CPU / PRESCALE_VALUE) * ms) / 1000) +// END MACROS + int main() { - MODE_OUTPUT(B, D2); + MODE_OUTPUT(LED2); TCCR1B |= (1 << WGM12); // set timer in CTC (Clear Time on Compare) mode // -> Table 16-4 : use bit WGM12 to set mode ctc diff --git a/module01/ex02/main.c b/module01/ex02/main.c index 91ce870..c895060 100644 --- a/module01/ex02/main.c +++ b/module01/ex02/main.c @@ -1,61 +1,3 @@ -// #include - -// // #define FIRST_LETTER_IMPL(x) #x[0] -// // #define FIRST_LETTER(x) FIRST_LETTER_IMPL(x) -// // #define PORT_LETTER(PIN) FIRST_LETTER(PIN) - -// // global 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 ports -// #define TEST_PIN(port, bit) TEST(PIN ## port, bit) -// #define TOGGLE_PIN(port, bit) SET(PIN ## port, bit) -// #define MODE_INPUT(port, bit) CLEAR(DDR ## port, bit) -// #define MODE_OUTPUT(port, bit) SET(DDR ## port, bit) -// #define IS_PIN_SET(port, bit) (TEST_PIN(port, bit)) == 0 -// #define IS_PIN_CLEAR(port, bit) (TEST_PIN(port, bit)) == 1 -// #define TURN_ON(_PORT, BIT) SET(PORT ## _PORT, BIT) -// #define TURN_OFF(_PORT, BIT) CLEAR(PORT ## _PORT, BIT) - -// // LEDs -// #define TURN_ON_LED(bit) SET(PORTB, bit) -// #define TURN_OFF_LED(bit) CLEAR(PORTB, bit) -// #define TOGGLE_LED(led) TOGGLE_PIN(B, led) - -// // ELEMENTS -// #define D1 0 -// #define D2 1 -// #define D3 2 -// #define D4 4 -// #define SW1 2 -// #define SW2 4 - -// // TIME -// #define PRESCALE_VALUE 1024 -// #if (PRESCALE_VALUE == 1) -// #define PRESCALE_SET (1 << CS10) -// #elif (PRESCALE_VALUE == 8) -// #define PRESCALE_SET (1 << CS11) -// #elif (PRESCALE_VALUE == 64) -// #define PRESCALE_SET (1 << CS10) | (1 << CS11) -// #elif (PRESCALE_VALUE == 256) -// #define PRESCALE_SET (1 << CS12) -// #elif (PRESCALE_VALUE == 1024) -// #define PRESCALE_SET (1 << CS10) | (1 << CS12) -// #endif -// #define TIME_MS(ms) (((F_CPU / PRESCALE_VALUE) * ms) / 1000) - -// int main() { -// MODE_OUTPUT(B, D2); -// TURN_ON(B, D2); -// } - -////////////////////////////////////////////// - -#include #include // stringify @@ -87,6 +29,8 @@ #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 @@ -104,6 +48,7 @@ #define BUTTON1 (D, SW1) #define BUTTON2 (D, SW2) +// END MACROS int main() {