Mercurial > public > ostc4
view Discovery/Inc/ostc_discovery.h @ 503:734f7ad46bca
Bugfix display of disabled screen.
It is possible to select a screen as default which is in parallel disabled in the selection view. To avoid this the enable / disable state is not also checked when entering dive mode. The check function was depending on an ACTION. The functionality has been changed to allow the function call without ACTION.
Changed setting of compass circle position from constant position to variable
This was needed to reuse the same function in several views with different compass position
Added new views Navigation and Depth data
Both views were basically already available but the idea behind the layout is to combine all information needed for navigation dives (compass + timer) in one view. The classic maxdepth view just showed the maxdepth with a black box on the right side. this box is now used for display of average depth (shown in classic view Stopwatch)
Minor changes in compass paint function to improve code readability
Use same Y offset for all views
While switching across the views some number were shown ~20 pixel higher than others. This was caused by the usage of the line selection which works for some fonts but not for all => set linenumber to 0 for all views
author | Ideenmodellierer |
---|---|
date | Mon, 24 Aug 2020 19:53:27 +0200 |
parents | 5f11787b4f42 |
children |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Inc/ostc_discovery.h /// \brief Hardware specific configuration /// \author heinrichs weikamp gmbh /// \date 05-Dec-2014 /// /// $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 OSTC_DISCOVERY_H #define OSTC_DISCOVERY_H #define DISPLAY_RESETB_PIN GPIO_PIN_6 #define DISPLAY_RESETB_GPIO_PORT GPIOF #define DISPLAY_RESETB_GPIO_ENABLE()__GPIOF_CLK_ENABLE() #define DISPLAY_CSB_PIN GPIO_PIN_8 #define DISPLAY_CSB_GPIO_PORT GPIOC #define DISPLAY_CSB_GPIO_ENABLE() __GPIOC_CLK_ENABLE() #define VSYNC_IRQ_PIN GPIO_PIN_4 #define VSYNC_IRQ_GPIO_PORT GPIOD #define VSYNC_IRQ_GPIO_ENABLE() __GPIOD_CLK_ENABLE() #define VSYNC_IRQ_EXTI_IRQn EXTI4_IRQn #define BUTTON_ENTER_PIN GPIO_PIN_0 #define BUTTON_ENTER_GPIO_PORT GPIOA #define BUTTON_ENTER_GPIO_ENABLE() __GPIOA_CLK_ENABLE() #define BUTTON_ENTER_EXTI_IRQn EXTI0_IRQn #define BUTTON_DOWN_PIN GPIO_PIN_1 #define BUTTON_DOWN_GPIO_PORT GPIOA #define BUTTON_DOWN_GPIO_ENABLE() __GPIOA_CLK_ENABLE() #define BUTTON_DOWN_EXTI_IRQn EXTI1_IRQn #define BUTTON_NEXT_PIN GPIO_PIN_2 #define BUTTON_NEXT_GPIO_PORT GPIOA #define BUTTON_NEXT_GPIO_ENABLE() __GPIOA_CLK_ENABLE() #define BUTTON_NEXT_EXTI_IRQn EXTI2_IRQn #define BUTTON_BACK_PIN GPIO_PIN_3 #define BUTTON_BACK_GPIO_PORT GPIOC #define BUTTON_BACK_GPIO_ENABLE() __GPIOC_CLK_ENABLE() #define BUTTON_BACK_EXTI_IRQn EXTI3_IRQn #define EXTFLASH_CSB_PIN GPIO_PIN_1 #define EXTFLASH_CSB_GPIO_PORT GPIOC #define EXTFLASH_CSB_GPIO_ENABLE() __GPIOC_CLK_ENABLE() #define OSCILLOSCOPE_PIN GPIO_PIN_14 #define OSCILLOSCOPE_GPIO_PORT GPIOG #define OSCILLOSCOPE_GPIO_ENABLE() __GPIOG_CLK_ENABLE() #define OSCILLOSCOPE2_PIN GPIO_PIN_13 #define OSCILLOSCOPE2_GPIO_PORT GPIOG #define OSCILLOSCOPE2_GPIO_ENABLE() __GPIOG_CLK_ENABLE() #define USARTx USART1 #define USARTx_CLK_ENABLE() __USART1_CLK_ENABLE(); #define USARTx_FORCE_RESET() __USART1_FORCE_RESET() #define USARTx_RELEASE_RESET() __USART1_RELEASE_RESET() #define USARTx_RX_AF GPIO_AF7_USART1 #define USARTx_RX_PIN GPIO_PIN_10 #define USARTx_RX_GPIO_PORT GPIOA #define USARTx_RX_GPIO_CLK_ENABLE() __GPIOA_CLK_ENABLE() #define USARTx_TX_AF GPIO_AF7_USART1 #define USARTx_TX_PIN GPIO_PIN_9 #define USARTx_TX_GPIO_PORT GPIOA #define USARTx_TX_GPIO_CLK_ENABLE() __GPIOA_CLK_ENABLE() #define USARTx_IRQn USART1_IRQn #define USARTx_IRQHandler USART1_IRQHandler #define TIMx TIM3 #define TIMx_CLK_ENABLE __TIM3_CLK_ENABLE #define TIMx_IRQn TIM3_IRQn #define TIMx_IRQHandler TIM3_IRQHandler #define SMALLCPU_CSB_PIN GPIO_PIN_15 #define SMALLCPU_CSB_GPIO_PORT GPIOA #define SMALLCPU_CSB_GPIO_ENABLE() __GPIOA_CLK_ENABLE() #endif // OSTC_DISCOVERY_H