From bdd5c925795eddf2d3337246710c6592c7e1a9b2 Mon Sep 17 00:00:00 2001
From: Sebastian Larsson <belgarion@brokenbrain.se>
Date: Wed, 16 Nov 2016 11:08:07 +0100
Subject: [PATCH] Move to dw1000.h
---
apps/decawave-demo/dw-sync-demo.c | 3 ++-
apps/decawave-range/dw-range.h | 22 ++--------------------
src/dw1000.h | 26 ++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 21 deletions(-)
create mode 100644 src/dw1000.h
diff --git a/apps/decawave-demo/dw-sync-demo.c b/apps/decawave-demo/dw-sync-demo.c
index d430cbe..0d42267 100644
--- a/apps/decawave-demo/dw-sync-demo.c
+++ b/apps/decawave-demo/dw-sync-demo.c
@@ -1,4 +1,5 @@
/*
+
* dw1000, driver for decawave dw1000 UVB chip
* Copyright (C) 2014 Kim Albertsson
*
@@ -144,4 +145,4 @@ PROCESS_THREAD(dw_interrupt_callback_proc, ev, data)
}
PROCESS_END();
}
-/*---------------------------------------------------------------------------*/
\ No newline at end of file
+/*---------------------------------------------------------------------------*/
diff --git a/apps/decawave-range/dw-range.h b/apps/decawave-range/dw-range.h
index 42c2cca..fba2524 100644
--- a/apps/decawave-range/dw-range.h
+++ b/apps/decawave-range/dw-range.h
@@ -22,26 +22,8 @@
#include <stdint.h>
#include "contiki.h"
#include "dwFrameTypes.h"
+#include "dw1000.h"
-typedef enum
-{
- IDLE = 0,
- RECEIVING,
- BLINK_RECEIVED,
- RANGE_INIT_RECEIVED,
- POLL_RECEIVED,
- RESPONSE_RECEIVED,
- FINAL_RECEIVED,
- MEASUREMENT_ADDED,
- ERROR
-} ranging_state_t;
-
-typedef struct
-{
- uint32_t num_packets_rx;
- uint32_t num_packets_tx;
- uint32_t num_errors;
-} packet_stats_t;
packet_stats_t packet_stats;
@@ -76,4 +58,4 @@ uint32_t parseMessageRangeInit( uint8_t * pData, uint32_t dataLen, dw_message_ra
struct process * interrupt_handler_callback;
struct process dw_interrupt_callback_proc;
-#endif
\ No newline at end of file
+#endif
diff --git a/src/dw1000.h b/src/dw1000.h
new file mode 100644
index 0000000..76e1ab0
--- /dev/null
+++ b/src/dw1000.h
@@ -0,0 +1,26 @@
+#ifndef DW1000_H
+#define DW1000_H
+
+#include "dw1000-base.h"
+
+typedef enum
+{
+ DW_IDLE = 0,
+ DW_RECEIVING,
+ DW_BLINK_RECEIVED,
+ DW_RANGE_INIT_RECEIVED,
+ DW_POLL_RECEIVED,
+ DW_RESPONSE_RECEIVED,
+ DW_FINAL_RECEIVED,
+ DW_MEASUREMENT_ADDED,
+ DW_ERROR
+} ranging_state_t;
+
+typedef struct
+{
+ uint32_t num_packets_rx;
+ uint32_t num_packets_tx;
+ uint32_t num_errors;
+} packet_stats_t;
+
+#endif DW1000_H
--
GitLab