Skip to content
Snippets Groups Projects
Commit f0fc381c authored by James Talbert's avatar James Talbert
Browse files

Fixed a couple bugs in the override command found with groundstation testing

parent 14a37d29
No related branches found
No related tags found
No related merge requests found
...@@ -437,6 +437,10 @@ int cb_addnode(struct modular_structs *structs, struct metadata *meta, unsigned ...@@ -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) { int cb_overrideoutput(struct modular_structs *structs, struct metadata *meta, unsigned char *data, unsigned short length) {
override_t* override_info = &structs->override_struct; 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) int num_overrides = sizeof(structs->override_struct.values)
/ 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 ...@@ -445,7 +449,8 @@ int cb_overrideoutput(struct modular_structs *structs, struct metadata *meta, un
override_info->mode = data[0]; override_info->mode = data[0];
int i; int i;
for (i = 0; i < num_overrides; 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; return 0;
} }
...@@ -507,7 +507,7 @@ typedef enum { ...@@ -507,7 +507,7 @@ typedef enum {
} override_mode_t; } override_mode_t;
typedef struct override_t { typedef struct override_t {
override_mode_t mode; u8 mode;
float values[4]; float values[4];
} override_t; } override_t;
......
...@@ -124,8 +124,8 @@ ...@@ -124,8 +124,8 @@
##Pmod Header JC ##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 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 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_rxd }]; #IO_L1P_T0_34 Sch=jc_p[2] 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 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 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] set_property -dict { PACKAGE_PIN Y14 IOSTANDARD LVCMOS33 } [get_ports { UART1_txd }]; #IO_L8N_T1_34 Sch=jc_n[3]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment