piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Taranis] Altitude played without decimal when >= 10m

Browse Source 
[Taranis] WDT and Timers paused when on a breakpoint
This commit is contained in:
bsongis
2013-10-07 17:32:50 +00:00
parent 4f55c6d3aa
commit 30ce4a328d
12 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+3 -2
View File
@@ -615,6 +615,7 @@ ifeq ($(PCB), TARANIS)
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/misc.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_dbgmcu.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_dma.c
@@ -1069,8 +1070,8 @@ stamp_header:
@echo
@echo "Generate Version-stamp:"
@echo "//Automatically generated file (Makefile) - do not edit" > stamp-opentx.h
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" >> stamp-opentx.h
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx.h
@echo "#define DATE_STR \"`date +%Y-%m-%d | tr -d '\r\n'`\"" >> stamp-opentx.h
@echo "#define TIME_STR \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp-opentx.h
@echo "#define SVN_STR \"opentx-r$(SVNREV)\"" >> stamp-opentx.h
@cat stamp-opentx.h
src/targets/taranis/board_taranis.cpp
+6
View File
@@ -39,6 +39,7 @@
extern "C" {
#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h"
#include "stm32f2xx_dbgmcu.h"
}
volatile uint32_t Tenms ; // TODO to remove everywhere / use a #define
@@ -198,6 +199,11 @@ void boardInit()
eepromInit();
sportInit();
usbInit();
#if defined(DEBUG)
DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE);
#endif
}
#endif
src/translations/en.h
+1 -1
View File
@@ -167,7 +167,7 @@
#define TR_PLAY_TRACK "Play Track"
#endif
#define TR_PLAY_BOTH "Play Both\0"
#define TR_PLAY_VALUE "Play Val\0 "
#define TR_PLAY_VALUE TR("Play Val\0 ", "Play Value")
#else
#define TR_PLAY_TRACK "[Play Trk]"
#define TR_PLAY_BOTH "[Play Bth]"
src/translations/tts_cz.cpp
+6 -6
View File
@@ -122,14 +122,14 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_de.cpp
+6 -6
View File
@@ -112,14 +112,14 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_en.cpp
+6 -6
View File
@@ -99,14 +99,14 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_es.cpp
+6 -6
View File
@@ -136,14 +136,14 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_fr.cpp
+6 -6
View File
@@ -118,14 +118,14 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_it.cpp
+6 -6
View File
@@ -108,14 +108,14 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_pt.cpp
+6 -6
View File
@@ -121,14 +121,14 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_se.cpp
+6 -6
View File
@@ -86,14 +86,14 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}
src/translations/tts_sk.cpp
+6 -6
View File
@@ -137,14 +137,14 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (IS_IMPERIAL_ENABLE()) {
if (unit == UNIT_METERS) {
unit = UNIT_FEET;
#if defined(CPUARM)
if (att & PREC1) {
number /= 10;
att -= PREC1;
}
#endif
}
}
#if defined(CPUARM)
if (unit == UNIT_METERS && number >= 100 && (att & PREC1)) {
number /= 10;
att -= PREC1;
}
#endif
unit++;
}