diff --git a/lab-dbg/RTE/_Target_1/RTE_Components.h b/lab-dbg/RTE/_Target_1/RTE_Components.h index 77b7403..a5ab5d5 100644 --- a/lab-dbg/RTE/_Target_1/RTE_Components.h +++ b/lab-dbg/RTE/_Target_1/RTE_Components.h @@ -16,29 +16,29 @@ */ #define CMSIS_device_header "stm32f7xx.h" -/* ARM::CMSIS:RTOS2:Keil RTX5:Source:5.5.3 */ +/* ARM::CMSIS:RTOS2:Keil RTX5:Source:5.5.4 */ #define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */ #define RTE_CMSIS_RTOS2_RTX5 /* CMSIS-RTOS2 Keil RTX5 */ #define RTE_CMSIS_RTOS2_RTX5_SOURCE /* CMSIS-RTOS2 Keil RTX5 Source */ -/* Keil.ARM Compiler::Compiler:Event Recorder:DAP:1.4.0 */ +/* Keil.ARM Compiler::Compiler:Event Recorder:DAP:1.5.1 */ #define RTE_Compiler_EventRecorder #define RTE_Compiler_EventRecorder_DAP /* Keil.ARM Compiler::Compiler:I/O:STDOUT:EVR:1.2.0 */ #define RTE_Compiler_IO_STDOUT /* Compiler I/O: STDOUT */ #define RTE_Compiler_IO_STDOUT_EVR /* Compiler I/O: STDOUT EVR */ -/* Keil::Device:STM32Cube Framework:Classic:1.2.6 */ +/* Keil::Device:STM32Cube Framework:Classic:1.2.7 */ #define RTE_DEVICE_FRAMEWORK_CLASSIC -/* Keil::Device:STM32Cube HAL:Common:1.2.6 */ +/* Keil::Device:STM32Cube HAL:Common:1.2.7 */ #define RTE_DEVICE_HAL_COMMON -/* Keil::Device:STM32Cube HAL:Cortex:1.2.6 */ +/* Keil::Device:STM32Cube HAL:Cortex:1.2.7 */ #define RTE_DEVICE_HAL_CORTEX -/* Keil::Device:STM32Cube HAL:GPIO:1.2.6 */ +/* Keil::Device:STM32Cube HAL:GPIO:1.2.7 */ #define RTE_DEVICE_HAL_GPIO -/* Keil::Device:STM32Cube HAL:PWR:1.2.6 */ +/* Keil::Device:STM32Cube HAL:PWR:1.2.7 */ #define RTE_DEVICE_HAL_PWR -/* Keil::Device:STM32Cube HAL:RCC:1.2.6 */ +/* Keil::Device:STM32Cube HAL:RCC:1.2.7 */ #define RTE_DEVICE_HAL_RCC -/* Keil::Device:Startup:1.2.2 */ +/* Keil::Device:Startup:1.2.4 */ #define RTE_DEVICE_STARTUP_STM32F7XX /* Device Startup for STM32F7 */ diff --git a/lab-dbg/component.scvd b/lab-dbg/component.scvd index 57f96be..7b7ad59 100644 --- a/lab-dbg/component.scvd +++ b/lab-dbg/component.scvd @@ -3,12 +3,10 @@ - - - + + - - - + + diff --git a/lab-dbg/lab1.uvprojx b/lab-dbg/lab1.uvprojx index a0711fe..cf64847 100644 --- a/lab-dbg/lab1.uvprojx +++ b/lab-dbg/lab1.uvprojx @@ -10,14 +10,14 @@ Target 1 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 STM32F746NGHx STMicroelectronics - Keil.STM32F7xx_DFP.2.11.0 - http://www.keil.com/pack + Keil.STM32F7xx_DFP.2.12.0 + http://www.keil.com/pack/ IRAM(0x20010000,0x40000) IRAM2(0x20000000,0x10000) IROM(0x08000000,0x100000) IROM2(0x00200000,0x100000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ELITTLE @@ -419,68 +419,68 @@ - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -489,56 +489,56 @@ RTE\CMSIS\RTX_Config.c - - + + RTE\CMSIS\RTX_Config.h - - + + RTE\Compiler\EventRecorderConf.h - - + + RTE\Device\STM32F746NGHx\RTE_Device.h - - + + RTE\Device\STM32F746NGHx\startup_stm32f746xx.s - - + + RTE\Device\STM32F746NGHx\stm32f7xx_hal_conf.h - - + + RTE\Device\STM32F746NGHx\system_stm32f7xx.c - - + + diff --git a/lab-dbg/main.c b/lab-dbg/main.c index 8739aef..21b57cb 100644 --- a/lab-dbg/main.c +++ b/lab-dbg/main.c @@ -20,19 +20,23 @@ void Thread_4 (void *argument); const osThreadAttr_t thread1_attr = { .stack_size = 1024, - .priority = osPriorityNormal, + .priority = osPriorityNormal, // 24 + .name = "FACT" }; const osThreadAttr_t thread2_attr = { .stack_size = 1024, - .priority = osPriorityBelowNormal4, + .priority = osPriorityBelowNormal4, // 20 + .name = "RESUMER" }; const osThreadAttr_t thread3_attr = { - .stack_size = 4096, - .priority = osPriorityBelowNormal, + .stack_size = 1024, + .priority = osPriorityBelowNormal, // 16 + .name = "BLOCKER" }; const osThreadAttr_t thread4_attr = { .stack_size = 256, - .priority = osPriorityLow, + .priority = osPriorityLow, // 8 + .name = "FLAG" }; //------------------------------------------------------------------------------ @@ -77,57 +81,62 @@ double Fact(double number) } /*---------------------------------------------------------------------------- - * Thread 1 + * Thread 1 - FACT. *---------------------------------------------------------------------------*/ void Thread_1 (void *argument) { uint32_t x = 1; double result; for (;;) { - result = Fact(x); - printf("Fact of %d is %f\r\n",x,result); + result = 1; + for(int i = 1; i<=x;i++) { + result *= i; + } + //result = Fact(x); + printf("Fact of %d is %a\r\n",x, result); x++; + //if(x > 100) x = 1; osDelay(200); } } /*---------------------------------------------------------------------------- - * Thread 2 + * Thread 2 - RESUMER *---------------------------------------------------------------------------*/ void Thread_2 (void *argument) { osThreadState_t state; for (;;) { osDelay(20); - state = osThreadGetState(Thread_4); + state = osThreadGetState(thread4); if(state == osThreadBlocked) { - osThreadResume(Thread_4); + osThreadResume(thread4); } } } /*---------------------------------------------------------------------------- - * Thread 3 + * Thread 3 - BLOCKER *---------------------------------------------------------------------------*/ void Thread_3 (void *argument) { osThreadState_t state; for (;;) { osDelay(50); - state = osThreadGetState(Thread_4); + state = osThreadGetState(thread4); if(state != osThreadBlocked) { - osThreadSuspend(Thread_4); + osThreadSuspend(thread4); } } } /*---------------------------------------------------------------------------- - * Thread 4 + * Thread 4 - FLAG *---------------------------------------------------------------------------*/ void Thread_4 (void *argument) { - char * str = "Flag is:0"; + char str[10] = "Flag is:0"; uint8_t flag = '0'; for (;;) { @@ -141,6 +150,7 @@ void Thread_4 (void *argument) { } str[8]= flag; puts(str); + EventRecordData(0x0000, str, 10); osDelay(100); } } diff --git a/trace/GPUCache/data_0 b/trace/GPUCache/data_0 new file mode 100644 index 0000000..f0e4d58 Binary files /dev/null and b/trace/GPUCache/data_0 differ diff --git a/trace/GPUCache/data_1 b/trace/GPUCache/data_1 new file mode 100644 index 0000000..86e4094 Binary files /dev/null and b/trace/GPUCache/data_1 differ diff --git a/trace/GPUCache/data_2 b/trace/GPUCache/data_2 new file mode 100644 index 0000000..c7e2eb9 Binary files /dev/null and b/trace/GPUCache/data_2 differ diff --git a/trace/GPUCache/data_3 b/trace/GPUCache/data_3 new file mode 100644 index 0000000..907a5b7 Binary files /dev/null and b/trace/GPUCache/data_3 differ diff --git a/trace/GPUCache/index b/trace/GPUCache/index new file mode 100644 index 0000000..f456740 Binary files /dev/null and b/trace/GPUCache/index differ diff --git a/trace/tzCef.log b/trace/tzCef.log new file mode 100644 index 0000000..30f32da --- /dev/null +++ b/trace/tzCef.log @@ -0,0 +1,4 @@ +[0304/130105.760:INFO:CONSOLE(158)] "Uncaught ReferenceError: hljs is not defined", source: file:///C:/Users/remi.heredero/AppData/Local/Temp/09dede49-b3cc-4dbf-8072-a4700dd8a020/viewDescription.html (158) +[0304/130105.906:INFO:CONSOLE(158)] "Uncaught ReferenceError: hljs is not defined", source: file:///C:/Users/remi.heredero/AppData/Local/Temp/09dede49-b3cc-4dbf-8072-a4700dd8a020/viewDescription.html (158) +[0304/130136.109:INFO:CONSOLE(158)] "Uncaught ReferenceError: hljs is not defined", source: file:///C:/Users/remi.heredero/AppData/Local/Temp/09dede49-b3cc-4dbf-8072-a4700dd8a020/viewDescription.html (158) +[0304/130138.233:INFO:CONSOLE(158)] "Uncaught ReferenceError: hljs is not defined", source: file:///C:/Users/remi.heredero/AppData/Local/Temp/09dede49-b3cc-4dbf-8072-a4700dd8a020/viewDescription.html (158)