Refactor dctype -> divemode

... and repair a failed rebase (sorry).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-01-11 00:01:15 +01:00 committed by Dirk Hohndel
parent bfe05b4340
commit e219bc70f8
18 changed files with 204 additions and 184 deletions

View file

@ -556,10 +556,10 @@ static int dive_cb(const unsigned char *data, unsigned int size,
case DC_DIVEMODE_FREEDIVE:
case DC_DIVEMODE_GAUGE:
case DC_DIVEMODE_OC: /* Open circuit */
dive->dc.dctype = OC;
dive->dc.divemode = OC;
break;
case DC_DIVEMODE_CC: /* Closed circuit */
dive->dc.dctype = CCR;
dive->dc.divemode = CCR;
break;
}
#endif