Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

Additonal stamp.h fixes

Browse source
This commit is contained in:
Damjan Adamic 2015-11-19 18:16:58 +01:00
parent ee95c973e9
commit 32d0e3890a
5 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/Makefile
View file

@ -1789,12 +1789,6 @@ stamp.h:
@echo "#define TIME \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp.h @echo "#define TIME \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp.h
@echo "#define VERSION \"$(VERSION)\"" >> stamp.h @echo "#define VERSION \"$(VERSION)\"" >> stamp.h
opentx-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx.txt
@cat stamp-opentx.txt
translations/en.h: translations/en.h.txt translations/en.h: translations/en.h.txt
@echo @echo
@echo "Create English language specific header files" @echo "Create English language specific header files"

2
radio/src/debug.cpp
View file

@ -97,7 +97,7 @@ const struct TraceElement * getTraceElement(uint16_t idx)
void dumpTraceBuffer() void dumpTraceBuffer()
{ {
TRACE("Dump of Trace Buffer (" VERS_STR " " DATE_STR " " TIME_STR "):"); TRACE("Dump of Trace Buffer (" VERSION " " DATE " " TIME "):");
TRACE("# Time Event Data"); TRACE("# Time Event Data");
for(int n = 0; n < TRACE_BUFFER_LEN; ++n) { for(int n = 0; n < TRACE_BUFFER_LEN; ++n) {
struct gtm tp; struct gtm tp;

2
radio/src/gui/Horus/view_statistics.cpp
View file

@ -175,7 +175,7 @@ bool menuTraceBuffer(evt_t event)
break; break;
} }
SIMPLE_SUBMENU("Trace Buffer " VERS_STR, TRACE_BUFFER_LEN); SIMPLE_SUBMENU("Trace Buffer " VERSION, TRACE_BUFFER_LEN);
/* RTC time */ /* RTC time */
struct gtm t; struct gtm t;

2
radio/src/gui/Taranis/view_statistics.cpp
View file

@ -215,7 +215,7 @@ void menuTraceBuffer(uint8_t event)
break; break;
} }
SIMPLE_SUBMENU("Trace Buffer " VERS_STR, TRACE_BUFFER_LEN); SIMPLE_SUBMENU("Trace Buffer " VERSION, TRACE_BUFFER_LEN);
/* RTC time */ /* RTC time */
struct gtm t; struct gtm t;
gettime(&t); gettime(&t);

6
radio/src/targets/Taranis/bootloader/boot.cpp
View file

@ -62,11 +62,11 @@
#include "FatFs/ff.h" #include "FatFs/ff.h"
#include "FatFs/diskio.h" #include "FatFs/diskio.h"
#include "translations/en.h" #include "translations/en.h"
#include "stamp-opentx.h" #include "stamp.h"
#include "strhelpers.h" #include "strhelpers.h"
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define BOOTLOADER_TITLE " Taranis BootLoader - " VERS_STR #define BOOTLOADER_TITLE " Taranis BootLoader - " VERSION
#if defined(REV9E) #if defined(REV9E)
#define BOOT_KEY_UP KEY_MINUS #define BOOT_KEY_UP KEY_MINUS
#define BOOT_KEY_DOWN KEY_PLUS #define BOOT_KEY_DOWN KEY_PLUS
@ -80,7 +80,7 @@
#define BOOT_KEY_EXIT KEY_EXIT #define BOOT_KEY_EXIT KEY_EXIT
#define DISPLAY_CHAR_WIDTH 35 #define DISPLAY_CHAR_WIDTH 35
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define BOOTLOADER_TITLE "Sky9x Boot Loader - " VERS_STR #define BOOTLOADER_TITLE "Sky9x Boot Loader - " VERSION
#endif #endif
const uint8_t bootloaderVersion[] __attribute__ ((section(".version"), used)) = const uint8_t bootloaderVersion[] __attribute__ ((section(".version"), used)) =