Mercurial > public > ostc4

view Discovery/Inc/configuration.h @ 471:73da921869d9 fix-bat-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix: implement battery charge percentage in dive header This commit is (much) less trivial than the related 919e5cb51c92. First, rename the CCRmode attribute (corresponding to byte Ox59) of the SLogbookHeaderOSTC3. This byte (according to the hwOS interface document) does not contain any CCR related value, but it contains "battery information". Already since 2017, this byte is used from libdivecomputer to interface the charge percentage. So, its renamed from CCRmode to batteryCharge, to reflect its true purpose. Now, simply add a batteryCharge attribute to the SLogbookHeader (and see below why that is possible, without breaking things). The remaining changes are trivial to implement battery charge percentage in dive header. Caveat: do not get confused by the exact role of the individual logbook header types. SLogbookHeaderOSTC3 is the formal type of the logbook format that the OSTC4 produces. This format is supposed to identical to the format, as is used in hwOS for the series of small OSTCs. Only some values of attributes are different. For example, the OSTC4 supports VPM, so byte 0x79 (deco model used for this dive) also has a value for VPM. But the SLogbookHeader type, despite its name and structure, is *not* a true logbook header, as it includes attributes that are not available in the SLogbookHeaderOSTC3 formal header type. Signed-off-by: Jan Mulder <jan@jlmulder.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Wed, 22 Apr 2020 13:08:57 +0200
parents aa1d71875e25
children 4ce932235578
line wrap: on
line source

///////////////////////////////////////////////////////////////////////////////
/// -*- coding: UTF-8 -*-
///
/// \file   Discovery/Inc/configuration.h
/// \brief  Header file for variant specific firmware adaptations at compile time
/// \author heinrichs weikamp gmbh
/// \date   29-February-2020
///
/// $Id$
///////////////////////////////////////////////////////////////////////////////
/// \par Copyright (c) 2014-2020 Heinrichs Weikamp gmbh
///
///     This program is free software: you can redistribute it and/or modify
///     it under the terms of the GNU General Public License as published by
///     the Free Software Foundation, either version 3 of the License, or
///     (at your option) any later version.
///
///     This program is distributed in the hope that it will be useful,
///     but WITHOUT ANY WARRANTY; without even the implied warranty of
///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
///     GNU General Public License for more details.
///
///     You should have received a copy of the GNU General Public License
///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
//////////////////////////////////////////////////////////////////////////////


#ifndef CONFIGURATION_HEADER
#define CONFIGURATION_HEADER

/* Enable this to make the simulator write a logbook entry */
/* #define SIM_WRITES_LOGBOOK 1 */

/* Enable this for support of optical bottle pressure interface */
/* #define ENABLE_BOTTLE_SENSOR */

/* Enable this to show voltage in parallel to charge state */
/* #define ALWAYS_SHOW_VOLTAGE */

/* Enable this to skip coplete scan of dive log during startup */
/* #define TRUST_LOG_CONSISTENCY */

/* Enable this to transfer additional data list last dive ID and last sample index during raw data requests */
/* define SEND_DATA_DETAILS */

/* Enable to activate a menu item in reset menu which provide sample ring analysis / repair functionality */
/* #define ENABLE_ANALYSE_SAMPLES */

#endif