Mercurial > public > ostc4

changeset 677:1953cd9145b3 Betatest

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move include file to common to ... ... get things compiled. The configuration.h file is also used from the RTE code, so it should be in the Common tree. Signed-off-by: Jan Mulder <jan@jlmulder.nl>
author Jan Mulder <jan@jlmulder.nl>
date Wed, 20 Apr 2022 20:25:04 +0200
parents c855753af9a6
children 05cdd367dbd0
files Common/Inc/configuration.h Discovery/Inc/configuration.h
diffstat 2 files changed, 72 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Common/Inc/configuration.h	Wed Apr 20 20:25:04 2022 +0200
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- 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 */
+
+/* Enable to have access to the debug view options (turn on / off via menu instead of compile switch) */
+/* #define HAVE_DEBUG_VIEW */
+
+/* Enable to have access to the motion control selection menu */
+#define ENABLE_MOTION_CONTROL
+
+/* Enable to have option to hide not needed gases from dive views */
+/* #define ENABLE_UNUSED_GAS_HIDING */
+
+/* Enable to have the new T3 profile view available */
+#define ENABLE_T3_PROFILE_VIEW
+
+/* Enable to have PPO2 adjustments in T3 sensor view during dive simulation */
+/* #define ENABLE_T3_PPO_SIM */
+
+/* Enable to have PSCR functionality available */
+#define ENABLE_PSCR_MODE
+
+/* Enable to have CO2 sensor functionality available */
+/* #define ENABLE_CO2_SUPPORT */
+
+/* Enable if you are using sensors with a voltage range 8..16 mV at surface / air level */
+#define ENABLE_ALTERNATIVE_SENSORTYP
+
+#endif
--- a/Discovery/Inc/configuration.h	Mon Nov 22 19:39:11 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-/// -*- 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 */
-
-/* Enable to have access to the debug view options (turn on / off via menu instead of compile switch) */
-/* #define HAVE_DEBUG_VIEW */
-
-/* Enable to have access to the motion control selection menu */
-#define ENABLE_MOTION_CONTROL
-
-/* Enable to have option to hide not needed gases from dive views */
-/* #define ENABLE_UNUSED_GAS_HIDING */
-
-/* Enable to have the new T3 profile view available */
-#define ENABLE_T3_PROFILE_VIEW
-
-/* Enable to have PPO2 adjustments in T3 sensor view during dive simulation */
-/* #define ENABLE_T3_PPO_SIM */
-
-/* Enable to have PSCR functionality available */
-#define ENABLE_PSCR_MODE
-
-/* Enable to have CO2 sensor functionality available */
-/* #define ENABLE_CO2_SUPPORT */
-
-/* Enable if you are using sensors with a voltage range 8..16 mV at surface / air level */
-#define ENABLE_ALTERNATIVE_SENSORTYP
-
-#endif