Bsongis/lua interpreter added on x7d (#3999)

* [X7D] Lua option added (only standalone scripts)

* [X7D] Compilation fix

* [X7D] Compilation fix

* [X7D] Compilation fix

* [X7D] Compilation fix
This commit is contained in:
Bertrand Songis
2016-11-10 21:41:16 +01:00
committed by GitHub
parent 35571ad4d1
commit d58244ebde
23 changed files with 174 additions and 120 deletions
+4 -4
View File
@@ -7,7 +7,7 @@ if(PCB STREQUAL X9E)
set(CPU_TYPE STM32F4)
set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
set(HAPTIC YES)
set(LUA_EXPORT lua_export_taranis_x9e)
set(LUA_EXPORT lua_export_x9e)
set(FLAVOUR x9e)
add_definitions(-DSTM32F40_41xxx -DPCBX9E)
add_definitions(-DEEPROM_VARIANT=32768)
@@ -29,7 +29,7 @@ elseif(PCB STREQUAL X9D+)
set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
set(HAPTIC YES)
set(LUA_EXPORT lua_export_taranis)
set(LUA_EXPORT lua_export_x9d)
set(FLAVOUR x9d+)
add_definitions(-DPCBX9DP)
add_definitions(-DEEPROM_VARIANT=0)
@@ -42,7 +42,7 @@ elseif(PCB STREQUAL X9D)
set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
option(HAPTIC "Haptic support" OFF)
set(LUA_EXPORT lua_export_taranis)
set(LUA_EXPORT lua_export_x9d)
set(FLAVOUR x9d)
add_definitions(-DPCBX9D)
add_definitions(-DEEPROM_VARIANT=0)
@@ -55,7 +55,7 @@ elseif(PCB STREQUAL X7D)
set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
set(HAPTIC YES)
set(LUA_EXPORT lua_export_taranis)
set(LUA_EXPORT lua_export_x7d)
set(FLAVOUR x7d)
add_definitions(-DPCBX7D -DSOFTWARE_VOLUME)
add_definitions(-DEEPROM_VARIANT=0)
@@ -552,7 +552,7 @@ int main()
progress = (200*eepromWritten) / EEPROM_SIZE;
}
lcdDrawRect( 3, 6*FH+4, 204, 7);
lcdDrawRect(3, 6*FH+4, 204, 7);
lcdDrawSolidHorizontalLine(5, 6*FH+6, progress, FORCE);
lcdDrawSolidHorizontalLine(5, 6*FH+7, progress, FORCE);
lcdDrawSolidHorizontalLine(5, 6*FH+8, progress, FORCE);