Mercurial > public > ostc4
view Common/Inc/FirmwareData.h @ 481:89f6857276f8 Improve_Button_Sleep
Bugfix calculation of string center position:
Strings shown on the right side at surface mode use special characters ('\016' and '\017') to switch font size. Headline strings like "Desaturation" could also be set to the target font directly, because they do not contain mixed font sizes, but nethertheless they are using the special characters.
The function calculating the offset needed to display the strinter with center alignment did not consider the small font size => misalignment during string display. To avoid this an evaluation of the special characters has been added to the helper function.
author | ideenmodellierer |
---|---|
date | Mon, 18 May 2020 21:51:08 +0200 |
parents | 5f11787b4f42 |
children |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Common/Inc/FirmwareData.h /// \brief Firmware Signature (version, makers, date, etc.) /// \author Heinrichs Weikamp, jDG /// \date 2017-12-31 /// /// $Id$ /////////////////////////////////////////////////////////////////////////////// /// \par Copyright (c) 2014-2018 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 FIRMWARE_DATA_H #define FIRMWARE_DATA_H #include <stdint.h> /// @brief Firmware Signature /// /// Contains typedef struct { uint8_t versionFirst; ///< Major version number uint8_t versionSecond; ///< Minor version number uint8_t versionThird; uint8_t versionBeta; uint8_t signature[4]; uint8_t release_year; uint8_t release_month; uint8_t release_day; uint8_t release_sub; char release_info[48]; char magic[4]; } SFirmwareData; enum FirmwareMagic { FIRMWARE_MAGIC_FIRST = 0x00, ///< type[0] FIRMWARE_MAGIC_SECOND = 0x00, ///< type[1] FIRMWARE_MAGIC_FIRMWARE = 0xEE, FIRMWARE_MAGIC_CPU2_RTE = 0xE2, FIRMWARE_MAGIC_FONT = 0xF0, FIRMWARE_MAGIC_END = 0xFF ///< type[2] }; extern const SFirmwareData font_FirmwareData; extern const SFirmwareData bootloader_FirmwareData; extern const SFirmwareData firmware_FirmwareData; extern const SFirmwareData cpu2_FirmwareData; #endif /* FIRMWARE_DATA_H */