From f0fc381ce35ee362ed424b10dbba486032104bc1 Mon Sep 17 00:00:00 2001
From: James Talbert <jtalbert@iastate.edu>
Date: Fri, 19 Apr 2019 21:47:16 -0500
Subject: [PATCH] Fixed a couple bugs in the override command found with
groundstation testing
---
quad/src/quad_app/callbacks.c | 7 ++++++-
quad/src/quad_app/type_def.h | 2 +-
.../quad_hw/src/constrs/Zybo-Z7-Master.xdc | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/quad/src/quad_app/callbacks.c b/quad/src/quad_app/callbacks.c
index 575e081ec..4ca905fb2 100644
--- a/quad/src/quad_app/callbacks.c
+++ b/quad/src/quad_app/callbacks.c
@@ -437,6 +437,10 @@ int cb_addnode(struct modular_structs *structs, struct metadata *meta, unsigned
int cb_overrideoutput(struct modular_structs *structs, struct metadata *meta, unsigned char *data, unsigned short length) {
override_t* override_info = &structs->override_struct;
+
+ int offset_mode = offsetof(override_t, mode);
+ int offset_values = offsetof(override_t, values);
+ int offset_value0 = offsetof(override_t, values[0]);
int num_overrides = sizeof(structs->override_struct.values)
/ sizeof(*structs->override_struct.values);
@@ -445,7 +449,8 @@ int cb_overrideoutput(struct modular_structs *structs, struct metadata *meta, un
override_info->mode = data[0];
int i;
for (i = 0; i < num_overrides; i++) {
- override_info->mode = build_float(&data[1+i*4]);
+ float f = build_float(&data[1+i*4]);
+ override_info->values[i] = f;
}
return 0;
}
diff --git a/quad/src/quad_app/type_def.h b/quad/src/quad_app/type_def.h
index f45743664..6cf91b43a 100644
--- a/quad/src/quad_app/type_def.h
+++ b/quad/src/quad_app/type_def.h
@@ -507,7 +507,7 @@ typedef enum {
} override_mode_t;
typedef struct override_t {
- override_mode_t mode;
+ u8 mode;
float values[4];
} override_t;
diff --git a/quad/vivado_workspace/quad_hw/src/constrs/Zybo-Z7-Master.xdc b/quad/vivado_workspace/quad_hw/src/constrs/Zybo-Z7-Master.xdc
index 19608447a..cd5552583 100644
--- a/quad/vivado_workspace/quad_hw/src/constrs/Zybo-Z7-Master.xdc
+++ b/quad/vivado_workspace/quad_hw/src/constrs/Zybo-Z7-Master.xdc
@@ -124,8 +124,8 @@
##Pmod Header JC
#set_property -dict { PACKAGE_PIN V15 IOSTANDARD LVCMOS33 } [get_ports { jc[0] }]; #IO_L10P_T1_34 Sch=jc_p[1]
-set_property -dict { PACKAGE_PIN W15 IOSTANDARD LVCMOS33 } [get_ports { UART0_txd }]; #IO_L10N_T1_34 Sch=jc_n[1]
-set_property -dict { PACKAGE_PIN T11 IOSTANDARD LVCMOS33 } [get_ports { UART0_rxd }]; #IO_L1P_T0_34 Sch=jc_p[2]
+set_property -dict { PACKAGE_PIN W15 IOSTANDARD LVCMOS33 } [get_ports { UART0_rxd }]; #IO_L10N_T1_34 Sch=jc_n[1]
+set_property -dict { PACKAGE_PIN T11 IOSTANDARD LVCMOS33 } [get_ports { UART0_txd }]; #IO_L1P_T0_34 Sch=jc_p[2]
#set_property -dict { PACKAGE_PIN T10 IOSTANDARD LVCMOS33 } [get_ports { jc[3] }]; #IO_L1N_T0_34 Sch=jc_n[2]
#set_property -dict { PACKAGE_PIN W14 IOSTANDARD LVCMOS33 } [get_ports { jc[4] }]; #IO_L8P_T1_34 Sch=jc_p[3]
set_property -dict { PACKAGE_PIN Y14 IOSTANDARD LVCMOS33 } [get_ports { UART1_txd }]; #IO_L8N_T1_34 Sch=jc_n[3]
--
GitLab