Skip to content

Commit

Permalink
pbio/iodev: Drop digits, decimals, and units info.
Browse files Browse the repository at this point in the history 
This information is not needed during runtime.
  • Loading branch information
@laurensvalk
laurensvalk committed Jun 22, 2021
1 parent 58f533c commit dd322df
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 406 deletions.
45 changes: 0 additions & 45 deletions lib/pbio/drv/ioport/ioport_lpf2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@ static const basic_info_t basic_infos[] = {
},
.num_values = 1,
.data_type = PBIO_IODEV_DATA_TYPE_INT8,
.digits = 4,
.decimals = 0,
.raw_min = -100.0,
.raw_max = 100.0,
.pct_min = -100.0,
.pct_max = 100.0,
.si_min = -100.0,
.si_max = 100.0,
.uom = "",
.input_flags = 0,
.output_flags = LPF2_MAPPING_FLAG_ABSOLUTE,
},
Expand All @@ -91,15 +82,6 @@ static const basic_info_t basic_infos[] = {
},
.num_values = 1,
.data_type = PBIO_IODEV_DATA_TYPE_INT8,
.digits = 4,
.decimals = 0,
.raw_min = -100.0,
.raw_max = 100.0,
.pct_min = -100.0,
.pct_max = 100.0,
.si_min = -100.0,
.si_max = 100.0,
.uom = "",
.input_flags = 0,
.output_flags = LPF2_MAPPING_FLAG_RELATIVE | LPF2_MAPPING_FLAG_ABSOLUTE,
},
Expand All @@ -115,15 +97,6 @@ static const basic_info_t basic_infos[] = {
},
.num_values = 1,
.data_type = PBIO_IODEV_DATA_TYPE_INT8,
.digits = 1,
.decimals = 0,
.raw_min = 0.0,
.raw_max = 1.0,
.pct_min = 0.0,
.pct_max = 100.0,
.si_min = 0.0,
.si_max = 1.0,
.uom = "",
.input_flags = 0,
.output_flags = LPF2_MAPPING_FLAG_DISCRETE | LPF2_MAPPING_FLAG_ABSOLUTE,
},
Expand All @@ -139,15 +112,6 @@ static const basic_info_t basic_infos[] = {
},
.num_values = 1,
.data_type = PBIO_IODEV_DATA_TYPE_INT8,
.digits = 1,
.decimals = 0,
.raw_min = -100.0,
.raw_max = 100.0,
.pct_min = -100.0,
.pct_max = 100.0,
.si_min = -100.0,
.si_max = 100.0,
.uom = "",
.input_flags = 0,
.output_flags = LPF2_MAPPING_FLAG_DISCRETE | LPF2_MAPPING_FLAG_ABSOLUTE,
},
Expand All @@ -163,15 +127,6 @@ static const basic_info_t basic_infos[] = {
},
.num_values = 1,
.data_type = PBIO_IODEV_DATA_TYPE_INT8,
.digits = 1,
.decimals = 0,
.raw_min = 0.0,
.raw_max = 1.0,
.pct_min = 0.0,
.pct_max = 100.0,
.si_min = 0.0,
.si_max = 1.0,
.uom = "",
.input_flags = 0,
.output_flags = LPF2_MAPPING_FLAG_DISCRETE | LPF2_MAPPING_FLAG_ABSOLUTE,
},
Expand Down
40 changes: 0 additions & 40 deletions lib/pbio/include/pbio/iodev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,46 +266,6 @@ typedef struct {
* The binary format of the data for this mode.
*/
pbio_iodev_data_type_t data_type;
/**
* The number of digits for display, including the decimal point.
*/
uint8_t digits;
/**
* The number of digits after the decimal point.
*/
uint8_t decimals;
/**
* The minimum raw data value. This is just used for scaling an may not
* actually be the minimum possible value.
*/
float raw_min;
/**
* The maximum raw data value. This is just used for scaling an may not
* actually be the maximum possible value.
*/
float raw_max;
/**
* The minimum percent data value. This will be either 0.0 or -100.0.
*/
float pct_min;
/**
* The maximum percent data value. This will always be 100.0.
*/
float pct_max;
/**
* The minimum scaled data value. This is just used for scaling an may not
* actually be the minimum possible value.
*/
float si_min;
/**
* The maximum scaled data value. This is just used for scaling an may not
* actually be the maximum possible value.
*/
float si_max;
/**
* The units of measurement.
*/
char uom[PBIO_IODEV_UOM_SIZE + 1];
/**
* Input value mapping flags.
*/
Expand Down
80 changes: 2 additions & 78 deletions lib/pbio/src/uartdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,6 @@ static uartdev_port_data_t dev_data[PBIO_CONFIG_UARTDEV_NUM_DEV];

static pbdrv_counter_dev_t *counter_devs;

static const pbio_iodev_mode_t ev3_uart_default_mode_info = {
.raw_max = 1023,
.pct_max = 100,
.si_max = 1,
.digits = 4,
};

#define PBIO_PT_WAIT_READY(pt, expr) PT_WAIT_UNTIL((pt), (expr) != PBIO_ERROR_AGAIN)

pbio_error_t pbio_uartdev_get(uint8_t id, pbio_iodev_t **iodev) {
Expand Down Expand Up @@ -499,73 +492,12 @@ static void pbio_uartdev_parse_msg(uartdev_port_data_t *data) {
flags->flags3, flags->flags4, flags->flags5);
}
break;
// Ignore RAW, PCT, SI, UNITS info. This is never used and can
// be looked up by device type if necessary.
case LUMP_INFO_RAW:
if (data->new_mode != mode) {
DBG_ERR(data->last_err = "Received INFO for incorrect mode");
goto err;
}
if (test_and_set_bit(EV3_UART_INFO_BIT_INFO_RAW, &data->info_flags)) {
DBG_ERR(data->last_err = "Received duplicate raw scaling INFO");
goto err;
}
data->info->mode_info[mode].raw_min = float_le(data->rx_msg + 2);
data->info->mode_info[mode].raw_max = float_le(data->rx_msg + 6);

debug_pr("raw: %f %f\n", (double)data->info->mode_info[mode].raw_min,
(double)data->info->mode_info[mode].raw_max);

break;
case LUMP_INFO_PCT:
if (data->new_mode != mode) {
DBG_ERR(data->last_err = "Received INFO for incorrect mode");
goto err;
}
if (test_and_set_bit(EV3_UART_INFO_BIT_INFO_PCT, &data->info_flags)) {
DBG_ERR(data->last_err = "Received duplicate percent scaling INFO");
goto err;
}
data->info->mode_info[mode].pct_min = float_le(data->rx_msg + 2);
data->info->mode_info[mode].pct_max = float_le(data->rx_msg + 6);

debug_pr("pct: %f %f\n", (double)data->info->mode_info[mode].pct_min,
(double)data->info->mode_info[mode].pct_max);

break;
case LUMP_INFO_SI:
if (data->new_mode != mode) {
DBG_ERR(data->last_err = "Received INFO for incorrect mode");
goto err;
}
if (test_and_set_bit(EV3_UART_INFO_BIT_INFO_SI,
&data->info_flags)) {
DBG_ERR(data->last_err = "Received duplicate SI scaling INFO");
goto err;
}
data->info->mode_info[mode].si_min = float_le(data->rx_msg + 2);
data->info->mode_info[mode].si_max = float_le(data->rx_msg + 6);

debug_pr("si: %f %f\n", (double)data->info->mode_info[mode].si_min,
(double)data->info->mode_info[mode].si_max);

break;
case LUMP_INFO_UNITS:
if (data->new_mode != mode) {
DBG_ERR(data->last_err = "Received INFO for incorrect mode");
goto err;
}
if (test_and_set_bit(EV3_UART_INFO_BIT_INFO_UNITS, &data->info_flags)) {
DBG_ERR(data->last_err = "Received duplicate SI units INFO");
goto err;
}
// Units may not have null terminator and we are done with the
// checksum at this point so we are writing 0 over the checksum to
// ensure a null terminator for the string functions.
data->rx_msg[msg_size - 1] = 0;
snprintf(data->info->mode_info[mode].uom, PBIO_IODEV_UOM_SIZE + 1,
"%s", data->rx_msg + 2);

debug_pr("uom: %s\n", data->info->mode_info[mode].uom);

break;
case LUMP_INFO_MAPPING:
if (data->new_mode != mode) {
Expand Down Expand Up @@ -640,16 +572,12 @@ static void pbio_uartdev_parse_msg(uartdev_port_data_t *data) {
goto err;
}
data->info->mode_info[mode].data_type = data->rx_msg[3];
data->info->mode_info[mode].digits = data->rx_msg[4];
data->info->mode_info[mode].decimals = data->rx_msg[5];
if (data->new_mode) {
data->new_mode--;
}

debug_pr("num_values: %d\n", data->info->mode_info[mode].num_values);
debug_pr("data_type: %d\n", data->info->mode_info[mode].data_type);
debug_pr("digits: %d\n", data->info->mode_info[mode].digits);
debug_pr("decimals: %d\n", data->info->mode_info[mode].decimals);

break;
}
Expand Down Expand Up @@ -905,10 +833,6 @@ static PT_THREAD(pbio_uartdev_update(uartdev_port_data_t * data)) {
data->info->num_modes = 1;
data->info->num_view_modes = 1;

for (int i = 0; i < PBIO_IODEV_MAX_NUM_MODES; i++) {
data->info->mode_info[i] = ev3_uart_default_mode_info;
}

data->type_id = data->rx_msg[1];
data->info_flags = EV3_UART_INFO_FLAG_CMD_TYPE;
data->data_rec = false;
Expand Down
Loading

0 comments on commit dd322df

Please sign in to comment.