Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pipettes): changes to enable the correct sync line ports for the 96-channel #728

Merged
merged 4 commits into from
Oct 4, 2023
Merged

fix(pipettes): changes to enable the correct sync line ports for the 96-channel #728

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f40cddb
report internal threshold
ahiuchingau Oct 2, 2023
b12a69a
report correct sensor type
ahiuchingau Oct 2, 2023
e0d54f1
enabling GPIOD clock for 96-chan sync out
ahiuchingau Oct 3, 2023
8258532
do not need to report
ahiuchingau Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/sensors/core/tasks/pressure_driver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,11 @@ class MMR920C04 {
can::ids::NodeId::host,
can::messages::BaselineSensorResponse{
.message_index = m.message_index,
.sensor = can::ids::SensorType::pressure_temperature,
.sensor = can::ids::SensorType::pressure,
.offset_average = pressure_fixed_point});
set_threshold(current_pressure_baseline_pa,
can::ids::SensorThresholdMode::auto_baseline,
m.message_index, false);
m.message_index, true);
} else {
auto message = can::messages::ReadFromSensorResponse{
.message_index = m.message_index,
Expand Down
6 changes: 4 additions & 2 deletions pipettes/firmware/utility_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ static void enable_gpio_port(void* port) {
__HAL_RCC_GPIOB_CLK_ENABLE();
} else if (port == GPIOC) {
__HAL_RCC_GPIOC_CLK_ENABLE();
} else if (port == GPIOD) {
__HAL_RCC_GPIOD_CLK_ENABLE();
}
}

Expand Down Expand Up @@ -156,7 +158,7 @@ static void sync_drive_gpio_init() {
PipetteHardwarePin sync_in_hardware =
pipette_hardware_get_gpio(pipette_type, pipette_hardware_device_sync_in);
/* GPIO Ports Clock Enable */
enable_gpio_port(GPIOB);
enable_gpio_port(sync_in_hardware.port);

/*Configure GPIO pin*/
GPIO_InitTypeDef sync_in_init = {0};
Expand All @@ -168,7 +170,7 @@ static void sync_drive_gpio_init() {
PipetteHardwarePin sync_out_hardware =
pipette_hardware_get_gpio(pipette_type, pipette_hardware_device_sync_out);

enable_gpio_port(GPIOC);
enable_gpio_port(sync_out_hardware.port);

GPIO_InitTypeDef sync_out_init = {0};
sync_out_init.Pin = sync_out_hardware.pin;
Expand Down
Loading