Commit 7808c91b authored by Iulian Gheorghiu's avatar Iulian Gheorghiu

Add more changes to convert from C to CPP of the SDK for TI Sitara AM33xx devices

parent 04d7133b
......@@ -274,7 +274,7 @@ void main_app(void)
u32 cnt = 0;
char listbox_buff[32];
char buff_tmp[10];
for(; cnt < 256; cnt++)
for(; cnt < 6; cnt++)
{
strcpy((string)listbox_buff, "Device ID ");
utoa(cnt + 1, buff_tmp, 10);
......@@ -1113,7 +1113,7 @@ _continue:
if(!lsm9ds1_0.readTemp(&lsm9ds1_Temp))
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[11]->Caption->setTextF((string)"LSM9DS1: Temp: %3.2f Gr Celsius", lsm9ds1_Temp);
ListBox->Items[0]->Caption->setTextF((string)"LSM9DS1: Temp: %3.2f Gr Celsius", lsm9ds1_Temp);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: Temp: %3.2f Gr Celsius\r", lsm9ds1_Temp);
#endif
......@@ -1137,7 +1137,7 @@ _continue:
else
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[11]->Caption->setText((string)"LSM9DS1: error reading temperature");
ListBox->Items[0]->Caption->setText((string)"LSM9DS1: error reading temperature");
#else
GI::IO::write((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: error reading temperature\r");
#endif
......@@ -1160,7 +1160,7 @@ _continue:
if(!lsm9ds1_0.readAccel(&lsm9ds1_Xa, &lsm9ds1_Ya, &lsm9ds1_Za))
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[12]->Caption->setTextF((string)"LSM9DS1: Accel: Xa = %6d, Ya = %6d, Za = %6d", lsm9ds1_Xa, lsm9ds1_Ya, lsm9ds1_Za);
ListBox->Items[1]->Caption->setTextF((string)"LSM9DS1: Accel: Xa = %6d, Ya = %6d, Za = %6d", lsm9ds1_Xa, lsm9ds1_Ya, lsm9ds1_Za);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: Accel: Xa = %6d, Ya = %6d, Za = %6d\r", lsm9ds1_Xa, lsm9ds1_Ya, lsm9ds1_Za);
#endif
......@@ -1182,7 +1182,7 @@ _continue:
else
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[12]->Caption->setText((string)"LSM9DS1: error reading accelerometer");
ListBox->Items[1]->Caption->setText((string)"LSM9DS1: error reading accelerometer");
#else
GI::IO::write((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: error reading accelerometer\r");
#endif
......@@ -1205,7 +1205,7 @@ _continue:
if(!lsm9ds1_0.readGyro(&lsm9ds1_Xg, &lsm9ds1_Yg, &lsm9ds1_Zg))
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[13]->Caption->setTextF((string)"LSM9DS1: Gyro: Xg = %6d, Yg = %6d, Zg = %6d", lsm9ds1_Xg, lsm9ds1_Yg, lsm9ds1_Zg);
ListBox->Items[2]->Caption->setTextF((string)"LSM9DS1: Gyro: Xg = %6d, Yg = %6d, Zg = %6d", lsm9ds1_Xg, lsm9ds1_Yg, lsm9ds1_Zg);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: Gyro: Xg = %6d, Yg = %6d, Zg = %6d\r", lsm9ds1_Xg, lsm9ds1_Yg, lsm9ds1_Zg);
#endif
......@@ -1227,7 +1227,7 @@ _continue:
else
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[13]->Caption->setText((string)"LSM9DS1: error reading gyroscope");
ListBox->Items[2]->Caption->setText((string)"LSM9DS1: error reading gyroscope");
#else
GI::IO::write((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: error reading gyroscope\r");
#endif
......@@ -1250,7 +1250,7 @@ _continue:
if(!lsm9ds1_0.readMag(&lsm9ds1_Xm, &lsm9ds1_Ym, &lsm9ds1_Zm))
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[14]->Caption->setTextF((string)"LSM9DS1: Mag: Xm = %6d, Ym = %6d, Zm = %6d", lsm9ds1_Xm, lsm9ds1_Ym, lsm9ds1_Zm);
ListBox->Items[3]->Caption->setTextF((string)"LSM9DS1: Mag: Xm = %6d, Ym = %6d, Zm = %6d", lsm9ds1_Xm, lsm9ds1_Ym, lsm9ds1_Zm);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: Mag: Xm = %6d, Ym = %6d, Zm = %6d\r", lsm9ds1_Xm, lsm9ds1_Ym, lsm9ds1_Zm);
#endif
......@@ -1272,7 +1272,7 @@ _continue:
else
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[14]->Caption->setText((string)"LSM9DS1: error reading magnetometer");
ListBox->Items[3]->Caption->setText((string)"LSM9DS1: error reading magnetometer");
#else
GI::IO::write((char *)CONSOLE_UART_OUT, (string)"LSM9DS1: error reading magnetometer\r");
#endif
......@@ -1308,7 +1308,7 @@ _continue:
ssd1306_0->clear(Color::Black);
#endif
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[15]->Caption->setTextF((string)"LPS25HB: Temp: %3.2f Gr Celsius", lps25hb_Temp);
ListBox->Items[4]->Caption->setTextF((string)"LPS25HB: Temp: %3.2f Gr Celsius", lps25hb_Temp);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LPS25HB: Temp: %3.2f Gr Celsius\r", lps25hb_Temp);
#endif
......@@ -1340,7 +1340,7 @@ _continue:
if(!lps25hb_0.readPress(&lps25hb_Press))
{
#if (SHOW_SENSORS_RESULT_ON_SCREEN == 1)
ListBox->Items[16]->Caption->setTextF((string)"LPS25HB: Press: %4.2f", lps25hb_Press);
ListBox->Items[5]->Caption->setTextF((string)"LPS25HB: Press: %4.2f", lps25hb_Press);
#else
GI::IO::writeF((char *)CONSOLE_UART_OUT, (string)"LPS25HB: Press: %4.2f\r", lps25hb_Press);
#endif
......
......@@ -13,7 +13,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.354711458" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.354711458" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="arm-none-eabi-size &quot;${BuildArtifactFileName}&quot;">
<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.354711458." name="/" resourcePath="">
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_7.0.exe.DebugToolchain.521889216" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_7.0.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_GNU_7.0.exe.linkerDebug.905805">
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.183501857" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
......@@ -79,7 +79,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="lib/board/TI/SmartRF06|lib/board/TI/CC1310LauchPad|lib/board/STM|lib/board/NXP|lib/board/ATMEL" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="am33/aintc/aintc_tsc_adc.c|lib/board/TI/SmartRF06|lib/board/TI/CC1310LauchPad|lib/board/STM|lib/board/NXP|lib/board/ATMEL" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
......@@ -157,7 +157,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="lib/board/TI/SmartRF06|lib/board/TI/CC1310LauchPad|lib/board/STM|lib/board/NXP|lib/board/ATMEL" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="am33/aintc/aintc_tsc_adc.c|lib/board/TI/SmartRF06|lib/board/TI/CC1310LauchPad|lib/board/STM|lib/board/NXP|lib/board/ATMEL" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
......
This diff is collapsed.
......@@ -7,6 +7,8 @@ encoding//Debug/am33/clk/subdir_rules.mk=UTF-8
encoding//Debug/am33/clk/subdir_vars.mk=UTF-8
encoding//Debug/am33/driver/subdir_rules.mk=UTF-8
encoding//Debug/am33/driver/subdir_vars.mk=UTF-8
encoding//Debug/am33/interface/mmcsdlib/subdir_rules.mk=UTF-8
encoding//Debug/am33/interface/mmcsdlib/subdir_vars.mk=UTF-8
encoding//Debug/am33/interface/subdir_rules.mk=UTF-8
encoding//Debug/am33/interface/subdir_vars.mk=UTF-8
encoding//Debug/am33/interface/usb_dev_msc/subdir_rules.mk=UTF-8
......@@ -17,6 +19,8 @@ encoding//Debug/am33/interface/usblib/host/subdir_rules.mk=UTF-8
encoding//Debug/am33/interface/usblib/host/subdir_vars.mk=UTF-8
encoding//Debug/am33/interface/usblib/subdir_rules.mk=UTF-8
encoding//Debug/am33/interface/usblib/subdir_vars.mk=UTF-8
encoding//Debug/am33/pinmux/subdir_rules.mk=UTF-8
encoding//Debug/am33/pinmux/subdir_vars.mk=UTF-8
encoding//Debug/am33/sys/subdir_rules.mk=UTF-8
encoding//Debug/am33/sys/subdir_vars.mk=UTF-8
encoding//Debug/lib/api/subdir_rules.mk=UTF-8
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1275838902971831716" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="117439957937953287" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......@@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1290791440738804376" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="102487420170980627" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......
......@@ -6,7 +6,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1275838902971831716" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="117439957937953287" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......@@ -18,7 +18,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1290791440738804376" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="102487420170980627" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......
......@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1275838902971831716" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="117439957937953287" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......@@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1290791440738804376" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="102487420170980627" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......
This diff is collapsed.
......@@ -39,6 +39,8 @@ encoding//Debug/lib/board/TI/CC1310LauchPad/subdir_rules.mk=UTF-8
encoding//Debug/lib/board/TI/CC1310LauchPad/subdir_vars.mk=UTF-8
encoding//Debug/lib/board/TI/SmartRF06/subdir_rules.mk=UTF-8
encoding//Debug/lib/board/TI/SmartRF06/subdir_vars.mk=UTF-8
encoding//Debug/lib/board/TI/beaglebone/subdir_rules.mk=UTF-8
encoding//Debug/lib/board/TI/beaglebone/subdir_vars.mk=UTF-8
encoding//Debug/lib/device/subdir_rules.mk=UTF-8
encoding//Debug/lib/device/subdir_vars.mk=UTF-8
encoding//Debug/lib/include/subdir_rules.mk=UTF-8
......
......@@ -4,7 +4,7 @@
SHELL = cmd.exe
CG_TOOL_ROOT := C:/ti/ccsv7/tools/compiler/gcc-arm-none-eabi-6-2017-q1-update
CG_TOOL_ROOT := C:/ti/ccsv8/tools/compiler/gcc-arm-none-eabi-7-2017-q4-major-win32
GEN_OPTS__FLAG :=
GEN_CMDS__FLAG :=
......@@ -324,7 +324,7 @@ all: $(OBJS) $(LDS_SRCS) $(LD_SRCS) $(GEN_CMDS)
ExampleSmartRF06.out: $(OBJS) $(LDS_SRCS) $(LD_SRCS) $(GEN_CMDS)
@echo 'Building target: "$@"'
@echo 'Invoking: GNU Linker'
"C:/ti/ccsv7/tools/compiler/gcc-arm-none-eabi-6-2017-q1-update/bin/arm-none-eabi-gcc.exe" -mtune=cortex-m3 -fno-exceptions -DCC1310LauchPad -DDRIVERLIB_NOROM -O1 -ffunction-sections -fdata-sections -g -gdwarf-3 -gstrict-dwarf -Wall -specs="nosys.specs" -fno-strict-aliasing -fno-use-cxa-atexit --asm -std=c99 -mthumb -Wl,-Map,"ExampleSmartRF06.map" -Wl,--gc-sections -fno-exceptions --specs=nano.specs -o"ExampleSmartRF06.out" $(ORDERED_OBJS)
"C:/ti/ccsv8/tools/compiler/gcc-arm-none-eabi-7-2017-q4-major-win32/bin/arm-none-eabi-gcc.exe" -mtune=cortex-m3 -fno-exceptions -DCC1310LauchPad -DDRIVERLIB_NOROM -O1 -ffunction-sections -fdata-sections -g -gdwarf-3 -gstrict-dwarf -Wall -specs="nosys.specs" -fno-strict-aliasing -fno-use-cxa-atexit --asm -std=c99 -mthumb -Wl,-Map,"ExampleSmartRF06.map" -Wl,--gc-sections -fno-exceptions --specs=nano.specs -o"ExampleSmartRF06.out" $(ORDERED_OBJS)
@echo 'Finished building target: "$@"'
@echo ' '
@$(MAKE) --no-print-directory post-build
......@@ -332,7 +332,7 @@ ExampleSmartRF06.out: $(OBJS) $(LDS_SRCS) $(LD_SRCS) $(GEN_CMDS)
ExampleSmartRF06.bin: $(EXE_OUTPUTS)
@echo 'Building files: $(strip $(EXE_OUTPUTS__QUOTED))'
@echo 'Invoking: GNU Objcopy Utility'
"C:/ti/ccsv7/tools/compiler/gcc-arm-none-eabi-6-2017-q1-update/bin/arm-none-eabi-objcopy.exe" $(EXE_OUTPUTS__QUOTED) "ExampleSmartRF06.bin"
"C:/ti/ccsv8/tools/compiler/gcc-arm-none-eabi-7-2017-q4-major-win32/bin/arm-none-eabi-objcopy.exe" $(EXE_OUTPUTS__QUOTED) "ExampleSmartRF06.bin"
@echo 'Finished building: $(strip $(EXE_OUTPUTS__QUOTED))'
@echo ' '
@$(MAKE) --no-print-directory post-build
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -104,63 +104,63 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<ToolchainSettings>
<AvrGccCpp>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.SubroutinesFunctionPrologues>True</avrgcc.compiler.general.SubroutinesFunctionPrologues>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>Xmega_E5_Xplained</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\Common</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\lib</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\platform\xmega</Value>
<Value>..</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcccpp.compiler.general.SubroutinesFunctionPrologues>True</avrgcccpp.compiler.general.SubroutinesFunctionPrologues>
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcccpp.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>Xmega_E5_Xplained</Value>
</ListValues>
</avrgcccpp.compiler.symbols.DefSymbols>
<avrgcccpp.compiler.directories.IncludePaths>
<ListValues>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\Common</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\lib</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\platform\xmega</Value>
<Value>..</Value>
</ListValues>
</avrgcccpp.compiler.directories.IncludePaths>
<avrgcccpp.compiler.optimization.level>Optimize (-O1)</avrgcccpp.compiler.optimization.level>
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcccpp.compiler.optimization.DebugLevel>Default (-g2)</avrgcccpp.compiler.optimization.DebugLevel>
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
<avrgcccpp.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcccpp.linker.libraries.Libraries>
<avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
</AvrGccCpp>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.SubroutinesFunctionPrologues>True</avrgcc.compiler.general.SubroutinesFunctionPrologues>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>Xmega_E5_Xplained</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\Common</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\lib</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\platform\xmega</Value>
<Value>..</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcccpp.compiler.general.SubroutinesFunctionPrologues>True</avrgcccpp.compiler.general.SubroutinesFunctionPrologues>
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcccpp.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>Xmega_E5_Xplained</Value>
</ListValues>
</avrgcccpp.compiler.symbols.DefSymbols>
<avrgcccpp.compiler.directories.IncludePaths>
<ListValues>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\Common</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\lib</Value>
<Value>C:\GitHub\MULTIPLATFORM-CPP-SDK\SDK\platform\xmega</Value>
<Value>..</Value>
</ListValues>
</avrgcccpp.compiler.directories.IncludePaths>
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcccpp.compiler.optimization.DebugLevel>Default (-g2)</avrgcccpp.compiler.optimization.DebugLevel>
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
<avrgcccpp.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcccpp.linker.libraries.Libraries>
<avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
</AvrGccCpp>
</ToolchainSettings>
</PropertyGroup>
<ItemGroup>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -5,7 +5,7 @@
<ProjectVersion>6.2</ProjectVersion>
<ToolchainName>com.Atmel.AVRGCC8.CPP</ToolchainName>
<ProjectGuid>{4bcca38f-80f4-4515-9bd6-cc6697519c63}</ProjectGuid>
<avrdevice>ATxmega32E5</avrdevice>
<avrdevice>ATxmega128A1</avrdevice>
<avrdeviceseries>none</avrdeviceseries>
<OutputType>Executable</OutputType>
<Language>CPP</Language>
......@@ -38,7 +38,8 @@
</dependencies>
</framework-data>
</AsfFrameworkConfig>
<avrtool>com.atmel.avrdbg.tool.simulator</avrtool>
<avrtool>
</avrtool>
<avrtoolinterface>PDI</avrtoolinterface>
<com_atmel_avrdbg_tool_ispmk2>
<ToolOptions>
......@@ -76,39 +77,40 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings>
<AvrGccCpp>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>NDEBUG</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcccpp.compiler.symbols.DefSymbols>
<ListValues>
<Value>NDEBUG</Value>
</ListValues>
</avrgcccpp.compiler.symbols.DefSymbols>
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
<avrgcccpp.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcccpp.linker.libraries.Libraries>
</AvrGccCpp>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>NDEBUG</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcccpp.compiler.symbols.DefSymbols>
<ListValues>
<Value>NDEBUG</Value>
</ListValues>
</avrgcccpp.compiler.symbols.DefSymbols>
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
<avrgcccpp.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcccpp.linker.libraries.Libraries>
</AvrGccCpp>
</ToolchainSettings>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
......@@ -230,6 +232,14 @@ IntelHexToVerilogMem.exe -i "$(OutputFileName).hex" -o "C:\GitHub\VERILOG-XMEGA-
<SubType>compile</SubType>
<Link>lib\device\common.h</Link>
</Compile>
<Compile Include="..\..\SDK\lib\device\lcd_fpga.cpp">
<SubType>compile</SubType>
<Link>lib\device\lcd_fpga.cpp</Link>
</Compile>
<Compile Include="..\..\SDK\lib\device\lcd_fpga.h">
<SubType>compile</SubType>
<Link>lib\device\lcd_fpga.h</Link>
</Compile>
<Compile Include="..\..\SDK\lib\device\lps25hb.cpp">
<SubType>compile</SubType>
<Link>lib\device\lps25hb.cpp</Link>
......
......@@ -27,6 +27,7 @@
#define FPGA_PORTE (*(FPGA_PORT_t *) 0x00E0) /* PMOD B Port */
#define FPGA_PORTF (*(FPGA_PORT_t *) 0x0100) /* PMOD C Port */
#define FPGA_PORTG (*(FPGA_PORT_t *) 0x0120) /* Onboard OLED display Port */
#define FPGA_GFX_ACCELA (*(FPGA_GFX_ACCEL_t *) 0x0300) /* */
#define FPGA_UARTA (*(FPGA_USART_t *) 0x0400) /* */
#define FPGA_SPIA (*(FPGA_SPI_t *) 0x0600) /* */
#define FPGA_TWIA (*(FPGA_TWI_t *) 0x0800) /* */
......
......@@ -9,14 +9,15 @@
#define MAIN_H_
#define USE_GPIO true
#define USE_UART true
#define USE_UART false
#define USE_I2C true
#define USE_SPI false
#define USE_SCREEN false
#define CALIBRATE_TOUCH_ON_STARTUP false
#define USE_SCREEN_GUI false
#define USE_WINDOW false
#define USE_SCREEN_GUI true
#define _USE_PASSWORD_PROTECTION false
#define CONSOLE_UART_IN "uart-0"
......@@ -76,7 +77,7 @@
//#define _USE_SRF02 false
//#define _USE_nRF25l01 false
#define SHOW_SENSORS_RESULT_ON_SCREEN false
#define SHOW_SENSORS_RESULT_ON_SCREEN true
#define _USE_INT_ADC false
......
......@@ -31,6 +31,7 @@
#include "interface/screen.h"
#include <device/ssd1306.h>
#include <device/st7565.h>
#include <device/lcd_fpga.h>
#include "interface/screen_def.h"
#if (USE_LWIP == 1)
......
......@@ -594,3 +594,183 @@ LCD_TIMINGS lcd_1080p_24hz_beaglebone_exp =
/*vsw*/5,
/*vfp*/4,
/*vbp*/36 };
LCD_TIMINGS lcd_fpga_640_480_60_crt_27_17_mhz =
{
/*X size*/640,
/*Y size*/480,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/27170000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/9,
/*hfp*/16,
/*hbp*/48,
/*vsw*/2,
/*vfp*/10,
/*vbp*/33 };
LCD_TIMINGS lcd_fpga_640_480_60_display_24_20_mhz =
{
/*X size*/640,
/*Y size*/480,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/24200000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/32,
/*hfp*/24,
/*hbp*/72,
/*vsw*/3,
/*vfp*/10,
/*vbp*/32 };
LCD_TIMINGS lcd_fpga_720_480_60_display_27_00_mhz =
{
/*X size*/720,
/*Y size*/480,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/27000000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/62,
/*hfp*/16,
/*hbp*/60,
/*vsw*/6,
/*vfp*/9,
/*vbp*/30 };
LCD_TIMINGS lcd_fpga_800_600_60_display_40_00_mhz =
{
/*X size*/800,
/*Y size*/600,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/40000000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/128,
/*hfp*/40,
/*hbp*/88,
/*vsw*/5,
/*vfp*/4,
/*vbp*/23 };
LCD_TIMINGS lcd_fpga_1024_768_60_display_65_00_mhz =
{
/*X size*/1024,
/*Y size*/768,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/65000000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/136,
/*hfp*/24,
/*hbp*/160,
/*vsw*/6,
/*vfp*/3,
/*vbp*/29 };
LCD_TIMINGS lcd_fpga_1280_720_60_display_74_25_mhz =
{
/*X size*/1280,
/*Y size*/720,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/74250000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/80,
/*hfp*/70,
/*hbp*/220,
/*vsw*/5,
/*vfp*/3,
/*vbp*/25 };
LCD_TIMINGS lcd_fpga_1400_1060_60_display_119_00_mhz =
{
/*X size*/1400,
/*Y size*/1060,
/*ref clk*/0,
/*pll M*/0,
/*pll N*/0,
/*pll M2*/0,
/*raster clk*/119000000,
/*palete len*/0,
/*bus size*/24,
/*hsw*/32,
/*hfp*/48,
/*hbp*/80,
/*vsw*/6,
/*vfp*/3,
/*vbp*/21 };