Commit cf7cb828 authored by laurentc's avatar laurentc

$FW : correction d'un bug passé inaperçu. Sans effet par chance.

parent 87732c05
......@@ -254,7 +254,7 @@
<Group>
<GroupName>Application/User</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
......
......@@ -16,7 +16,7 @@
<TargetCommonOption>
<Device>STM32F446RETx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.10.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.6.0</PackID>
<PackURL>http://www.keil.com/pack</PackURL>
<Cpu>IRAM(0x20000000-0x2001FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) CPUTYPE("Cortex-M4") FPU2</Cpu>
<FlashUtilSpec></FlashUtilSpec>
......@@ -312,7 +312,7 @@
<Cads>
<interw>1</interw>
<Optim>4</Optim>
<oTime>0</oTime>
<oTime>1</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
<Strict>0</Strict>
......
......@@ -11,4 +11,10 @@
#define RTE_COMPONENTS_H
/*
* Define the Device Header File:
*/
#define CMSIS_device_header "stm32f4xx.h"
#endif /* RTE_COMPONENTS_H */
No preview for this file type
......@@ -5,11 +5,11 @@
<h2>Tool Versions:</h2>
IDE-Version: Vision V5.24.2.0
Copyright (C) 2017 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: laurent chabin, Hewlett-Packard, LIC=----
License Information: MDK Lite=----
Tool Versions:
Toolchain: MDK-Lite Version: 5.24.1
Toolchain Path: C:\Keil_v5\ARM\ARMCC\Bin
Toolchain Path: E:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 5 (build 528)
Assembler: Armasm.exe V5.06 update 5 (build 528)
Linker/Locator: ArmLink.exe V5.06 update 5 (build 528)
......@@ -19,18 +19,46 @@ CPU DLL: SARMCM3.DLL V5.24.1
Dialog DLL: DCM.DLL V1.16.0.0
Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.1.0
Dialog DLL: TCM.DLL V1.32.0.0
<h2>Project:</h2>
D:\projets\projets2016\electrolab\ledtube\code\STM32F4\MDK-ARM\LedTube.uvprojx
Project File Date: 02/28/2019
F:\projets\projets2016\electrolab\ledtube\processing\STM32F446RE\code\Ledtube_446\MDK-ARM\LedTube.uvprojx
Project File Date: 03/15/2020
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 5 (build 528)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'LedTube'
compiling serial.c...
*** Using Compiler 'V5.06 update 5 (build 528)', folder: 'E:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'LedTube'
compiling stm32f4xx_hal_msp.c...
compiling stm32f4xx_it.c...
compiling image_filter.c...
compiling globals.c...
compiling led_driver.c...
compiling image_generator.c...
compiling main.c...
compiling debugTools.c...
compiling wifi.c...
compiling remote.c...
compiling flash.c...
compiling system_stm32f4xx.c...
compiling serial.c...
compiling LedStripXmas.c...
compiling stm32f4xx_hal_dma.c...
compiling stm32f4xx_hal_pwr_ex.c...
compiling stm32f4xx_hal_pwr.c...
compiling stm32f4xx_hal_flash_ramfunc.c...
compiling stm32f4xx_hal.c...
compiling stm32f4xx_hal_tim_ex.c...
compiling stm32f4xx_hal_tim.c...
compiling stm32f4xx_hal_flash.c...
compiling stm32f4xx_hal_uart.c...
compiling stm32f4xx_hal_gpio.c...
compiling stm32f4xx_hal_rcc.c...
assembling startup_stm32f446xx.s...
compiling stm32f4xx_hal_flash_ex.c...
compiling stm32f4xx_hal_cortex.c...
compiling stm32f4xx_hal_rcc_ex.c...
compiling stm32f4xx_hal_dma_ex.c...
linking...
Program Size: Code=28760 RO-data=1776 RW-data=992 ZI-data=71208
Program Size: Code=28760 RO-data=1776 RW-data=992 ZI-data=71208
FromELF: creating hex file...
".\obj\LedTube.axf" - 0 Error(s), 0 Warning(s).
......@@ -43,19 +71,19 @@ Package Vendor: ARM
* Component: CORE Version: 5.1.2
Package Vendor: Keil
http://www.keil.com/pack/Keil.STM32F4xx_DFP.2.10.0.pack
Keil.STM32F4xx_DFP.2.10.0
http://www.keil.com/pack/Keil.STM32F4xx_DFP.2.6.0.pack
Keil.STM32F4xx_DFP.2.6.0
STMicroelectronics STM32F4 Series Device Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_LedTube
C:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include
C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.10.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
E:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include
E:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.6.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.1.2
Build Time Elapsed: 00:00:03
Build Time Elapsed: 00:00:07
</pre>
</body>
</html>
......@@ -1812,19 +1812,19 @@
:10712000920A0640920A8640DB0F49418022681C81
:107130006255411C2254625408F10108B8F13C0F19
:10714000FFF463AE0BF1010BBBF1140FFFF44AAE79
:1071500008B00120BDEC0E8B05B0BDE8F08F42F603
:1071600030235243120A521C91F800C00CFB02FC5F
:1071500008B00120BDEC0E8B05B0BDE8F08F4FF4F8
:1071600061635243120A521C91F800C00CFB02FCEE
:107170004FEA1C2C80F800C0401C491C5B1E002BF1
:10718000F2D170472DE9F0010B4600245243120A58
:107190000025561C4FF0000C00221F7893F8018048
:1071A000474493F80280C444BC441FFA8CFCDB1CA7
:1071B000521C3C2AF1DB0CFB06F2C2F30F22A24266
:1071C00000D914466D1C142DE4DBB4F5B44F1ED960
:1071D00000EE104ADFED100AB8EE400A80EE801A89
:1071E000BCEEC10A10EE102A93B24FF4616291F81E
:1071F00000C00CFB03FC4FEA1C2C80F800C0491CAB
:10720000401C521EF3D1BDE8F00101207047BDE8DB
:10721000F0010020704700000000B44A0A01160681
:1071C00000D914466D1C142DE4DB44F65852944249
:1071D0001ED900EE104ADFED100AB8EE400A80EE2C
:1071E000801ABCEEC10A10EE102A93B24FF461620D
:1071F00091F800C00CFB03FC4FEA1C2C80F800C087
:10720000491C401C521EF3D1BDE8F001012070471B
:10721000BDE8F0010020704700B09A4A0A01160646
:107220001702180B19031A0515041B0C1C011D0D60
:107230001E0B1F0E2010210F2211231224132514C0
:10724000262728292A2B2C2D2E2F30313233343566
......
......@@ -3,7 +3,7 @@
<title>Static Call Graph - [.\obj\LedTube.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image .\obj\LedTube.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060528: Last Updated: Thu Feb 28 20:20:06 2019
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060528: Last Updated: Sun Mar 15 18:12:51 2020
<BR><P>
<H3>Maximum Stack Usage = 4256 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
......@@ -2416,7 +2416,7 @@ Global Symbols
<BR><BR>[Called By]<UL><LI><a href="#[60]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
</UL>
<P><STRONG><a name="[14e]"></a>powerLimiter</STRONG> (Thumb, 146 bytes, Stack size 20 bytes, image_generator.o(itcmram))
<P><STRONG><a name="[14e]"></a>powerLimiter</STRONG> (Thumb, 148 bytes, Stack size 20 bytes, image_generator.o(itcmram))
<BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = powerLimiter
</UL>
<BR>[Called By]<UL><LI><a href="#[60]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
......
......@@ -2025,7 +2025,7 @@ Image Symbol Table
myfcos 0x08006d9b Thumb Code 10 image_generator.o(itcmram)
generatePlasma 0x08006da5 Thumb Code 954 image_generator.o(itcmram)
setIntensity 0x0800715f Thumb Code 38 image_generator.o(itcmram)
powerLimiter 0x08007185 Thumb Code 146 image_generator.o(itcmram)
powerLimiter 0x08007185 Thumb Code 148 image_generator.o(itcmram)
modTable 0x0800721c Data 52 main.o(.constdata)
logo_electrolab 0x08007250 Data 200 image_generator.o(.constdata)
APBAHBPrescTable 0x08007320 Data 16 stm32f4xx_hal_rcc.o(.constdata)
......@@ -2470,37 +2470,37 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug Object Name
176 16 0 0 0 1741 debugtools.o
822 36 0 16 0 11081 flash.o
678 74 0 16 0 6715 globals.o
556 36 0 0 0 3798 image_filter.o
2354 156 200 380 2400 13290 image_generator.o
690 72 0 133 0 5186 led_driver.o
3874 106 0 24 0 13196 ledstripxmas.o
2432 264 52 280 51028 38790 main.o
564 94 0 2 0 6467 remote.o
1258 120 133 48 9300 10131 serial.o
36 8 452 0 8192 940 startup_stm32f446xx.o
136 16 0 4 0 4274 stm32f4xx_hal.o
266 16 0 0 0 32235 stm32f4xx_hal_cortex.o
1334 30 8 0 0 7813 stm32f4xx_hal_dma.o
576 70 0 0 32 6262 stm32f4xx_hal_flash.o
388 24 0 0 0 3482 stm32f4xx_hal_flash_ex.o
584 28 0 0 0 4647 stm32f4xx_hal_gpio.o
766 70 0 0 0 3110 stm32f4xx_hal_msp.o
72 14 0 0 0 1279 stm32f4xx_hal_pwr.o
160 10 0 0 0 1340 stm32f4xx_hal_pwr_ex.o
780 42 16 0 0 4485 stm32f4xx_hal_rcc.o
1352 56 0 0 0 3574 stm32f4xx_hal_rcc_ex.o
1632 22 0 0 0 15854 stm32f4xx_hal_tim.o
198 0 0 0 0 3350 stm32f4xx_hal_tim_ex.o
2136 26 0 0 0 14079 stm32f4xx_hal_uart.o
314 92 0 0 0 388143 stm32f4xx_it.o
88 24 0 4 0 1393 system_stm32f4xx.o
1132 208 792 72 256 8797 wifi.o
176 16 0 0 0 1825 debugtools.o
822 36 0 16 0 11517 flash.o
678 74 0 16 0 7043 globals.o
556 36 0 0 0 3930 image_filter.o
2354 154 200 380 2400 13678 image_generator.o
690 72 0 133 0 5402 led_driver.o
3874 106 0 24 0 13612 ledstripxmas.o
2432 264 52 280 51028 39282 main.o
564 94 0 2 0 6795 remote.o
1258 120 133 48 9300 10483 serial.o
36 8 452 0 8192 968 startup_stm32f446xx.o
136 16 0 4 0 4466 stm32f4xx_hal.o
266 16 0 0 0 32479 stm32f4xx_hal_cortex.o
1334 30 8 0 0 8061 stm32f4xx_hal_dma.o
576 70 0 0 32 6530 stm32f4xx_hal_flash.o
388 24 0 0 0 3622 stm32f4xx_hal_flash_ex.o
584 28 0 0 0 4811 stm32f4xx_hal_gpio.o
766 70 0 0 0 3218 stm32f4xx_hal_msp.o
72 14 0 0 0 1327 stm32f4xx_hal_pwr.o
160 10 0 0 0 1392 stm32f4xx_hal_pwr_ex.o
780 42 16 0 0 4649 stm32f4xx_hal_rcc.o
1352 56 0 0 0 3654 stm32f4xx_hal_rcc_ex.o
1632 22 0 0 0 16450 stm32f4xx_hal_tim.o
198 0 0 0 0 3486 stm32f4xx_hal_tim_ex.o
2136 26 0 0 0 14567 stm32f4xx_hal_uart.o
314 92 0 0 0 388995 stm32f4xx_it.o
88 24 0 4 0 1477 system_stm32f4xx.o
1132 208 792 72 256 9205 wifi.o
----------------------------------------------------------------------
25394 1730 1688 984 71208 615452 Object Totals
25394 1728 1688 984 71208 622924 Object Totals
0 0 32 0 0 0 (incl. Generated)
40 0 3 5 0 0 (incl. Padding)
......@@ -2571,9 +2571,9 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug
28760 1920 1776 992 71208 595152 Grand Totals
28760 1920 1776 520 71208 595152 ELF Image Totals (compressed)
28760 1920 1776 520 0 0 ROM Totals
28760 1918 1776 992 71208 602624 Grand Totals
28760 1918 1776 520 71208 602624 ELF Image Totals (compressed)
28760 1918 1776 520 0 0 ROM Totals
==============================================================================
......
......@@ -898,12 +898,12 @@ ARM Macro Assembler Page 14
00000000
Command Line: --16 --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apc
s=interwork --depend=.\obj\startup_stm32f446xx.d -o.\obj\startup_stm32f446xx.o
-I.\RTE\_LedTube -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include -IC:\
Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.10.0\Drivers\CMSIS\Device\ST\STM32F4xx\In
clude --predefine="__EVAL SETA 1" --predefine="__MICROLIB SETA 1" --predefine="
__UVISION_VERSION SETA 524" --predefine="_RTE_ SETA 1" --predefine="STM32F446xx
SETA 1" --list=.\outlistings\startup_stm32f446xx.lst ../Drivers/CMSIS/Device/S
T/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s
-I.\RTE\_LedTube -IE:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include -IE:\
Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.6.0\Drivers\CMSIS\Device\ST\STM32F4xx\Inc
lude --predefine="__EVAL SETA 1" --predefine="__MICROLIB SETA 1" --predefine="_
_UVISION_VERSION SETA 524" --predefine="_RTE_ SETA 1" --predefine="STM32F446xx
SETA 1" --list=.\outlistings\startup_stm32f446xx.lst ../Drivers/CMSIS/Device/ST
/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s
......
......@@ -551,7 +551,7 @@ uint8_t generateGameOfLife(uint8_t *raw, float time, uint8_t intensity)
__attribute__((section("itcmram")))
void setIntensity(uint8_t *raw_out, uint8_t *raw_in, uint8_t intensity)
{
int i = RAW_SIZE*3;
int i = RAW_SIZE;
intensity = (intensity*intensity)>>8;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment