mirror
/
SP8EBC-ParaTNC
kopia lustrzana https://github.com/SP8EBC/ParaTNC
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

tx20 cleaned out

pull/2/head
Mateusz Lubecki 2021-04-04 11:13:09 +02:00
rodzic 612807cf56
commit 0f732591e1
10 zmienionych plików z 24 dodań i 62 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
Debug/system/src/drivers/subdir.mk
Wyświetl plik

@ -12,8 +12,7 @@ C_SRCS += \
../system/src/drivers/gpio_conf.c \
../system/src/drivers/i2c.c \
../system/src/drivers/ms5611.c \
../system/src/drivers/serial.c \
../system/src/drivers/tx20.c
../system/src/drivers/serial.c
OBJS += \
./system/src/drivers/_dht22.o \
@ -24,8 +23,7 @@ OBJS += \
./system/src/drivers/gpio_conf.o \
./system/src/drivers/i2c.o \
./system/src/drivers/ms5611.o \
./system/src/drivers/serial.o \
./system/src/drivers/tx20.o
./system/src/drivers/serial.o
C_DEPS += \
./system/src/drivers/_dht22.d \
@ -36,8 +34,7 @@ C_DEPS += \
./system/src/drivers/gpio_conf.d \
./system/src/drivers/i2c.d \
./system/src/drivers/ms5611.d \
./system/src/drivers/serial.d \
./system/src/drivers/tx20.d
./system/src/drivers/serial.d
# Each subdirectory must supply rules for building sources it contributes

18
include/config_data.h
Wyświetl plik

