diff --git a/module04/ex00 copy/Makefile b/module04/ex00 copy/Makefile new file mode 100644 index 0000000..2e40cba --- /dev/null +++ b/module04/ex00 copy/Makefile @@ -0,0 +1 @@ +include ../../Makefile \ No newline at end of file diff --git a/module04/ex00 copy/bitmanip.h b/module04/ex00 copy/bitmanip.h new file mode 100644 index 0000000..ce33649 --- /dev/null +++ b/module04/ex00 copy/bitmanip.h @@ -0,0 +1,61 @@ +#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 copy/header.h b/module04/ex00 copy/header.h new file mode 100644 index 0000000..b4fe0d1 --- /dev/null +++ b/module04/ex00 copy/header.h @@ -0,0 +1,17 @@ +#ifndef HEADER_H +#define HEADER_H + +#include +#include +#include + +#include "utils.h" +#include "bitmanip.h" +#include "interrupt.h" + +// +// PROTOTYPES +// +// main.c + +#endif // HEADER_H \ No newline at end of file diff --git a/module04/ex00 copy/interrupt.h b/module04/ex00 copy/interrupt.h new file mode 100644 index 0000000..9668ef7 --- /dev/null +++ b/module04/ex00 copy/interrupt.h @@ -0,0 +1,8 @@ +#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/ex00/bitmanip.h b/module04/ex00/bitmanip.h index bf9c297..ce33649 100644 --- a/module04/ex00/bitmanip.h +++ b/module04/ex00/bitmanip.h @@ -33,6 +33,8 @@ #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 diff --git a/module04/ex00/header.h b/module04/ex00/header.h index 4acb896..b4fe0d1 100644 --- a/module04/ex00/header.h +++ b/module04/ex00/header.h @@ -6,9 +6,7 @@ #include #include "utils.h" -#include "timer.h" #include "bitmanip.h" -#include "usart.h" #include "interrupt.h" // diff --git a/module04/ex00/main.c b/module04/ex00/main.c index 291c3d0..9b9e6ca 100644 --- a/module04/ex00/main.c +++ b/module04/ex00/main.c @@ -1,8 +1,43 @@ #include "header.h" +// 14.3.3 : alternate functions on port D +// PD2 : - INT0 (External Interrupt 0 Input) +// - PCINT18 (Pin Change Interrupt 18) +// 12.4 : Interrupt Vectors in ATmega328 and ATmega328P +// - INT0 : External Interrupt Request 0 -// led RGB D5 must turns on in a loop of colors using PWM +typedef enum { + DOWN, + UP +} State; +volatile uint8_t button_state = UP; + +// Table 13-2 : interrupt types +#define INT0_LOW ((0 << ISC01) | (0 << ISC01)) +#define INT0_LOGICAL ((0 << ISC01) | (1 << ISC01)) +#define INT0_FALLING ((1 << ISC01) | (0 << ISC01)) +#define INT0_RAISING ((1 << ISC01) | (1 << ISC01)) + +// use interruption to change led1 state when button1 is pressed int main() { + MODE_OUTPUT(LED1); + CLEAR_ELEM(LED1); + MODE_INPUT(BUTTON1); + PULLUP_ON(BUTTON1); + + SREG |= ENABLE_GLOBAL_INTERRUPT; + + EIMSK = (1 << INT0); // 13.2.2 : Enable INT0 interrupt (EIMSK – External Interrupt Mask Register) + EICRA = INT0_LOGICAL; // Table 13-2 : trigger type (EICRA – External Interrupt Control Register A) + while (1); } +ISR(INT0_vect) { + _delay_ms(50); + button_state = (button_state == UP) ? DOWN : UP; + if (button_state == UP) { + TOGGLE_ELEM(LED1); + } + // EIFR = (1 << INTF0); // 13.2.3 : clear flag, why ? i think it only indicates that a trigger event has occured +}