Fix the Error: L6218E: Undefined symbol jsensor_sys_init (referred fr…

…om bsp_common.o).
JUMA-IO · May 19, 2016 · 2a4d24d · 2a4d24d
1 parent 5958ae6
commit 2a4d24d
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 30 deletions.
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
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>

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
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -463,6 +463,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion_9-axis.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>
@@ -601,17 +606,17 @@
  </Files>
  </Group>
  <Group>
- <GroupName>system/cmiss</GroupName>
+ <GroupName>system/cmsis</GroupName>
  <Files>
- <File>
- <FileName>system_stm32f4xx.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\..\..\..\system\cmiss\device\st\src\system_stm32f4xx.c</FilePath>
- </File>
  <File>
  <FileName>startup_stm32f401xe.s</FileName>
  <FileType>2</FileType>
- <FilePath>..\..\..\..\system\cmiss\device\st\src\startup_stm32f401xe.s</FilePath>
+ <FilePath>..\..\..\..\system\cmsis\device\st\src\startup_stm32f401xe.s</FilePath>
+ </File>
+ <File>
+ <FileName>system_stm32f4xx.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\cmsis\device\st\src\system_stm32f4xx.c</FilePath>
  </File>
  </Files>
  </Group>

diff --git a/applications/juma/FatFs/mdk-arm/fatfs.uvprojx b/applications/juma/FatFs/mdk-arm/fatfs.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -468,6 +468,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\FatFs\src\drivers\sd_diskio.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx b/applications/juma/ble_led_blink/mdk-arm/blink.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -443,6 +443,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/echo/mdk-arm/echo.uvprojx b/applications/juma/echo/mdk-arm/echo.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -443,6 +443,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx b/applications/juma/gravity_filter/mdk-arm/gravity.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -448,6 +448,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git 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 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>

diff --git a/applications/juma/light_switch/mdk-arm/light.uvprojx b/applications/juma/light_switch/mdk-arm/light.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -443,6 +443,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/mesh/mdk-arm/mesh.uvprojx b/applications/juma/mesh/mdk-arm/mesh.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -453,6 +453,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\mesh\mesh.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/pwm/mdk-arm/pwm.uvprojx b/applications/juma/pwm/mdk-arm/pwm.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -448,6 +448,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\pwm\pwm.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx b/applications/juma/sensor_tag/mdk-arm/sensor_tag.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -428,6 +428,11 @@
  <Group>
  <GroupName>system/middlewares/juma</GroupName>
  <Files>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  <File>
  <FileName>bluenrg_sdk_api.c</FileName>
  <FileType>1</FileType>
@@ -453,11 +458,6 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\st\bluenrg_ms\src\clock.c</FilePath>
  </File>
- <File>
- <FileName>juma_sensor.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
- </File>
  <File>
  <FileName>bluenrg_gap_aci.c</FileName>
  <FileType>1</FileType>

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
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -453,6 +453,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

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
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -453,6 +453,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\sensor\sensor_fusion\imu_sensor_fusion.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/template/mdk-arm/template.uvprojx b/applications/juma/template/mdk-arm/template.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -443,6 +443,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\low_power\stm32f401_lp_mode.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git a/applications/juma/toolbox/mdk-arm/toolbox.uvprojx b/applications/juma/toolbox/mdk-arm/toolbox.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>

diff --git a/applications/juma/usb/mdk-arm/usb.uvprojx b/applications/juma/usb/mdk-arm/usb.uvprojx
@@ -14,7 +14,7 @@
  <TargetCommonOption>
  <Device>STM32F401RETx</Device>
  <Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
+ <PackID>Keil.STM32F4xx_DFP.2.7.0</PackID>
  <PackURL>http://www.keil.com/pack</PackURL>
  <Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x18000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
  <FlashUtilSpec></FlashUtilSpec>
@@ -458,6 +458,11 @@
  <FileType>1</FileType>
  <FilePath>..\..\..\..\system\middlewares\juma\usb\usbd_desc.c</FilePath>
  </File>
+ <File>
+ <FileName>juma_sensor.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\system\middlewares\juma\sensor\juma_sensor.c</FilePath>
+ </File>
  </Files>
  </Group>
  <Group>

diff --git 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 */