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

🐛ADI mutex fix #633

Merged
merged 10 commits into from
May 4, 2024
Merged

🐛ADI mutex fix #633

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aeaa88c
Fixed duplicate zero indexing in ext_adi_led_set_pixel as well as val…
R11G Feb 23, 2024
2f96fed
testing
R11G Mar 8, 2024
3215446
Fixed zero indexing
R11G Mar 8, 2024
83393ec
Merge branch 'pros-4/bugfix/adi-port-indexing' of github.com:purduesi…
R11G Mar 8, 2024
b5e0d43
fix merge
R11G Mar 8, 2024
f9e2dbe
removes an extra -1
noam987 Mar 8, 2024
d046758
Add missing -1
noam987 Mar 8, 2024
f01dafd
Last -1
R11G Mar 8, 2024
fb59833
Merge remote-tracking branch 'origin/develop-pros-4' into pros-4/bugf…
noam987 May 4, 2024
65f66e4
Fix return without releasing mutex
noam987 May 4, 2024
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
18 changes: 9 additions & 9 deletions src/devices/vdml_ext_adi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ int32_t ext_adi_encoder_get(ext_adi_encoder_t enc) {
get_ports(enc, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you claim the smart_port mutex instead of smart_port -1 mutex like the previous functions do?

validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_ENCODER);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_ENCODER);

int32_t rtn;
adi_data_s_t* const adi_data = &((adi_data_s_t*)(device->pad))[adi_port];
Expand All @@ -306,7 +306,7 @@ int32_t ext_adi_encoder_reset(ext_adi_encoder_t enc) {
get_ports(enc, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_ENCODER);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_ENCODER);

vexDeviceAdiValueSet(device->device_info, adi_port, 0);
return_port(smart_port, 1);
Expand All @@ -317,7 +317,7 @@ int32_t ext_adi_encoder_shutdown(ext_adi_encoder_t enc) {
get_ports(enc, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_ENCODER);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_ENCODER);

vexDeviceAdiPortConfigSet(device->device_info, adi_port, E_ADI_TYPE_UNDEFINED);
return_port(smart_port, 1);
Expand All @@ -342,7 +342,7 @@ int32_t ext_adi_ultrasonic_get(ext_adi_ultrasonic_t ult) {
get_ports(ult, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_ULTRASONIC);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_ULTRASONIC);

int32_t rtn = vexDeviceAdiValueGet(device->device_info, adi_port);
return_port(smart_port, rtn);
Expand All @@ -353,7 +353,7 @@ int32_t ext_adi_ultrasonic_shutdown(ext_adi_ultrasonic_t ult) {
get_ports(ult, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_ULTRASONIC);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_ULTRASONIC);

vexDeviceAdiPortConfigSet(device->device_info, adi_port, E_ADI_TYPE_UNDEFINED);
return_port(smart_port, 1);
Expand Down Expand Up @@ -403,7 +403,7 @@ int32_t ext_adi_gyro_reset(ext_adi_gyro_t gyro) {
get_ports(gyro, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_GYRO);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_GYRO);

adi_data_s_t* const adi_data = &((adi_data_s_t*)(device->pad))[adi_port];
adi_data->gyro_data.tare_value = vexDeviceAdiValueGet(device->device_info, adi_port);
Expand All @@ -415,7 +415,7 @@ int32_t ext_adi_gyro_shutdown(ext_adi_gyro_t gyro) {
get_ports(gyro, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_i(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_LEGACY_GYRO);
validate_type(device, adi_port, smart_port, E_ADI_LEGACY_GYRO);

vexDeviceAdiPortConfigSet(device->device_info, adi_port, E_ADI_TYPE_UNDEFINED);
return_port(smart_port, 1);
Expand All @@ -439,7 +439,7 @@ double ext_adi_potentiometer_get_angle(ext_adi_potentiometer_t potentiometer) {
get_ports(potentiometer, smart_port, adi_port);
transform_adi_port(adi_port);
claim_port_f(smart_port, E_DEVICE_ADI);
validate_type(device, adi_port, smart_port - 1, E_ADI_ANALOG_IN);
validate_type(device, adi_port, smart_port, E_ADI_ANALOG_IN);

adi_data_s_t* const adi_data = &((adi_data_s_t*)(device->pad))[adi_port];

Expand Down Expand Up @@ -494,7 +494,7 @@ int32_t ext_adi_led_set_pixel(ext_adi_led_t led, uint32_t* buffer, uint32_t buff
}
buffer[pixel_position] = color;
uint32_t rtv = (uint32_t)vexDeviceAdiAddrLedSet(device->device_info, adi_port, buffer, 0, buffer_length, 0);
return_port(smart_port - 1, rtv);
return_port(smart_port, rtv);
}

int32_t ext_adi_led_set_all(ext_adi_led_t led, uint32_t* buffer, uint32_t buffer_length, uint32_t color) {
Expand Down