mirror of
https://github.com/opentx/opentx.git
synced 2025-07-16 04:45:17 +03:00
Constructors called on static objects - I really need them now :)
This commit is contained in:
parent
80eb34cea2
commit
8032d6ee66
2 changed files with 10 additions and 1 deletions
|
@ -36,8 +36,14 @@
|
||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
|
#if !defined(BOOT)
|
||||||
const pm_char s_charTab[] PROGMEM = "_-.,";
|
const pm_char s_charTab[] PROGMEM = "_-.,";
|
||||||
|
|
||||||
|
char hex2zchar(uint8_t hex)
|
||||||
|
{
|
||||||
|
return (hex >= 10 ? hex-9 : 27+hex);
|
||||||
|
}
|
||||||
|
|
||||||
char idx2char(int8_t idx)
|
char idx2char(int8_t idx)
|
||||||
{
|
{
|
||||||
if (idx == 0) return ' ';
|
if (idx == 0) return ' ';
|
||||||
|
@ -142,6 +148,7 @@ char * strcat_zchar(char * dest, char * name, uint8_t size, const char *defaultN
|
||||||
return &dest[len];
|
return &dest[len];
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CPUARM) || defined(SDCARD)
|
#if defined(CPUARM) || defined(SDCARD)
|
||||||
char * strAppend(char * dest, const char * source)
|
char * strAppend(char * dest, const char * source)
|
||||||
|
|
|
@ -99,7 +99,9 @@ LoopFillZerobss:
|
||||||
cmp r2, r3
|
cmp r2, r3
|
||||||
bcc FillZerobss
|
bcc FillZerobss
|
||||||
/* Call the clock system intitialization function.*/
|
/* Call the clock system intitialization function.*/
|
||||||
bl SystemInit
|
bl SystemInit
|
||||||
|
/* Call C++ constructors for static objects */
|
||||||
|
bl __libc_init_array
|
||||||
/* Call the application's entry point.*/
|
/* Call the application's entry point.*/
|
||||||
bl main
|
bl main
|
||||||
bx lr
|
bx lr
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue