parser for loop packets from davis vantage

pull/2/head
Mateusz Lubecki 2020-08-18 23:22:25 +02:00
rodzic 3ea8aecb9c
commit dd4e05717d
4 zmienionych plików z 139 dodań i 266 usunięć

Wyświetl plik

@ -5,13 +5,22 @@
* Author: mateusz
*/
#include "station_config.h"
#include "drivers/_dht22.h"
#include "drivers/dallas.h"
#include "drivers/ms5611.h"
#include "drivers/bme280.h"
#include "drivers/analog_anemometer.h"
#include "../umb_master/umb_master.h"
#include "../umb_master/umb_qf_t.h"
#include "umb_master/umb_master.h"
#include "umb_master/umb_qf_t.h"
//#ifdef _SENSOR_MS5611
#include "drivers/ms5611.h"
//#endif
//#ifdef _SENSOR_BME280
#include "drivers/bme280.h"
//#endif
#ifndef RTE_WX_H_
#define RTE_WX_H_
@ -51,10 +60,16 @@ extern dht22Values rte_wx_dht, rte_wx_dht_valid;
extern dallas_qf_t rte_wx_current_dallas_qf, rte_wx_error_dallas_qf;
extern dallas_average_t rte_wx_dallas_average;
extern ms5611_qf_t rte_wx_ms5611_qf;
extern bme280_qf_t rte_wx_bme280_qf;
extern analog_wind_qf_t rte_wx_wind_qf;
//#ifdef _SENSOR_MS5611
extern ms5611_qf_t rte_wx_ms5611_qf;
//#endif
#ifdef _SENSOR_BME280
extern bme280_qf_t rte_wx_bme280_qf;
#endif
#ifdef _UMB_MASTER
extern umb_frame_t rte_wx_umb;

Wyświetl plik

@ -12,7 +12,10 @@
#include "davis_loop_t.h"
#define DAVIS_PARSERS_TOO_SHORT_FRAME -1
#define DAVIS_PARSERS_CORRUPTED_CRC -2
uint32_t davis_parsers_loop(uint8_t* input, uint16_t input_ln, davis_loop_t* output);
uint32_t davis_parsers_check_crc(uint8_t input, uint16_t input_ln);
uint32_t davis_parsers_check_crc(uint8_t* input, uint16_t input_ln);
#endif /* INCLUDE_DAVIS_VANTAGE_DAVIS_PARSERS_H_ */

Wyświetl plik

