Skip to content

Garmin: Standardise the Firmware Version Reporting. #102

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

Open
mikeller wants to merge 2 commits into
base: Subsurface-DS9
Choose a base branch
from
Open

Garmin: Standardise the Firmware Version Reporting. #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb36b1
Garmin: Standardise the Firmware Version Reporting.
mikeller Feb 7, 2026
f59823b
Add a Constant for the Serial Number Key.
mikeller Feb 7, 2026
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
3 changes: 3 additions & 0 deletions include/libdivecomputer/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ typedef enum parser_sample_event_t {
/* To let the compile know we have this */
#define SAMPLE_EVENT_STRING SAMPLE_EVENT_STRING

#define STRING_KEY_FIRMWARE_VERSION "FW Version"
#define STRING_KEY_SERIAL_NUMBER "Serial"

/* For backwards compatibility */
#define SAMPLE_EVENT_UNKNOWN SAMPLE_EVENT_FLOOR

Expand Down
2 changes: 1 addition & 1 deletion src/atomics_cobalt_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
case DC_FIELD_STRING:
switch(flags) {
case 0: // Serialnr
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUFLEN, "%c%c%c%c-%c%c%c%c", p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11]);
break;
case 1: // Program Version
Expand Down
4 changes: 2 additions & 2 deletions src/garmin_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,9 +1661,9 @@ garmin_parser_set_data (garmin_parser_t *garmin, const unsigned char *data, unsi

// Device information
if (garmin->dive.serial)
dc_field_add_string_fmt(&garmin->cache, "Serial", "%u", garmin->dive.serial);
dc_field_add_string_fmt(&garmin->cache, STRING_KEY_SERIAL_NUMBER, "%u", garmin->dive.serial);
if (garmin->dive.firmware)
dc_field_add_string_fmt(&garmin->cache, "Firmware", "%u.%02u",
dc_field_add_string_fmt(&garmin->cache, STRING_KEY_FIRMWARE_VERSION, "%u.%02u",
garmin->dive.firmware / 100, garmin->dive.firmware % 100);
if (garmin->dive.product) {
unsigned i;
Expand Down
4 changes: 2 additions & 2 deletions src/hw_ostc_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ hw_ostc_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned
case DC_FIELD_STRING:
switch(flags) {
case 0: /* serial */
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUFLEN, "%u", parser->serial);
break;
case 1: /* battery */
Expand All @@ -772,7 +772,7 @@ hw_ostc_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned
array_uint16_le (data + layout->desat) % 60);
break;
case 3: /* firmware */
string->desc = "FW Version";
string->desc = STRING_KEY_FIRMWARE_VERSION;
/* OSTC4 stores firmware as XXXX XYYY YYZZ ZZZB, -> X.Y.Z beta? */
if (parser->model == OSTC4) {
int firmwareOnDevice = array_uint16_le (data + layout->firmware);
Expand Down
2 changes: 1 addition & 1 deletion src/mares_iconhd_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
case DC_FIELD_STRING:
switch(flags) {
case 0: /* serial */
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUFLEN, "%u", parser->serial);
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion src/oceanic_atom2_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns
case DC_FIELD_STRING:
switch(flags) {
case 0: /* Serial */
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUF_LEN, "%06u", parser->serial);
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion src/shearwater_predator_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)

dc_field_add_string_fmt(&parser->cache, "Serial", "%08x", parser->serial);
// bytes 1-31 are identical in all formats
dc_field_add_string_fmt(&parser->cache, "FW Version", "%2x", data[19]);
dc_field_add_string_fmt(&parser->cache, STRING_KEY_FIRMWARE_VERSION, "%2x", data[19]);
add_deco_model(parser, data);
add_battery_type(parser, data);
dc_field_add_string_fmt(&parser->cache, "Battery at end", "%.1f V", data[9] / 10.0);
Expand Down
2 changes: 1 addition & 1 deletion src/suunto_d9_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ suunto_d9_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigne
case DC_FIELD_STRING:
switch (flags) {
case 0: /* serial */
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUFLEN, "%08u", parser->serial);
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion src/suunto_eonsteel_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ static dc_status_t traverse_device_fields(suunto_eonsteel_parser_t *eon,
if (!strcmp(name, "Info.HW"))
return dc_field_add_string(&eon->cache, "HW Version", data);
if (!strcmp(name, "Info.SW"))
return dc_field_add_string(&eon->cache, "FW Version", data);
return dc_field_add_string(&eon->cache, STRING_KEY_FIRMWARE_VERSION, data);
if (!strcmp(name, "Info.BatteryAtStart"))
return dc_field_add_string(&eon->cache, "Battery at start", data);
if (!strcmp(name, "Info.BatteryAtEnd"))
Expand Down
2 changes: 1 addition & 1 deletion src/suunto_vyper_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ suunto_vyper_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
case DC_FIELD_STRING:
switch(flags) {
case 0: /* serial */
string->desc = "Serial";
string->desc = STRING_KEY_SERIAL_NUMBER;
snprintf(buf, BUFLEN, "%u", parser->serial);
break;
default:
Expand Down
Loading