@ -78,15 +78,6 @@ typedef struct config_data_basic_t {
} config_data_basic_t;
typedef struct config_data_wx_sources_t {
config_data_wx_sources_enum_t temperature;
config_data_wx_sources_enum_t pressure;
config_data_wx_sources_enum_t humidity;
config_data_wx_sources_enum_t wind;
} config_data_wx_sources_t;
typedef enum config_data_wx_sources_enum_t {
/**
* Internal sensors are:
@ -119,6 +110,15 @@ typedef enum config_data_wx_sources_enum_t {
WX_SOURCE_DAVIS_SERIAL = 5
} config_data_wx_sources_enum_t;
typedef struct config_data_wx_sources_t {
config_data_wx_sources_enum_t temperature;
config_data_wx_sources_enum_t pressure;
config_data_wx_sources_enum_t humidity;
config_data_wx_sources_enum_t wind;
} config_data_wx_sources_t;
typedef struct config_data_umb_t {
uint16_t slave_class;

24
include/rte_rtu.h
Wyświetl plik

@ -26,29 +26,17 @@ extern uint16_t rte_rtu_number_of_successfull_serial_comm;
//#ifdef _MODBUS_RTU
#if defined(_RTU_SLAVE_ID_1) && (_RTU_SLAVE_FUNC_1 == 0x03 || _RTU_SLAVE_FUNC_1 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F1_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F1_NAME;
#if defined(_RTU_SLAVE_ID_2) && (_RTU_SLAVE_FUNC_2 == 0x03 || _RTU_SLAVE_FUNC_2 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F2_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F2_NAME;
#if defined(_RTU_SLAVE_ID_3) && (_RTU_SLAVE_FUNC_3 == 0x03 || _RTU_SLAVE_FUNC_3 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F3_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F3_NAME;
#if defined(_RTU_SLAVE_ID_4) && (_RTU_SLAVE_FUNC_4 == 0x03 || _RTU_SLAVE_FUNC_4 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F4_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F4_NAME;
#if defined(_RTU_SLAVE_ID_5) && (_RTU_SLAVE_FUNC_5 == 0x03 || _RTU_SLAVE_FUNC_5 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F5_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F5_NAME;
#if defined(_RTU_SLAVE_ID_6) && (_RTU_SLAVE_FUNC_6 == 0x03 || _RTU_SLAVE_FUNC_6 == 0x04)
extern rtu_register_data_t RTU_GETTERS_F6_NAME;
#endif
extern rtu_register_data_t RTU_GETTERS_F6_NAME;
extern rtu_exception_t rte_rtu_last_modbus_exception;
extern uint32_t rte_rtu_last_modbus_rx_error_timestamp;

1
src/it_handlers.c
Wyświetl plik

@ -8,7 +8,6 @@
#include <delay.h>
#include <stm32f10x.h>
#include "drivers/dallas.h"
#include "drivers/tx20.h"
#include "drivers/ms5611.h"
#include "drivers/_dht22.h"
#include "drivers/serial.h"

1
src/main.c
Wyświetl plik

@ -40,7 +40,6 @@
#include <wx_handler.h>
#include "drivers/dallas.h"
#include "drivers/i2c.h"
#include "drivers/tx20.h"
#include "drivers/analog_anemometer.h"
#include "aprs/wx.h"

1
src/packet_tx_handler.c
Wyświetl plik

@ -8,7 +8,6 @@
#include "./aprs/wx.h"
#include "./aprs/telemetry.h"
#include "./drivers/tx20.h"
#include "./drivers/serial.h"
#include "./umb_master/umb_master.h"

29
src/rte_rtu.c
Wyświetl plik

@ -14,43 +14,26 @@ uint8_t rte_rtu_number_of_serial_io_errors = 0;
uint16_t rte_rtu_number_of_successfull_serial_comm = 0;
//#ifdef _MODBUS_RTU
rtu_register_data_t RTU_GETTERS_F1_NAME;
#if defined(_RTU_SLAVE_ID_1) && (_RTU_SLAVE_FUNC_1 == 0x03 || _RTU_SLAVE_FUNC_1 == 0x04)
rtu_register_data_t RTU_GETTERS_F1_NAME;
#endif
rtu_register_data_t RTU_GETTERS_F2_NAME;
#if defined(_RTU_SLAVE_ID_2) && (_RTU_SLAVE_FUNC_2 == 0x03 || _RTU_SLAVE_FUNC_2 == 0x04)
rtu_register_data_t RTU_GETTERS_F2_NAME;
#endif
rtu_register_data_t RTU_GETTERS_F3_NAME;
#if defined(_RTU_SLAVE_ID_3) && (_RTU_SLAVE_FUNC_3 == 0x03 || _RTU_SLAVE_FUNC_3 == 0x04)
rtu_register_data_t RTU_GETTERS_F3_NAME;
#endif
rtu_register_data_t RTU_GETTERS_F4_NAME;
#if defined(_RTU_SLAVE_ID_4) && (_RTU_SLAVE_FUNC_4 == 0x03 || _RTU_SLAVE_FUNC_4 == 0x04)
rtu_register_data_t RTU_GETTERS_F4_NAME;
#endif
rtu_register_data_t RTU_GETTERS_F5_NAME;
#if defined(_RTU_SLAVE_ID_5) && (_RTU_SLAVE_FUNC_5 == 0x03 || _RTU_SLAVE_FUNC_5 == 0x04)
rtu_register_data_t RTU_GETTERS_F5_NAME;
#endif
#if defined(_RTU_SLAVE_ID_6) && (_RTU_SLAVE_FUNC_6 == 0x03 || _RTU_SLAVE_FUNC_6 == 0x04)
rtu_register_data_t RTU_GETTERS_F6_NAME;
#endif
rtu_register_data_t RTU_GETTERS_F6_NAME;
rtu_exception_t rte_rtu_last_modbus_exception;
uint32_t rte_rtu_last_modbus_exception_timestamp;
uint32_t rte_rtu_last_modbus_rx_error_timestamp;
rtu_pool_queue_t rte_rtu_pool_queue;
//#endif
void rte_rtu_init(void) {
#ifdef _MODBUS_RTU
rte_rtu_last_modbus_exception_timestamp = 0;
rte_rtu_last_modbus_rx_error_timestamp = 0;
rte_rtu_last_modbus_exception = RTU_EXCEPTION_OK;
#endif
}

1
src/wx_handler.c
Wyświetl plik

@ -15,7 +15,6 @@
#include "drivers/ms5611.h"
#include "drivers/bme280.h"
#include "drivers/analog_anemometer.h"
#include "drivers/tx20.h"
#include "station_config.h"

1
system/include/aprs/wx.h
Wyświetl plik

@ -8,7 +8,6 @@
#ifndef INCLUDE_APRS_WX_H_
#define INCLUDE_APRS_WX_H_
#include "drivers/tx20.h"
#include "station_config.h"
#include <stdint.h>

1
system/src/aprs/wx.c
Wyświetl plik

@ -7,7 +7,6 @@
#include "aprs/wx.h"
#include "aprs/digi.h"
#include "drivers/tx20.h"
#include "main.h"
#include "rte_main.h"