Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Compilation failure

Browse source
This commit is contained in:
bsongis 2015-01-31 08:19:50 +01:00
parent 33dfcbe2f4
commit 3a13f07e96
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/Makefile
View file

@ -1482,7 +1482,7 @@ endif
lua_exports.cpp: myeeprom.h ../util/luaexport.py lua_exports.cpp: myeeprom.h ../util/luaexport.py
@echo "Generating a list of Lua exported constants in lua_exports.txt" @echo "Generating a list of Lua exported constants in lua_exports.txt"
@$(PARSER) -DPCBTARANIS -DCPUARM -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt @$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt
@echo "Parsing and generating C Lua exports in lua_exports.cpp" @echo "Parsing and generating C Lua exports in lua_exports.cpp"
@$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.cpp lua_fields.txt @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.cpp lua_fields.txt
@rm lua_exports.txt @rm lua_exports.txt

6
radio/src/bootloader/Makefile
View file

@ -284,6 +284,12 @@ DIRS = $(sort $(dir $(AXOBJS) $(CXOBJS) $(CPPXOBJS) ) )
CPPDEFS += -DCPUARM CPPDEFS += -DCPUARM
ifeq ($(PCB), TARANIS)
CPPDEFS += -DCPUSTM32
endif
CPPDEFS += -DTIMERS=0
# If serial Debug required # If serial Debug required
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CPPDEFS += -DDEBUG CPPDEFS += -DDEBUG

2
radio/src/opentx.h
View file

@ -1208,7 +1208,7 @@ LimitData *limitAddress(uint8_t idx);
int8_t *curveAddress(uint8_t idx); int8_t *curveAddress(uint8_t idx);
LogicalSwitchData *lswAddress(uint8_t idx); LogicalSwitchData *lswAddress(uint8_t idx);
#if !defined(XCURVES) #if !defined(BOOT) && !defined(XCURVES)
struct CurveInfo { struct CurveInfo {
int8_t *crv; int8_t *crv;
uint8_t points; uint8_t points;

4
radio/src/timers.h
View file

@ -34,8 +34,8 @@
* *
*/ */
#ifndef timers_h #ifndef _TIMERS_H_
#define timers_h #define _TIMERS_H_
#define TMR_OFF 0 #define TMR_OFF 0
#define TMR_RUNNING 1 #define TMR_RUNNING 1