Skip to content

Commit

Permalink
Merge branches 'add_shearwater_teric_timesync' and 'add_ostc4_dump_er…
Browse files Browse the repository at this point in the history
…ror' of https://github.com/mikeller/libdc into Subsurface-DS9

Pull libdivecomputer updates from Michael Keller:

 - Add time synchronisation for the Shearwater Teric

 - Fix two OSTC4 buglets

* 'add_shearwater_teric_timesync' of https://github.com/mikeller/libdc:
  Add Time Synchronisation for the  Shearwater Teric.

* 'add_ostc4_dump_error' of https://github.com/mikeller/libdc:
  Fix bugs in OSTC4 support.
  • Loading branch information
torvalds committed Jul 8, 2023
2 parents 838717d + b13ad61 commit 3733b87
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/hw_ostc3.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ hw_ostc3_write (hw_ostc3_device_t *device, dc_event_progress_t *progress, const
size_t nbytes = 0;
while (nbytes < size) {
// Set the maximum packet size.
size_t length = 1024;
size_t length = 64;

// Limit the packet size to the total size.
if (nbytes + length > size)
Expand Down Expand Up @@ -1719,6 +1719,10 @@ hw_ostc3_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
return rc;
}

if (device->hardware == OSTC4) {
return DC_STATUS_UNSUPPORTED;
}

// Emit a device info event.
dc_event_devinfo_t devinfo;
devinfo.firmware = device->firmware;
Expand Down

0 comments on commit 3733b87

Please sign in to comment.