search

ciaa / firmware_v1

Firmware de la CIAA
http://www.proyecto-ciaa.com.ar
129 stars 120 forks source link

fix_rtcs_templates #435

Closed diegoVom closed 8 years ago

diegoVom commented 8 years ago

There are non supported symbols in rtcs templates since the new oil generator was pushed.

mabeett commented 8 years ago

Here I confirm de bug in the curret master (6ffe13f).

developer@ciaa:/tmp/Firmware$ make -s 

===============================================================================
Compiling c file: ./out/gen/src/Rtcs_Internal_Cfg.c

./out/gen/src/Rtcs_Internal_Cfg.c:67:1: error: expected identifier or '(' before '<' token
 <?    ?>float r_data_1[2];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:68:1: error: expected identifier or '(' before '<' token
 <?    ?>float x_data_1[2];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:69:1: error: expected identifier or '(' before '<' token
 <?    ?>float xo_data_1[2];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:70:1: error: expected identifier or '(' before '<' token
 <?    ?>float e_data_1[2];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:71:1: error: expected identifier or '(' before '<' token
 <?    ?>float u_y_data_1[1 + 1];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:72:1: error: expected identifier or '(' before '<' token
 <?    ?>float k_data_1[2] = {0.4578, 580.0};
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:73:1: error: expected identifier or '(' before '<' token
 <?    ?>float mf_data_1[] = {-0.09, 58.6632, -0.0014, 0.4443};
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:74:1: error: expected identifier or '(' before '<' token
 <?    ?>float mt_data_1[] = {0.0553, 1.0346, 0.0007, 0.0006};
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:75:1: error: expected identifier or '(' before '<' token
 <?    ?>Rtcs_ext_matrix_t matrix_array_1[10];
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:76:1: error: expected identifier or '(' before '<' token
 <?    ?>Rtcs_statefeedback_data_t controller_1 = {CONTROL_SYSTEM, FULL, 1, 2, 2, 2, 1, 1, r_data_1, x_data_1, xo_data_1, e_data_1, u_y_data_1, &(u_y_data_1[1]),k_data_1, u_y_data_1, 0, 0, 0, mf_data_1, mt_data_1, 0, &matrix_array_1[0], &matrix_array_1[1], &matrix_array_1[2], &matrix_array_1[3], &matrix_array_1[4], &matrix_array_1[5], &matrix_array_1[6], &matrix_array_1[7], 0, 0, 0, &matrix_array_1[8], &matrix_array_1[9], 0, SendControlEffort, Rtcs_ControlSystemEffort, Rtcs_FullObserver};
 ^
./out/gen/src/Rtcs_Internal_Cfg.c:79:83: error: 'controller_1' undeclared here (not in a function)
 Rtcs_generic_controller_t Rtcs_controllers_data_1 = {Rtcs_StateFeedbackFirstRun, &controller_1};
                                                                                   ^
