diff --git a/applications/juma/3-axis-sensor_fifo_int/mdk-arm/3axis.uvprojx b/applications/juma/3-axis-sensor_fifo_int/mdk-arm/3axis.uvprojx index 0a9777a..ef7f2a7 100644 --- a/applications/juma/3-axis-sensor_fifo_int/mdk-arm/3axis.uvprojx +++ b/applications/juma/3-axis-sensor_fifo_int/mdk-arm/3axis.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE diff --git a/applications/juma/9-axis-sensor_fifo_int/mdk-arm/9axis.uvprojx b/applications/juma/9-axis-sensor_fifo_int/mdk-arm/9axis.uvprojx index c57f463..73ed25e 100644 --- a/applications/juma/9-axis-sensor_fifo_int/mdk-arm/9axis.uvprojx +++ b/applications/juma/9-axis-sensor_fifo_int/mdk-arm/9axis.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -463,6 +463,11 @@ 1 ..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion_9-axis.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + @@ -601,17 +606,17 @@ - system/cmiss + system/cmsis - - system_stm32f4xx.c - 1 - ..\..\..\..\system\cmiss\device\st\src\system_stm32f4xx.c - startup_stm32f401xe.s 2 - ..\..\..\..\system\cmiss\device\st\src\startup_stm32f401xe.s + ..\..\..\..\system\cmsis\device\st\src\startup_stm32f401xe.s + + + system_stm32f4xx.c + 1 + ..\..\..\..\system\cmsis\device\st\src\system_stm32f4xx.c diff --git a/applications/juma/FatFs/mdk-arm/fatfs.uvprojx b/applications/juma/FatFs/mdk-arm/fatfs.uvprojx index f659b30..c788e18 100644 --- a/applications/juma/FatFs/mdk-arm/fatfs.uvprojx +++ b/applications/juma/FatFs/mdk-arm/fatfs.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -468,6 +468,11 @@ 1 ..\..\..\..\system\middlewares\juma\FatFs\src\drivers\sd_diskio.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx b/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx index 2109f62..b73a72d 100644 --- a/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx +++ b/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -443,6 +443,11 @@ 1 ..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/echo/mdk-arm/echo.uvprojx b/applications/juma/echo/mdk-arm/echo.uvprojx index 7affe10..647a582 100644 --- a/applications/juma/echo/mdk-arm/echo.uvprojx +++ b/applications/juma/echo/mdk-arm/echo.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -443,6 +443,11 @@ 1 ..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx b/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx index 9b9ae49..5e11501 100644 --- a/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx +++ b/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -448,6 +448,11 @@ 1 ..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/hum_temp_monitor/mdk-arm/hum_temp.uvprojx b/applications/juma/hum_temp_monitor/mdk-arm/hum_temp.uvprojx index 1dcc183..06f7c99 100644 --- a/applications/juma/hum_temp_monitor/mdk-arm/hum_temp.uvprojx +++ b/applications/juma/hum_temp_monitor/mdk-arm/hum_temp.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE diff --git a/applications/juma/light_switch/mdk-arm/light.uvprojx b/applications/juma/light_switch/mdk-arm/light.uvprojx index 6e10259..6a25f71 100644 --- a/applications/juma/light_switch/mdk-arm/light.uvprojx +++ b/applications/juma/light_switch/mdk-arm/light.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -443,6 +443,11 @@ 1 ..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/mesh/mdk-arm/mesh.uvprojx b/applications/juma/mesh/mdk-arm/mesh.uvprojx index 48ca234..eadcf8a 100644 --- a/applications/juma/mesh/mdk-arm/mesh.uvprojx +++ b/applications/juma/mesh/mdk-arm/mesh.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -453,6 +453,11 @@ 1 ..\..\..\..\system\middlewares\juma\mesh\mesh.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/pwm/mdk-arm/pwm.uvprojx b/applications/juma/pwm/mdk-arm/pwm.uvprojx index 32bff4b..a55945a 100644 --- a/applications/juma/pwm/mdk-arm/pwm.uvprojx +++ b/applications/juma/pwm/mdk-arm/pwm.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -448,6 +448,11 @@ 1 ..\..\..\..\system\middlewares\juma\pwm\pwm.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx b/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx index 729b71e..3e5a8ee 100644 --- a/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx +++ b/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -428,6 +428,11 @@ system/middlewares/juma + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + bluenrg_sdk_api.c 1 @@ -453,11 +458,6 @@ 1 ..\..\..\..\system\middlewares\st\bluenrg_ms\src\clock.c - - juma_sensor.c - 1 - ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c - bluenrg_gap_aci.c 1 diff --git a/applications/juma/sensor_tag_dma/mdk-arm/sensor_tag_dma.uvprojx b/applications/juma/sensor_tag_dma/mdk-arm/sensor_tag_dma.uvprojx index 83bc465..83db806 100644 --- a/applications/juma/sensor_tag_dma/mdk-arm/sensor_tag_dma.uvprojx +++ b/applications/juma/sensor_tag_dma/mdk-arm/sensor_tag_dma.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -453,6 +453,11 @@ 1 ..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/sensor_tag_fifo/mdk-arm/sensor_tag_fifo.uvprojx b/applications/juma/sensor_tag_fifo/mdk-arm/sensor_tag_fifo.uvprojx index 693642f..33b6676 100644 --- a/applications/juma/sensor_tag_fifo/mdk-arm/sensor_tag_fifo.uvprojx +++ b/applications/juma/sensor_tag_fifo/mdk-arm/sensor_tag_fifo.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -453,6 +453,11 @@ 1 ..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/template/mdk-arm/template.uvprojx b/applications/juma/template/mdk-arm/template.uvprojx index 0182c71..0b3ede7 100644 --- a/applications/juma/template/mdk-arm/template.uvprojx +++ b/applications/juma/template/mdk-arm/template.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -443,6 +443,11 @@ 1 ..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/applications/juma/toolbox/mdk-arm/toolbox.uvprojx b/applications/juma/toolbox/mdk-arm/toolbox.uvprojx index 677c961..67a7a4b 100644 --- a/applications/juma/toolbox/mdk-arm/toolbox.uvprojx +++ b/applications/juma/toolbox/mdk-arm/toolbox.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE diff --git a/applications/juma/usb/mdk-arm/usb.uvprojx b/applications/juma/usb/mdk-arm/usb.uvprojx index 57cc15d..f9d4dde 100644 --- a/applications/juma/usb/mdk-arm/usb.uvprojx +++ b/applications/juma/usb/mdk-arm/usb.uvprojx @@ -14,7 +14,7 @@ STM32F401RETx STMicroelectronics - Keil.STM32F4xx_DFP.2.5.0 + Keil.STM32F4xx_DFP.2.7.0 http://www.keil.com/pack IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -458,6 +458,11 @@ 1 ..\..\..\..\system\middlewares\juma\usb\usbd_desc.c + + juma_sensor.c + 1 + ..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c + diff --git a/system/bsp/cannon_v2/bsp_common.c b/system/bsp/cannon_v2/bsp_common.c index e983979..9f94257 100644 --- a/system/bsp/cannon_v2/bsp_common.c +++ b/system/bsp/cannon_v2/bsp_common.c @@ -80,9 +80,7 @@ void bsp_init(void) UART_Init(); HAL_Delay(1000); /*sensor layer init*/ - #ifdef SENSOR_FIFO jsensor_sys_init(); - #endif /* Initialize the BlueNRG SPI driver */ BNRG_SPI_Init(); /* Initialize the BlueNRG HCI */