Commit 15bd990a authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Merge remote branch 'origin/trace' into websocket

parents 8060385c f54d830b
......@@ -5,8 +5,8 @@ CONSOLE_REL_TAR:=$(CURDIR)/console_$(shell date +%Y%m%d%H%M).tar.gz
all:
$(MAKE) -C common/utils
$(MAKE) -C common/trace
$(MAKE) -C common/log
$(MAKE) -C common/trace
$(MAKE) -C controller
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
$(MAKE) -C console
......@@ -34,19 +34,20 @@ help:
controller:
$(MAKE) -C common/log
$(MAKE) -C common/utils
$(MAKE) -C common/log
$(MAKE) -C common/trace
$(MAKE) -C controller
console:
$(MAKE) -C common/log
$(MAKE) -C common/utils
$(MAKE) -C common/log
$(MAKE) -C common/trace
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
$(MAKE) -C console
clean:
rm -rf common/lib/*
$(MAKE) -C common/log clean
$(MAKE) -C common/utils clean
$(MAKE) -C common/trace clean
......
../../controller/controller/controller_setpoint_command.h
\ No newline at end of file
......@@ -20,7 +20,7 @@
*/
#include <trace/trace.h>
#include <trace_def.h>
#include <trace/trace_def.h>
#include <tcp_connect.h>
#include <log/log.h>
......
/*
trace definitions
Copyright Jeroen Vreeken (jeroen@vreeken.net), 2013
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _INCLUDE_TRACE_DEF_H_
#define _INCLUDE_TRACE_DEF_H_
#include <stdint.h>
#ifndef __packed
#define __packed __attribute__((packed))
#endif
#define TRACE_END 192
#define TRACE_ESC 219
#define TRACE_ESC_END 220
#define TRACE_ESC_ESC 221
struct trace_header {
uint8_t type;
} __packed;
struct trace_ptype_timestamp {
uint64_t sec;
uint32_t nsec;
} __packed;
/* trace_ptype_list
strings are null terminated
name (str), value type byte, unit (str)
*/
struct trace_ptype_interval {
uint64_t sec;
uint32_t nsec;
uint8_t type;
} __packed;
/* trace_ptype_name
null terminated string
*/
struct trace_ptype_value_type {
uint8_t type;
} __packed;
struct trace_ptype_value {
union {
uint32_t u32;
uint16_t u16;
uint8_t u8;
} u;
} __packed;
#endif /* _INCLUDE_TRACE_DEF_H_ */
......@@ -18,7 +18,7 @@
*/
#include <trace_def.h>
#include <trace/trace_def.h>
#include <trace/trace.h>
#include <log/log.h>
#include <tcp_connect.h>
......
Markdown is supported
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