make: *** [Rtcs_Internal_Cfg.o] Error 1
developer@ciaa:/tmp/Firmware$ make info 
+-----------------------------------------------------------------------------+
|               Enable Config Info                                            |
+-----------------------------------------------------------------------------+
Project Path.......: examples/rtcs_example
Project Name.......: rtcs_example
BOARD/ARCH/CPUTYPE/CPU...: ciaa_nxp/cortexM4/lpc43xx/lpc4337
enable modules.....: modules/posix modules/ciaak modules/drivers modules/rtcs modules/rtos modules/libs modules/base
libraries..........: posix ciaak drivers ext_drivers rtcs rtos libs base ext_base
libraris with srcs.: posix ciaak drivers ext_drivers rtcs rtos libs ext_base
RTOS config........: examples/rtcs_example/etc/rtcs_example.oilx examples/rtcs_example/etc/rtcs_example.oil
Includes...........: ./modules/posix/inc ./modules/ciaak/inc ./modules/drivers/inc ./modules/drivers/cortexM4/inc ./modules/drivers/cortexM4/lpc43xx/inc ./modules/drivers/cortexM4/lpc43xx/lpc4337/inc ./externals/drivers/inc ./externals/drivers/cortexM4/inc ./externals/drivers/cortexM4/lpc43xx/inc ./externals/drivers/cortexM4/lpc43xx/inc/device ./externals/drivers/cortexM4/lpc43xx/lpc4337/inc ./modules/rtcs/inc ./modules/rtos/inc ./modules/rtos/inc/cortexM4 ./modules/rtos/inc/cortexM4/lpc43xx ./out/gen/inc ./out/gen/inc/cortexM4 ./out/gen/inc/cortexM4/lpc43xx ./modules/libs/inc ./modules/libs/inc/cortexM4 ./modules/libs/inc/cortexM4/lpc43xx ./modules/base/inc ./modules/base/cortexM4/inc ./modules/base/cortexM4/lpc43xx/inc ./modules/base/cortexM4/lpc43xx/lpc4337/inc ./externals/base/inc ./externals/base/cortexM4/inc ./externals/base/cortexM4/lpc43xx/inc ./externals/base/cortexM4/lpc43xx/lpc4337/inc
use make info_<mod>: to get information of a specific module. eg: make info_posix
+-----------------------------------------------------------------------------+
|               CIAA Firmware Info                                            |
+-----------------------------------------------------------------------------+
CIAA Firmware ver..: master-0.0.0
Available modules..: base ciaak drivers libs modbus multicore plc posix rtcs rtos systests template tools update
+-----------------------------------------------------------------------------+
|               Compiler Info                                                 |
+-----------------------------------------------------------------------------+
Compiler...........: gcc
CC.................: arm-none-eabi-gcc
AR.................: arm-none-eabi-ar
LD.................: arm-none-eabi-gcc
Compile C Flags....: -c -Wall -ggdb3 -fdata-sections -ffunction-sections -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mthumb -DCORE_M4 -Iexamples/rtcs_example/inc -I./modules/posix/inc -I./modules/ciaak/inc -I./modules/drivers/inc -I./modules/drivers/cortexM4/inc -I./modules/drivers/cortexM4/lpc43xx/inc -I./modules/drivers/cortexM4/lpc43xx/lpc4337/inc -I./externals/drivers/inc -I./externals/drivers/cortexM4/inc -I./externals/drivers/cortexM4/lpc43xx/inc -I./externals/drivers/cortexM4/lpc43xx/inc/device -I./externals/drivers/cortexM4/lpc43xx/lpc4337/inc -I./modules/rtcs/inc -I./modules/rtos/inc -I./modules/rtos/inc/cortexM4 -I./modules/rtos/inc/cortexM4/lpc43xx -I./out/gen/inc -I./out/gen/inc/cortexM4 -I./out/gen/inc/cortexM4/lpc43xx -I./modules/libs/inc -I./modules/libs/inc/cortexM4 -I./modules/libs/inc/cortexM4/lpc43xx -I./modules/base/inc -I./modules/base/cortexM4/inc -I./modules/base/cortexM4/lpc43xx/inc -I./modules/base/cortexM4/lpc43xx/lpc4337/inc -I./externals/base/inc -I./externals/base/cortexM4/inc -I./externals/base/cortexM4/lpc43xx/inc -I./externals/base/cortexM4/lpc43xx/lpc4337/inc -DARCH=cortexM4 -DCPUTYPE=lpc43xx -DCPU=lpc4337 -DBOARD=ciaa_nxp
Compile ASM Flags..: -ggdb3 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mthumb
Target Name........: ./out/bin/rtcs_example
Src Files..........: examples/rtcs_example/src/rtcs_example.c ./externals/base/cortexM4/lpc43xx/src/crp.c
Obj Files..........: rtcs_example.o crp.o
Linker Flags.......: -fno-builtin -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -mthumb -Wl,-Map=./out/bin/rtcs_example.map,-gc-sections -nostdlib -T externals/base/cortexM4/lpc43xx/linker/ciaa_lpc4337.ld
Linker Extension...: axf
Linker Target......: ./out/bin/rtcs_example.axf
developer@ciaa:/tmp/Firmware$

Edit: usual BOARD var.