Skip to content

Commit

Permalink
update watch project.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dantiana
dantiana committed May 25, 2016
1 parent 2a4d24d commit 301c058
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 18 deletions.
24 changes: 18 additions & 6 deletions product/jumawatch/mdk-arm/WATCH.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@
<TargetName>WATCH</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060020::V5.06 (build 20)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32F429VITx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.3.0</PackID>
<PackURL>http://www.keil.com/pack</PackURL>
<Cpu>IROM(0x08000000,0x200000) IRAM(0x20000000,0x30000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
Expand Down Expand Up @@ -72,6 +75,8 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopB1X>0</nStopB1X>
<nStopB2X>0</nStopB2X>
</BeforeMake>
<AfterMake>
<RunUserProg1>0</RunUserProg1>
Expand All @@ -80,6 +85,8 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopA1X>0</nStopA1X>
<nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
Expand Down Expand Up @@ -128,6 +135,7 @@
<RestoreFunctions>1</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<LimitSpeedToRealTime>0</LimitSpeedToRealTime>
<RestoreSysVw>1</RestoreSysVw>
</Simulator>
<Target>
<UseTarget>1</UseTarget>
Expand All @@ -139,8 +147,7 @@
<RestoreFunctions>0</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreSysVw>1</RestoreSysVw>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>11</TargetSelection>
Expand Down Expand Up @@ -223,6 +230,7 @@
<useUlib>1</useUlib>
<EndSel>0</EndSel>
<uLtcg>0</uLtcg>
<nSecure>0</nSecure>
<RoSelD>3</RoSelD>
<RwSelD>3</RwSelD>
<CodeSel>0</CodeSel>
Expand Down Expand Up @@ -357,11 +365,15 @@
<uSurpInc>0</uSurpInc>
<uC99>1</uC99>
<useXO>0</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>0</vShortEn>
<vShortWch>0</vShortWch>
<VariousControls>
<MiscControls>--C99 --gnu</MiscControls>
<Define>USE_HAL_DRIVER,ENABLE_SPI_FIX,BLUENRG_MS,STM32F429xx,USE_STM32F429I_DISCO,RTC_LSE,SERVER_ROLE,NO_PRINTF,JUMA_WATCH,CANNON_V2</Define>
<Undefine></Undefine>
<IncludePath>..\inc;..\..\..\system\cmiss\include;..\..\..\system\cmiss\device\st\inc;..\..\..\system\bsp\jumawatch;..\..\..\system\hal\stm32f4xx_hal_driver\inc;..\..\..\system\drivers\juma\common;..\..\..\system\drivers\juma\ili9341;..\..\..\system\drivers\juma\st7789v;..\..\..\system\drivers\st\hts221;..\..\..\system\drivers\st\lps25h;..\..\..\system\drivers\st\lps25hb;..\..\..\system\drivers\st\lsm303agr;..\..\..\system\drivers\st\lsm6ds3;..\..\..\system\drivers\st\common;..\..\..\system\drivers\st\bluenrg\bluenrg_ms;..\..\..\system\middlewares\st\bluenrg_ms\inc;..\..\..\system\middlewares\juma\st7789v;..\..\..\system\middlewares\juma\sdk;..\..\..\system\middlewares\juma\sensor;..\..\..\system\middlewares\juma\dispatcher;..\..\..\system\middlewares\juma\low_power</IncludePath>
<IncludePath>..\inc;..\..\..\system\cmsis\include;..\..\..\system\cmsis\device\st\inc;..\..\..\system\bsp\jumawatch;..\..\..\system\hal\stm32f4xx_hal_driver\inc;..\..\..\system\drivers\juma\common;..\..\..\system\drivers\juma\ili9341;..\..\..\system\drivers\juma\st7789v;..\..\..\system\drivers\st\hts221;..\..\..\system\drivers\st\lps25h;..\..\..\system\drivers\st\lps25hb;..\..\..\system\drivers\st\lsm303agr;..\..\..\system\drivers\st\lsm6ds3;..\..\..\system\drivers\st\common;..\..\..\system\drivers\st\bluenrg\bluenrg_ms;..\..\..\system\middlewares\st\bluenrg_ms\inc;..\..\..\system\middlewares\juma\st7789v;..\..\..\system\middlewares\juma\sdk;..\..\..\system\middlewares\juma\sensor;..\..\..\system\middlewares\juma\dispatcher;..\..\..\system\middlewares\juma\low_power</IncludePath>
</VariousControls>
</Cads>
<Aads>
Expand Down Expand Up @@ -922,17 +934,17 @@
</Files>
</Group>
<Group>
<GroupName>system/cmiss</GroupName>
<GroupName>system/cmsis</GroupName>
<Files>
<File>
<FileName>startup_stm32f429xx.s</FileName>
<FileType>2</FileType>
<FilePath>..\..\..\system\cmiss\device\st\src\startup_stm32f429xx.s</FilePath>
<FilePath>..\..\..\system\cmsis\device\st\src\startup_stm32f429xx.s</FilePath>
</File>
<File>
<FileName>system_stm32f4xx.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\system\cmiss\device\st\src\system_stm32f4xx.c</FilePath>
<FilePath>..\..\..\system\cmsis\device\st\src\system_stm32f4xx.c</FilePath>
</File>
</Files>
</Group>
Expand Down
24 changes: 12 additions & 12 deletions system/bsp/jumawatch/x_nucleo_iks01a1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,18 @@ typedef struct
#define MEMS_INT1_EXTI_IRQn EXTI15_10_IRQn

// ready for use
//#define MEMS_INT2_GPIO_PORT GPIOB
//#define MEMS_INT2_GPIO_CLK_ENABLE() __GPIOB_CLK_ENABLE()
//#define MEMS_INT2_GPIO_CLK_DISABLE() __GPIOB_CLK_DISABLE()
//#define MEMS_INT2_PIN GPIO_PIN_0

//#if ((defined (USE_STM32F4XX_NUCLEO)) || (defined (USE_STM32L1XX_NUCLEO)))
//#define MEMS_INT2_EXTI_IRQn EXTI0_IRQn
//#endif

//#if (defined (USE_STM32L0XX_NUCLEO))
//#define MEMS_INT2_EXTI_IRQn EXTI0_1_IRQn
//#endif
#define MEMS_INT2_GPIO_PORT GPIOB
#define MEMS_INT2_GPIO_CLK_ENABLE() __GPIOB_CLK_ENABLE()
#define MEMS_INT2_GPIO_CLK_DISABLE() __GPIOB_CLK_DISABLE()
#define MEMS_INT2_PIN GPIO_PIN_0

#if ((defined (USE_STM32F4XX_NUCLEO)) || (defined (USE_STM32L1XX_NUCLEO)))
#define MEMS_INT2_EXTI_IRQn EXTI0_IRQn
#endif

#if (defined (USE_STM32L0XX_NUCLEO))
#define MEMS_INT2_EXTI_IRQn EXTI0_1_IRQn
#endif

/*############################### SPI2 #######################################*/
#define LSM6DS3_SPIx SPI2
Expand Down

0 comments on commit 301c058

Please sign in to comment.