pull/2/head
Mateusz Lubecki 2020-11-21 15:48:15 +01:00
rodzic 6df0aff814
commit 6327d7d3f1
2 zmienionych plików z 32 dodań i 32 usunięć

Wyświetl plik

@ -5,7 +5,7 @@
#include "drivers/serial.h"
#define SW_VER "DF09"
#define SW_DATE "05112020"
#define SW_DATE "06112020"
#define SYSTICK_TICKS_PER_SECONDS 100
#define SYSTICK_TICKS_PERIOD 10

Wyświetl plik

@ -133,13 +133,13 @@
// because of that D cannot be set to zero
#define _RTU_SLAVE_SPEED 9600u
#define _RTU_SLAVE_PARITY 0
#define _RTU_SLAVE_STOP_BITS 2
#define _RTU_SLAVE_STOP_BITS 1
#define _RTU_SLAVE_FULL_WIND_DATA // If this is uncommented the Modbus-RTU master will fetch full wind data
// wind speed, wind gusts and direction without any further processing
#define _RTU_SLAVE_ID_1 0x01 // temperatura
#define _RTU_SLAVE_FUNC_1 0x03
#define _RTU_SLAVE_ADDR_1 0x00
#define _RTU_SLAVE_ADDR_1 0x04
//#define _RTU_SLAVE_LENGHT_1 0x01
#define _RTU_SLAVE_SCALING_A_1 0
#define _RTU_SLAVE_SCALING_B_1 1
@ -148,48 +148,48 @@
#define _RTU_SLAVE_ID_2 0x01 // wilgotność
#define _RTU_SLAVE_FUNC_2 0x03
#define _RTU_SLAVE_ADDR_2 0x01
#define _RTU_SLAVE_ADDR_2 0x05
//#define _RTU_SLAVE_LENGHT_2 0x01
#define _RTU_SLAVE_SCALING_A_2 0
#define _RTU_SLAVE_SCALING_B_2 1
#define _RTU_SLAVE_SCALING_C_2 0
#define _RTU_SLAVE_SCALING_D_2 1
//#define _RTU_SLAVE_ID_3 0x01 // cisnienie
//#define _RTU_SLAVE_FUNC_3 0x03
//#define _RTU_SLAVE_ADDR_3 0x12
#define _RTU_SLAVE_ID_3 0x01 // cisnienie
#define _RTU_SLAVE_FUNC_3 0x03
#define _RTU_SLAVE_ADDR_3 0x03
////#define _RTU_SLAVE_LENGHT_3 0x01
//#define _RTU_SLAVE_SCALING_A_3 0
//#define _RTU_SLAVE_SCALING_B_3 33863
//#define _RTU_SLAVE_SCALING_C_3 0
//#define _RTU_SLAVE_SCALING_D_3 1000
#define _RTU_SLAVE_SCALING_A_3 0
#define _RTU_SLAVE_SCALING_B_3 33863
#define _RTU_SLAVE_SCALING_C_3 0
#define _RTU_SLAVE_SCALING_D_3 1000
//
//#define _RTU_SLAVE_ID_4 0x01 // kierunek wiatru
//#define _RTU_SLAVE_FUNC_4 0x03
//#define _RTU_SLAVE_ADDR_4 0x09
#define _RTU_SLAVE_ID_4 0x01 // kierunek wiatru
#define _RTU_SLAVE_FUNC_4 0x03
#define _RTU_SLAVE_ADDR_4 0x09
////#define _RTU_SLAVE_LENGHT_4 0x01
//#define _RTU_SLAVE_SCALING_A_4 0
//#define _RTU_SLAVE_SCALING_B_4 1
//#define _RTU_SLAVE_SCALING_C_4 0
//#define _RTU_SLAVE_SCALING_D_4 1
#define _RTU_SLAVE_SCALING_A_4 0
#define _RTU_SLAVE_SCALING_B_4 1
#define _RTU_SLAVE_SCALING_C_4 0
#define _RTU_SLAVE_SCALING_D_4 1
//
//#define _RTU_SLAVE_ID_5 0x01 // predkosc wiatru
//#define _RTU_SLAVE_FUNC_5 0x03
//#define _RTU_SLAVE_ADDR_5 0x3C
#define _RTU_SLAVE_ID_5 0x01 // predkosc wiatru
#define _RTU_SLAVE_FUNC_5 0x03
#define _RTU_SLAVE_ADDR_5 0x3C
////#define _RTU_SLAVE_LENGHT_5 0x01
//#define _RTU_SLAVE_SCALING_A_5 0
//#define _RTU_SLAVE_SCALING_B_5 44
//#define _RTU_SLAVE_SCALING_C_5 0
//#define _RTU_SLAVE_SCALING_D_5 1000
#define _RTU_SLAVE_SCALING_A_5 0
#define _RTU_SLAVE_SCALING_B_5 44
#define _RTU_SLAVE_SCALING_C_5 0
#define _RTU_SLAVE_SCALING_D_5 1000
//
//#define _RTU_SLAVE_ID_6 0x01 // porywy wiatru
//#define _RTU_SLAVE_FUNC_6 0x03
//#define _RTU_SLAVE_ADDR_6 0x3D
#define _RTU_SLAVE_ID_6 0x01 // porywy wiatru
#define _RTU_SLAVE_FUNC_6 0x03
#define _RTU_SLAVE_ADDR_6 0x3D
////#define _RTU_SLAVE_LENGHT_6 0x01
//#define _RTU_SLAVE_SCALING_A_6 0
//#define _RTU_SLAVE_SCALING_B_6 44
//#define _RTU_SLAVE_SCALING_C_6 0
//#define _RTU_SLAVE_SCALING_D_6 1000
#define _RTU_SLAVE_SCALING_A_6 0
#define _RTU_SLAVE_SCALING_B_6 44
#define _RTU_SLAVE_SCALING_C_6 0
#define _RTU_SLAVE_SCALING_D_6 1000
#define _RTU_SLAVE_TEMPERATURE_SOURCE 1
#define _RTU_SLAVE_HUMIDITY_SOURCE 2