Commit 47500a13 authored by Reto Da Forno's avatar Reto Da Forno
Browse files

minor adjustments

parent 3244d888
......@@ -156,7 +156,7 @@ typedef struct {
uint16_t node_id; /* ID of the node which created this message */
uint16_t event_id; /* ID of the event / acquisition */
uint32_t start_time; /* Start time in seconds */
uint16_t peak_val; /* Peak value / amplitude (pos. or neg.) */
uint16_t amplitude; /* Signal amplitude */
uint16_t trg_count; /* Count of triggers (pos. + neg.) */
uint16_t duration; /* Event duration in ms */
} dpp_geophone_acq_min_t;
......
......@@ -199,12 +199,13 @@ typedef struct {
/* for general data aggregation (several 'blocks' of the same type of data sequentialized) */
#define DPP_DATA_AGGR_LEN(aggr) (((aggr)->block_cnt * (aggr)->block_size) + 2)
typedef struct {
uint8_t block_cnt;
uint8_t block_size;
union {
uint8_t blocks[DPP_MSG_PAYLOAD_LEN - 2];
dpp_geophone_acq_min_t geo_acq[(DPP_MSG_PAYLOAD_LEN - 2) / DPP_GEOPHONE_ACQ_MIN_LEN];
dpp_geophone_acq_min_t geo_acq_min[(DPP_MSG_PAYLOAD_LEN - 2) / DPP_GEOPHONE_ACQ_MIN_LEN];
dpp_health_min_t health_min[(DPP_MSG_PAYLOAD_LEN - 2) / DPP_HEALTH_MIN_LEN];
};
} dpp_data_aggr_t;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment