From d94c27f826be9af1a55bed7159a36c50ed7c8ad2 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Wed, 22 Feb 2023 16:28:32 +0100 Subject: [PATCH] Add separate build for Airtop1. --- config/logos.h | 2 +- fp-application.atsln | 4 + fp-application.cproj | 374 ++++++++++--------------------------------- 3 files changed, 94 insertions(+), 286 deletions(-) diff --git a/config/logos.h b/config/logos.h index a9b39df..f712686 100644 --- a/config/logos.h +++ b/config/logos.h @@ -220,7 +220,7 @@ uint8_t __attribute__((section (".configData"))) post_code_bits [] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -#ifdef AIRTOP3_LOGO +#ifdef AIRTOP3_HW // Airtop3 logo uint8_t __attribute__((section (".configData"))) airtop_logo[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/fp-application.atsln b/fp-application.atsln index b431d59..6d9df12 100644 --- a/fp-application.atsln +++ b/fp-application.atsln @@ -9,6 +9,7 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Config Section|AVR = Config Section|AVR Debug|AVR = Debug|AVR + Release Airtop1|AVR = Release Airtop1|AVR Release|AVR = Release|AVR EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -16,8 +17,11 @@ Global {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Config Section|AVR.Build.0 = Config Section|AVR {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|AVR.ActiveCfg = Debug|AVR {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|AVR.Build.0 = Debug|AVR + {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release Airtop1|AVR.ActiveCfg = Release Airtop1|AVR + {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release Airtop1|AVR.Build.0 = Release Airtop1|AVR {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|AVR.ActiveCfg = Release|AVR {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|AVR.Build.0 = Release|AVR + {DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|AVR.Deploy.0 = Release|AVR EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/fp-application.cproj b/fp-application.cproj index 3f3adcd..656773c 100644 --- a/fp-application.cproj +++ b/fp-application.cproj @@ -253,106 +253,28 @@ True True True - True + False False True True - - - GFX_MONO_UG_2832HSWEG04=1 - BOARD=STK600_RC064X - IOPORT_XMEGA_COMPAT - VERSION=\"3.1.0\" - NDEBUG - - - - - AIRTOP3_LOGO - - - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - - Optimize for size (-Os) + + GFX_MONO_UG_2832HSWEG04=1 + BOARD=STK600_RC064X + IOPORT_XMEGA_COMPAT + VERSION=\"3.1.1\" + NDEBUG + AIRTOP3_HW + + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include True True True -std=gnu99 -fms-extensions -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax - - - libm - - + libm + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + Optimize for size (-Os) -Wl,--relax -Wl,--section-start=.BOOT=0x40000 -Wl,--section-start=.configSec=0x0001A000 -Wl,--section-start=.configData=0x0001A100 -mrelax -DBOARD=STK600_RC064X -DCONFIG_NVM_IGNORE_XMEGA_A3_D3_REVB_ERRATA -DIOPORT_XMEGA_COMPAT - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - @@ -363,107 +285,29 @@ True True True - True + False False True True - - - GFX_MONO_UG_2832HSWEG04=1 - BOARD=STK600_RC064X - IOPORT_XMEGA_COMPAT - VERSION=\"3.1.0\" - DEBUG - DEBUG_BUILD=\"-devel\" - - - - - AIRTOP3_LOGO - - - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - - Optimize debugging experience (-Og) + + GFX_MONO_UG_2832HSWEG04=1 + BOARD=STK600_RC064X + IOPORT_XMEGA_COMPAT + VERSION=\"3.1.1\" + DEBUG + DEBUG_BUILD=\"-devel\" + AIRTOP3_HW + + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include True True - Maximum (-g3) True -std=gnu99 -fms-extensions -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith - - - libm - - + libm + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + Optimize debugging experience (-Og) + Maximum (-g3) -Wl,--section-start=.BOOT=0x40000 -Wl,--section-start=.configSec=0x0001A000 -Wl,--section-start=.configData=0x0001A100 - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - Default (-Wa,-g) @@ -471,110 +315,70 @@ - -mmcu=atxmega256a3u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega256a3u" - True - True - True - True - False - True - True - - - GFX_MONO_UG_2832HSWEG04=1 - BOARD=STK600_RC064X - IOPORT_XMEGA_COMPAT - VERSION=\"2.1.1\" - NDEBUG - CONFIG_SECTION_ONLY - - - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - - True - True - True - False - - - libm - - - - - .. - ../ASF/xmega/drivers/tc - ../ASF/xmega/boards - ../ASF/common/boards - ../ASF/xmega/utils/preprocessor - ../ASF/xmega/utils - ../ASF/common/utils - ../config - ../ASF/common/services/gfx_mono - ../ASF/xmega/drivers/cpu - ../ASF/xmega/drivers/nvm - ../ASF/xmega/drivers/pmic - ../ASF/xmega/drivers/sleep - ../ASF/xmega/drivers/wdt - ../ASF/common/services/clock - ../ASF/common/services/sleepmgr - ../ASF/common/services/usb - ../ASF/common/services/usb/class/cdc - ../ASF/common/services/usb/class/cdc/device - ../ASF/common/services/usb/udc - ../ASF/xmega/drivers/adc - ../ASF/xmega/drivers/usb - ../ASF/common/components/display/ssd1306 - ../ASF/xmega/drivers/spi - ../ASF/common/services/delay - ../ASF/common/services/ioport - ../ASF/common/services/spi/xmega_spi - ../ASF/common/services/spi - ../ASF/xmega/drivers/twi - ../ASF/common/services/gpio - %24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include - - - Optimize for size (-Os) - -Wl,--section-start=.configSec=0x0001A000 -Wl,--section-start=.configData=0x0001A100 -Wl,--section-start=.text=0x0001E000 - -mrelax -DBOARD=STK600_RC064X -DCONFIG_NVM_IGNORE_XMEGA_A3_D3_REVB_ERRATA -DIOPORT_XMEGA_COMPAT - + -mmcu=atxmega256a3u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega256a3u" + True + True + True + False + False + True + True + + GFX_MONO_UG_2832HSWEG04=1 + BOARD=STK600_RC064X + IOPORT_XMEGA_COMPAT + VERSION=\"3.1.1\" + VERSION=\"2.1.1\" + NDEBUG + CONFIG_SECTION_ONLY + + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + True + True + True + False + libm + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + Optimize for size (-Os) + -Wl,--section-start=.configSec=0x0001A000 -Wl,--section-start=.configData=0x0001A100 -Wl,--section-start=.text=0x0001E000 + -mrelax -DBOARD=STK600_RC064X -DCONFIG_NVM_IGNORE_XMEGA_A3_D3_REVB_ERRATA -DIOPORT_XMEGA_COMPAT + bin\Config Section\ + + + + -mmcu=atxmega256a3u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega256a3u" + True + True + True + False + False + True + True + + GFX_MONO_UG_2832HSWEG04=1 + BOARD=STK600_RC064X + IOPORT_XMEGA_COMPAT + VERSION=\"3.1.1\" + NDEBUG + + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + True + True + True + -std=gnu99 -fms-extensions -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax + libm + ..../ASF/xmega/drivers/tc../ASF/xmega/boards../ASF/common/boards../ASF/xmega/utils/preprocessor../ASF/xmega/utils../ASF/common/utils../config../ASF/common/services/gfx_mono../ASF/xmega/drivers/cpu../ASF/xmega/drivers/nvm../ASF/xmega/drivers/pmic../ASF/xmega/drivers/sleep../ASF/xmega/drivers/wdt../ASF/common/services/clock../ASF/common/services/sleepmgr../ASF/common/services/usb../ASF/common/services/usb/class/cdc../ASF/common/services/usb/class/cdc/device../ASF/common/services/usb/udc../ASF/xmega/drivers/adc../ASF/xmega/drivers/usb../ASF/common/components/display/ssd1306../ASF/xmega/drivers/spi../ASF/common/services/delay../ASF/common/services/ioport../ASF/common/services/spi/xmega_spi../ASF/common/services/spi../ASF/xmega/drivers/twi../ASF/common/services/gpio%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include + AIRTOP3_HW + Optimize for size (-Os) + -Wl,--relax -Wl,--section-start=.BOOT=0x40000 -Wl,--section-start=.configSec=0x0001A000 -Wl,--section-start=.configData=0x0001A100 + -mrelax -DBOARD=STK600_RC064X -DCONFIG_NVM_IGNORE_XMEGA_A3_D3_REVB_ERRATA -DIOPORT_XMEGA_COMPAT + + + bin\Release Airtop1\ + compile