@ -6,7 +6,9 @@
*/
#include <davis_vantage/davis.h>
#include <davis_vantage/davis_parsers.h>
#include <davis_vantage/davis_query_state_t.h>
#include <davis_vantage/davis_qf_t.h>
#define DAVIS_ACK 0x06
@ -37,6 +39,13 @@ davis_qf_t davis_quality_factor;
*/
uint8_t davis_avaliable;
/**
* Set to one if new loop packet is available for parsing. Cleared
* to zero after the 'davis_parsers_loop' is called
*
*/
uint8_t davis_loop_avaliable;
static const char line_feed[] = "\n";
static const char line_feed_return[] = {'\n', '\r'};
static const char loop_command[] = "LOOP 1\n";
@ -55,6 +64,8 @@ uint32_t davis_init(srl_context_t* srl_port) {
davis_avaliable = 0;
davis_loop_avaliable = 0;
// set the timeout according to davis vantage documentation
srl_switch_timeout(srl_port, 1, 1200);
@ -161,7 +172,7 @@ uint32_t davis_wake_up(uint8_t is_io_blocking) {
if (davis_serial_context->srl_rx_state == SRL_RX_DONE) {
// check the content of what was received from the davis
comparation_result = memcmp(line_feed_return, davis_serial_context->srl_rx_buf_pointer, 2);
comparation_result = memcmp(line_feed_return, srl_get_rx_buffer(davis_serial_context), 2);
if (comparation_result == 0) {
// if the base of davis wx station responden with '\r\n' it measn that wake up was sucessfull
@ -256,16 +267,24 @@ uint32_t davis_query_for_loop_packet(void) {
}
}
if (davis_serial_context->srl_rx_state == SRL_RX_ERROR) {
else if (davis_serial_context->srl_rx_state == SRL_RX_ERROR) {
davis_loop_state = DAVIS_QUERY_ERROR;
}
break;
}
case DAVIS_QUERY_RECEIVING: {
if (davis_serial_context->srl_rx_state == SRL_RX_DONE) {
davis_loop_avaliable = 0;
}
else if (davis_serial_context->srl_rx_state == SRL_RX_ERROR) {
davis_loop_state = DAVIS_QUERY_ERROR;
}
break;
}
case DAVIS_QUERY_OK: {
break;
}
case DAVIS_QUERY_ERROR: {

Wyświetl plik

@ -7,269 +7,105 @@
#include "davis_vantage/davis_parsers.h"
unsigned short crc_table [] = {
0x0,
0x1021,
0x2042,
0x8108,
0x9129,
0x1231,
0x210,
0x3273,
0x9339,
0x8318,
0x2462,
0x3443,
0xa56a,
0xb54b,
0x3653,
0x2672,
0xb75b,
0xa77a,
0x48c4,
0x58e5,
0xc9cc,
0xd9ed,
0x5af5,
0x4ad4,
0xdbfd,
0xcbdc,
0x6ca6,
0x7c87,
0xedae,
0xfd8f,
0x7e97,
0x6eb6,
0xff9f,
0xefbe,
0x9188,
0x81a9,
0x1080,
0xa1,
0x30c2,
0x83b9,
0x9398,
0x2b1,
0x1290,
0x22f3,
0xb5ea,
0xa5cb,
0x34e2,
0x24c3,
0xa7db,
0xb7fa,
0x26d3,
0x36f2,
0xd94c,
0xc96d,
0x5844,
0x4865,
0xcb7d,
0xdb5c,
0x4a75,
0x5a54,
0xfd2e,
0xed0f,
0x7c26,
0x6c07,
0xef1f,
0xff3e,
0x6e17,
0x7e36,
0x3063,
0x4084,
0xa14a,
0xb16b,
0x2252,
0x52b5,
0xb37b,
0xa35a,
0x420,
0x1401,
0x64e6,
0x8528,
0x9509,
0x1611,
0x630,
0x76d7,
0x9719,
0x8738,
0x6886,
0x78a7,
0xe98e,
0xf9af,
0x7ab7,
0x6a96,
0xfbbf,
0xeb9e,
0x4ce4,
0x5cc5,
0xcdec,
0xddcd,
0x5ed5,
0x4ef4,
0xdfdd,
0xcffc,
0xb1ca,
0xa1eb,
0x20e3,
0x5004,
0xa3fb,
0xb3da,
0x32d2,
0x4235,
0x95a8,
0x8589,
0x14a0,
0x481,
0x7466,
0x8799,
0x97b8,
0x691,
0x16b0,
0x6657,
0xf90e,
0xe92f,
0x7806,
0x6827,
0xeb3f,
0xfb1e,
0x6a37,
0x7a16,
0xdd6c,
0xcd4d,
0x5c64,
0x4c45,
0xcf5d,
0xdf7c,
0x4e55,
0x5e74,
0x50a5,
0x60c6,
0xc18c,
0xd1ad,
0x4294,
0x72f7,
0xd3bd,
0xc39c,
0x74c7,
0x44a4,
0xe5ee,
0xf5cf,
0x66f6,
0x5695,
0xf7df,
0xe7fe,
0x840,
0x1861,
0x2802,
0x8948,
0x9969,
0x1a71,
0xa50,
0x3a33,
0x9b79,
0x8b58,
0x2c22,
0x3c03,
0xad2a,
0xbd0b,
0x3e13,
0x2e32,
0xbf1b,
0xaf3a,
0xd10c,
0xc12d,
0x4025,
0x7046,
0xc33d,
0xd31c,
0x5214,
0x6277,
0xf56e,
0xe54f,
0x6447,
0x5424,
0xe75f,
0xf77e,
0x7676,
0x4615,
0x99c8,
0x89e9,
0x18c0,
0x8e1,
0x3882,
0x8bf9,
0x9bd8,
0xaf1,
0x1ad0,
0x2ab3,
0xbdaa,
0xad8b,
0x3ca2,
0x2c83,
0xaf9b,
0xbfba,
0x2e93,
0x3eb2,
0x70e7,
0xe1ce,
0xf1ef,
0x62d6,
0xf3ff,
0xe3de,
0x5485,
0xc5ac,
0xd58d,
0x46b4,
0xd79d,
0xc7bc,
0x3823,
0xa90a,
0xb92b,
0x2a12,
0xbb3b,
0xab1a,
0xc60,
0x1c41,
0x8d68,
0x9d49,
0x1e51,
0xe70,
0x9f59,
0x8f78,
0xf14e,
0xe16f,
0x6067,
0xe37f,
0xf35e,
0x7256,
0xd52c,
0xc50d,
0x4405,
0xc71d,
0xd73c,
0x5634,
0xb98a,
0xa9ab,
0x28a3,
0xabbb,
0xbb9a,
0x3a92,
0x9de8,
0x8dc9,
0x1ce0,
0xcc1,
0x8fd9,
0x9ff8,
0xed1,
0x1ef0
const uint16_t crc_table [] = {
0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
0x1231, 0x210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
0x2462, 0x3443, 0x420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
0x3653, 0x2672, 0x1611, 0x630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
0x48c4, 0x58e5, 0x6886, 0x78a7, 0x840, 0x1861, 0x2802, 0x3823,
0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0xa50, 0x3a33, 0x2a12,
0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0xc60, 0x1c41,
0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0xe70,
0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
0x1080, 0xa1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
0x2b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
0x34e2, 0x24c3, 0x14a0, 0x481, 0x7466, 0x6447, 0x5424, 0x4405,
0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
0x26d3, 0x36f2, 0x691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x8e1, 0x3882, 0x28a3,
0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
0x4a75, 0x5a54, 0x6a37, 0x7a16, 0xaf1, 0x1ad0, 0x2ab3, 0x3a92,
0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0xcc1,
0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0xed1, 0x1ef0
};
#define LOOP_PACAKET_LN 99
#define LOOP_CRC_OFFSET 97
#define LOOP_BAROMETER_OFFSET 7
#define LOOP_INSIDE_TEMPERATURE_OFFSET 9
#define LOOP_OUTSIDE_TEMPERATURE 12
#define LOOP_WINDSPEED_OFFSET 14
#define LOOP_TEN_MIN_WINDSPEED_OFFSET 15
#define LOOP_WIND_DIRECTION_OFFSET 16
#define LOOP_OUTSIDE_HUMIDITY 33
#define LOOP_DAY_RAIN_OFFSET 50
uint32_t davis_parsers_loop(uint8_t* input, uint16_t input_ln, davis_loop_t* output) {
uint32_t retval = 0;
// crc stored in the frame
uint16_t crc_from_frame = 0;
// calculated crc checksum
uint16_t calculated_crc = 0;
// check if input buffer consist at least as many characters as the LOOP packet has
if (input_ln < LOOP_PACAKET_LN) {
// return with an error state, don't consider consecutive content of a frame
// as it is for sure incorrect
retval = DAVIS_PARSERS_TOO_SHORT_FRAME;
}
else {
// retrieve the CRC value from the frame content
crc_from_frame = *(input + LOOP_CRC_OFFSET) | *(input + LOOP_CRC_OFFSET + 1);
// calculate the CRC locally excluding the last 2 bytes which consists the CRC value
calculated_crc = davis_parsers_check_crc(input, LOOP_PACAKET_LN - 2);
// check if calculated CRC is the same as recevied from the sation
if (calculated_crc == crc_from_frame) {
// continue only if both CRC matches
// fetch the pressure
output->barometer = *(input + LOOP_BAROMETER_OFFSET) | *(input + LOOP_BAROMETER_OFFSET + 1);
output->inside_temperature = *(input + LOOP_INSIDE_TEMPERATURE_OFFSET) | *(input + LOOP_INSIDE_TEMPERATURE_OFFSET + 1);
output->outside_temperature = *(input + LOOP_INSIDE_TEMPERATURE_OFFSET) | *(input + LOOP_INSIDE_TEMPERATURE_OFFSET + 1);
output->wind_speed = *(input + LOOP_WINDSPEED_OFFSET);
output->wind_speed_10min_average = *(input + LOOP_TEN_MIN_WINDSPEED_OFFSET);
output->wind_direction = *(input + LOOP_WIND_DIRECTION_OFFSET);
output->outside_humidity = *(input + LOOP_OUTSIDE_HUMIDITY);
output->day_rain = *(input + LOOP_DAY_RAIN_OFFSET);
}
else {
// if CRCs differs treat the frame as corrupted and
retval = DAVIS_PARSERS_CORRUPTED_CRC;
}
}
return retval;
}