Refactored Main removed magic number and defines
This commit is contained in:
parent
6e86ae2de6
commit
4488e4fd6f
13
main/main.c
13
main/main.c
@ -23,6 +23,7 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
#define MASTER_MODE_PIN GPIO_NUM_23 // Jumper-Erkennungspin
|
#define MASTER_MODE_PIN GPIO_NUM_23 // Jumper-Erkennungspin
|
||||||
|
#define MASTER_UART UART_NUM_2
|
||||||
#define BROADCAST_INTERVAL_MS 500
|
#define BROADCAST_INTERVAL_MS 500
|
||||||
|
|
||||||
#define BUF_SIZE (1024)
|
#define BUF_SIZE (1024)
|
||||||
@ -372,11 +373,11 @@ void uart_read_task(void *param) {
|
|||||||
while (1) {
|
while (1) {
|
||||||
len = 0;
|
len = 0;
|
||||||
len =
|
len =
|
||||||
uart_read_bytes(UART_NUM_2, data, BUF_SIZE, (20 / portTICK_PERIOD_MS));
|
uart_read_bytes(MASTER_UART, data, BUF_SIZE, (20 / portTICK_PERIOD_MS));
|
||||||
if (len > 0) {
|
if (len > 0) {
|
||||||
data[len] = '\0';
|
data[len] = '\0';
|
||||||
ESP_LOGI(TAG, "GOT UART DATA %s", data);
|
ESP_LOGI(TAG, "GOT UART DATA %s", data);
|
||||||
uart_write_bytes(UART_NUM_2, data, len);
|
uart_write_bytes(MASTER_UART, data, len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -388,9 +389,9 @@ void init_uart() {
|
|||||||
.stop_bits = UART_STOP_BITS_1,
|
.stop_bits = UART_STOP_BITS_1,
|
||||||
.flow_ctrl = UART_HW_FLOWCTRL_DISABLE};
|
.flow_ctrl = UART_HW_FLOWCTRL_DISABLE};
|
||||||
|
|
||||||
uart_driver_install(UART_NUM_2, BUF_SIZE * 2, 0, 0, NULL, 0);
|
uart_driver_install(MASTER_UART, BUF_SIZE * 2, 0, 0, NULL, 0);
|
||||||
uart_param_config(UART_NUM_2, &uart_config);
|
uart_param_config(MASTER_UART, &uart_config);
|
||||||
uart_set_pin(UART_NUM_2, TXD_PIN, RXD_PIN, UART_PIN_NO_CHANGE,
|
uart_set_pin(MASTER_UART, TXD_PIN, RXD_PIN, UART_PIN_NO_CHANGE,
|
||||||
UART_PIN_NO_CHANGE);
|
UART_PIN_NO_CHANGE);
|
||||||
xTaskCreate(uart_read_task, "Read Uart", 4096, NULL, 1, NULL);
|
xTaskCreate(uart_read_task, "Read Uart", 4096, NULL, 1, NULL);
|
||||||
}
|
}
|
||||||
@ -405,7 +406,7 @@ void app_main(void) {
|
|||||||
ESP_ERROR_CHECK(ret);
|
ESP_ERROR_CHECK(ret);
|
||||||
|
|
||||||
// GPIO-Pin für Moduserkennung
|
// GPIO-Pin für Moduserkennung
|
||||||
gpio_reset_pin(Master_SlavePin);
|
gpio_reset_pin(MASTER_MODE_PIN);
|
||||||
gpio_set_direction(MASTER_MODE_PIN, GPIO_MODE_INPUT);
|
gpio_set_direction(MASTER_MODE_PIN, GPIO_MODE_INPUT);
|
||||||
bool isMaster = (gpio_get_level(MASTER_MODE_PIN) == 0);
|
bool isMaster = (gpio_get_level(MASTER_MODE_PIN) == 0);
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,4 @@
|
|||||||
#ifndef MAIN_H
|
#ifndef MAIN_H
|
||||||
#define MAIN_H
|
#define MAIN_H
|
||||||
|
|
||||||
#define Master_SlavePin 23
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user