FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shearwater: Fix Up Timesynch Changes.

Browse Source 
A few fixes for bugs introduced during merge conflict resolution.

Signed-off-by: Michael Keller <mikeller@042.ch>
This commit is contained in:
Michael Keller 2024-02-14 11:57:39 +13:00
parent 39bc2fe05c
commit 4bbfe1659e
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/shearwater_common.c
View File

@ -688,9 +688,9 @@ dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsi
{
// Read the hardware type.
unsigned char rsp_hardware[2] = {0};
status = shearwater_common_rdbi (device, ID_HARDWARE, rsp_hardware, sizeof(rsp_hardware));
dc_status_t status = shearwater_common_rdbi (device, ID_HARDWARE, rsp_hardware, sizeof(rsp_hardware));
if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the hardware type.");
ERROR (device->base.context, "Failed to read the hardware type.");
return status;
}
@ -699,11 +699,11 @@ dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsi
switch (hardware) {
case 0x0101:
case 0x0202:
model = PREDATOR;
*model = PREDATOR;
break;
case 0x0404:
case 0x0909:
model = PETREL;
*model = PETREL;
break;
case 0x0505:
case 0x0808:
@ -713,44 +713,44 @@ dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsi
case 0x7828:
case 0x7B2C:
case 0x8838:
model = PETREL2;
*model = PETREL2;
break;
case 0xB407:
model = PETREL3;
*model = PETREL3;
break;
case 0x0606:
case 0x0A0A:
model = NERD;
*model = NERD;
break;
case 0x0E0D:
case 0x7E2D:
model = NERD2;
*model = NERD2;
break;
case 0x0707:
model = PERDIX;
*model = PERDIX;
break;
case 0x0C0D:
case 0x7C2D:
case 0x8D6C:
model = PERDIXAI;
*model = PERDIXAI;
break;
case 0xC407:
model = PERDIX2;
*model = PERDIX2;
break;
case 0x0F0F:
case 0x1F0A:
case 0x1F0F:
model = TERIC;
*model = TERIC;
break;
case 0x1512:
model = PEREGRINE;
*model = PEREGRINE;
break;
case 0xC0E0:
model = TERN;
*model = TERN;
break;
default:
WARNING (device->base.context, "Unknown hardware type 0x%04x.", hardware);
}
return model;
return status;
}

3
src/shearwater_common.h
View File

@ -88,8 +88,7 @@ shearwater_common_timesync_local (shearwater_common_device_t *device, const dc_d
dc_status_t
shearwater_common_timesync_utc (shearwater_common_device_t *device, const dc_datetime_t *datetime);
unsigned int
shearwater_common_get_model (shearwater_common_device_t *device, unsigned int hardware);
dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsigned int *model);
dc_status_t shearwater_common_can_wdbi (shearwater_common_device_t *device, dc_buffer_t *buffer, unsigned int id);

2
src/shearwater_petrel.c
View File

@ -355,7 +355,7 @@ shearwater_petrel_device_timesync (dc_device_t *abstract, const dc_datetime_t *d
shearwater_common_device_t *device = (shearwater_common_device_t *) abstract;
unsigned int model = 0;
status = shearwater_common_get_model (&device->base, &model);
status = shearwater_common_get_model (device, &model);
if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to read the hardware type.");
return status;