From dd13c6582c4499c122ffad8e2b5c1a98148553e4 Mon Sep 17 00:00:00 2001 From: hugo LAMY Date: Sat, 8 Mar 2025 21:53:15 +0100 Subject: [PATCH] mod01 update headers and descriptions --- module01/ex00/bitmanip.h | 47 +++++++++++++++++++++++++ module01/ex00/main.c | 52 +++------------------------- module01/ex00/utils.h | 12 +++++++ module01/ex01/bitmanip.h | 47 +++++++++++++++++++++++++ module01/ex01/main.c | 71 ++++---------------------------------- module01/ex01/timer.h | 15 ++++++++ module01/ex01/utils.h | 12 +++++++ module01/ex02/bitmanip.h | 47 +++++++++++++++++++++++++ module01/ex02/headers.h | 67 ------------------------------------ module01/ex02/main.c | 8 ++++- module01/ex02/timer.h | 15 ++++++++ module01/ex02/utils.h | 15 ++++++++ module01/ex03/bitmanip.h | 47 +++++++++++++++++++++++++ module01/ex03/main.c | 74 ++++++---------------------------------- module01/ex03/timer.h | 15 ++++++++ module01/ex03/utils.h | 15 ++++++++ module02/ex00/bitmanip.h | 47 +++++++++++++++++++++++++ module02/ex00/timer.h | 15 ++++++++ module02/ex00/utils.h | 15 ++++++++ 19 files changed, 392 insertions(+), 244 deletions(-) create mode 100644 module01/ex00/bitmanip.h create mode 100644 module01/ex00/utils.h create mode 100644 module01/ex01/bitmanip.h create mode 100644 module01/ex01/timer.h create mode 100644 module01/ex01/utils.h create mode 100644 module01/ex02/bitmanip.h delete mode 100644 module01/ex02/headers.h create mode 100644 module01/ex02/timer.h create mode 100644 module01/ex02/utils.h create mode 100644 module01/ex03/bitmanip.h create mode 100644 module01/ex03/timer.h create mode 100644 module01/ex03/utils.h create mode 100644 module02/ex00/bitmanip.h create mode 100644 module02/ex00/timer.h create mode 100644 module02/ex00/utils.h diff --git a/module01/ex00/bitmanip.h b/module01/ex00/bitmanip.h new file mode 100644 index 0000000..5e36761 --- /dev/null +++ b/module01/ex00/bitmanip.h @@ -0,0 +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))) + +// 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/module01/ex00/main.c b/module01/ex00/main.c index 965f86a..ae534b4 100644 --- a/module01/ex00/main.c +++ b/module01/ex00/main.c @@ -1,54 +1,9 @@ #include -// stringify -#define STRINGIFY_HELPER(x) #x -#define STRINGIFY(x) STRINGIFY_HELPER(x) +#include "utils.h" +#include "bitmanip.h" -// 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 +// TIMER #define PRESCALE_VALUE 1024 // can be 1, 8, 64, 256, 1024 // table 16-5 : prescale sets #define PRESCALE_SET(value) \ @@ -62,6 +17,7 @@ // END MACROS +// write a program that blinks an LED every 500ms using a software timer int main() { MODE_OUTPUT(LED2); CLEAR_ELEM(LED2); diff --git a/module01/ex00/utils.h b/module01/ex00/utils.h new file mode 100644 index 0000000..ad2e478 --- /dev/null +++ b/module01/ex00/utils.h @@ -0,0 +1,12 @@ +#ifndef UTILS_H +#define UTILS_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) + +#endif // UTILS_H \ No newline at end of file diff --git a/module01/ex01/bitmanip.h b/module01/ex01/bitmanip.h new file mode 100644 index 0000000..5e36761 --- /dev/null +++ b/module01/ex01/bitmanip.h @@ -0,0 +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))) + +// 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/module01/ex01/main.c b/module01/ex01/main.c index 821f707..22b351c 100644 --- a/module01/ex01/main.c +++ b/module01/ex01/main.c @@ -1,77 +1,20 @@ #include -// stringify -#define STRINGIFY_HELPER(x) #x -#define STRINGIFY(x) STRINGIFY_HELPER(x) +#include "utils.h" +#include "bitmanip.h" +#include "timer.h" -// 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< -#include "headers.h" + +#include "utils.h" +#include "bitmanip.h" +#include "timer.h" + +#define PERIOD 1000 +#define DUTY_CYCLE 10 // turns on led2 at 1Hz and duty cycle of 10%, not using PORTx, with empty infinite loop int main() { diff --git a/module01/ex02/timer.h b/module01/ex02/timer.h new file mode 100644 index 0000000..3cb618e --- /dev/null +++ b/module01/ex02/timer.h @@ -0,0 +1,15 @@ +#ifndef TIMER_H +#define TIMER_H + +#define PRESCALE_VALUE 1024 // can be 1, 8, 64, 256, 1024 +// table 16-5 : prescale sets +#define PRESCALE_SET(value) \ + ((value) == 1 ? (0< #include -// stringify -#define STRINGIFY_HELPER(x) #x -#define STRINGIFY(x) STRINGIFY_HELPER(x) +#include "utils.h" +#include "bitmanip.h" +#include "timer.h" -// 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< OC1A (alternate function of PORTB1, aka LED2) is cleared when TCNT1 (the counter value) equals OCR1A + OCR1A = TIME_MS(PERCENT(DUTY_CYCLE, PERIOD)); // 16.9.3 : set the duty cycle to DUTY_CYCLE% of the time in 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) { on_press(SW1, increment_duty_cycle, ¶ms); diff --git a/module01/ex03/timer.h b/module01/ex03/timer.h new file mode 100644 index 0000000..3cb618e --- /dev/null +++ b/module01/ex03/timer.h @@ -0,0 +1,15 @@ +#ifndef TIMER_H +#define TIMER_H + +#define PRESCALE_VALUE 1024 // can be 1, 8, 64, 256, 1024 +// table 16-5 : prescale sets +#define PRESCALE_SET(value) \ + ((value) == 1 ? (0<