From 4cc12d9d111fd1e008b11e63eaae29e18012a140 Mon Sep 17 00:00:00 2001
From: Jeroen Vreeken <jeroen@vreeken.net>
Date: Fri, 18 Oct 2013 16:47:06 +0200
Subject: [PATCH] Small fixes to get setpoint generator code working again.
---
common/include/block_setpoint_generator.h | 1 -
console/console/setpoint.c | 3 +--
console/console/spg_auth.c | 2 +-
console/console/spg_log_parser.c | 2 +-
controller/block/block_setpoint_generator.c | 2 ++
controller/controller/controller_setpoint_command.c | 3 +++
controller/controller/controller_setpoint_command.h | 1 +
7 files changed, 9 insertions(+), 5 deletions(-)
delete mode 120000 common/include/block_setpoint_generator.h
diff --git a/common/include/block_setpoint_generator.h b/common/include/block_setpoint_generator.h
deleted file mode 120000
index db84b36..0000000
--- a/common/include/block_setpoint_generator.h
+++ /dev/null
@@ -1 +0,0 @@
-../../controller/controller/block_setpoint_generator.h
\ No newline at end of file
diff --git a/console/console/setpoint.c b/console/console/setpoint.c
index f73daad..06c6c3b 100644
--- a/console/console/setpoint.c
+++ b/console/console/setpoint.c
@@ -26,8 +26,7 @@
#include <arpa/inet.h>
#include "tcp_connect.h"
-#include "block_setpoint_generator.h"
-
+#include "controller_setpoint_command.h"
struct setpoint_command {
int fd;
diff --git a/console/console/spg_auth.c b/console/console/spg_auth.c
index 5dedccc..ae8cd7e 100644
--- a/console/console/spg_auth.c
+++ b/console/console/spg_auth.c
@@ -38,7 +38,7 @@
#include "setpoint.h"
#include "tcp_listen.h"
-#include "block_setpoint_generator.h"
+#include "controller_setpoint_command.h"
#include "status_server.h"
#include "command_server.h"
diff --git a/console/console/spg_log_parser.c b/console/console/spg_log_parser.c
index 8dc567b..d7c901f 100644
--- a/console/console/spg_log_parser.c
+++ b/console/console/spg_log_parser.c
@@ -26,7 +26,7 @@
#include <stdint.h>
#include <inttypes.h>
#include <arpa/inet.h>
-#include "block_setpoint_generator.h"
+#include "controller_setpoint_command.h"
#define BUFSIZE 4096
diff --git a/controller/block/block_setpoint_generator.c b/controller/block/block_setpoint_generator.c
index 9898bc1..6226ac2 100644
--- a/controller/block/block_setpoint_generator.c
+++ b/controller/block/block_setpoint_generator.c
@@ -851,6 +851,8 @@ struct controller_block * block_setpoint_generator_create(char *name, va_list ap
if (!spg)
return NULL;
+ spg_name.block = spg;
+
spg->type = "setpoint_generator";
spg->name = malloc(strlen(name)+1);
if (!spg->name)
diff --git a/controller/controller/controller_setpoint_command.c b/controller/controller/controller_setpoint_command.c
index 126514b..82852ad 100644
--- a/controller/controller/controller_setpoint_command.c
+++ b/controller/controller/controller_setpoint_command.c
@@ -380,6 +380,9 @@ void controller_setpoint_command_server_add(struct controller_spg_name *name)
tmp = realloc(spg_list, sizeof(struct controller_spg_name) * nr_spgs);
if (tmp) {
spg_list = tmp;
+ spg_list[nr_spgs-1].queue_space = name->queue_space;
+ spg_list[nr_spgs-1].command = name->command;
+ spg_list[nr_spgs-1].block = name->block;
spg_list[nr_spgs-1].name = strdup(name->name);
spg_list[nr_spgs-1].unit = strdup(name->unit);
spg_list[nr_spgs-1].blockname = strdup(name->blockname);
diff --git a/controller/controller/controller_setpoint_command.h b/controller/controller/controller_setpoint_command.h
index dcdd59d..2b2c2df 100644
--- a/controller/controller/controller_setpoint_command.h
+++ b/controller/controller/controller_setpoint_command.h
@@ -19,6 +19,7 @@
#ifndef _INCLUDE_CONTROLLER_SETPOINT_COMMAND_H_
#define _INCLUDE_CONTROLLER_SETPOINT_COMMAND_H_
+#include <stdbool.h>
enum {
BLOCK_SPG_SETPOINT,
--
GitLab