diff --git a/306-controller_interface.X/app/can_message.c b/306-controller_interface.X/app/can_message.c index f815446..2e53ae4 100644 --- a/306-controller_interface.X/app/can_message.c +++ b/306-controller_interface.X/app/can_message.c @@ -54,6 +54,7 @@ void CM_processIncome(uint8_t idSender, uint8_t idMsg, uint32_t data){ MEM_write_1_byte(MEMADD_CONTROL_STEERING_MODE, KART_CST.CONTROL_STEERING_MODE); MEM_write_1_byte(MEMADD_CONTROL_ALIVE_TIME, KART_CST.CONTROL_ALIVE_TIME); ALIVE_setAliveTime(ALcontroller(), KART_CST.CONTROL_ALIVE_TIME); + ALIVE_emitStart(ALcontroller(), 0, 0); } if(idMsg == 0x1) { // CONTROL_SPEED_FACTOR @@ -109,6 +110,7 @@ void CM_processIncome(uint8_t idSender, uint8_t idMsg, uint32_t data){ MEM_write_1_byte(MEMADD_JOYSTICK_ALIVE_TIME, KART_CST.JOYSTICK_ALIVE_TIME); ALIVE_setAliveTime(ALjoy(), KART_CST.JOYSTICK_ALIVE_TIME); + ALIVE_emitStart(ALjoy(), 0, 0); CM_JOY_SETUP(NULL); } @@ -121,7 +123,8 @@ void CM_processIncome(uint8_t idSender, uint8_t idMsg, uint32_t data){ MEM_write_1_byte(MEMADD_DRIVE_ALIVE_TIME, KART_CST.DRIVE_ALIVE_TIME); MEM_write_1_byte(MEMADD_DRIVE_SPEED_TIME, KART_CST.DRIVE_SPEED_TIME); MEM_write_1_byte(MEMADD_DRIVE_STOP_TIME, KART_CST.DRIVE_STOP_TIME); - // TODO set alive time + ALIVE_setAliveTime(drive()->myChecker, KART_CST.DRIVE_ALIVE_TIME); + CM_DRIVE_SETUP(NULL); // TODO send params } @@ -204,7 +207,6 @@ void CM_processIncome(uint8_t idSender, uint8_t idMsg, uint32_t data){ ALIVE_emitResurrect(&drive()->myChecker, 0, 0); ALIVE_emitBorn(&drive()->myChecker, 0, 0); } - // TODO drive say ALIVE } break; diff --git a/306-controller_interface.X/defmplabxtrace.log b/306-controller_interface.X/defmplabxtrace.log new file mode 100644 index 0000000..e69de29 diff --git a/306-controller_interface.X/defmplabxtrace.log.inx b/306-controller_interface.X/defmplabxtrace.log.inx new file mode 100644 index 0000000..29197e3 Binary files /dev/null and b/306-controller_interface.X/defmplabxtrace.log.inx differ diff --git a/306-controller_interface.X/nbproject/Makefile-default.mk b/306-controller_interface.X/nbproject/Makefile-default.mk index 59030e4..17547ef 100644 --- a/306-controller_interface.X/nbproject/Makefile-default.mk +++ b/306-controller_interface.X/nbproject/Makefile-default.mk @@ -44,12 +44,6 @@ else COMPARISON_BUILD= endif -ifdef SUB_IMAGE_ADDRESS - -else -SUB_IMAGE_ADDRESS_COMMAND= -endif - # Object Directory OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} @@ -444,7 +438,7 @@ endif # Enable dependency checking .dep.inc: .depcheck-impl -DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES}) +DEPFILES=$(wildcard ${POSSIBLE_DEPFILES}) ifneq (${DEPFILES},) include ${DEPFILES} endif diff --git a/306-controller_interface.X/nbproject/Makefile-local-default.mk b/306-controller_interface.X/nbproject/Makefile-local-default.mk index c86914d..14e862a 100644 --- a/306-controller_interface.X/nbproject/Makefile-local-default.mk +++ b/306-controller_interface.X/nbproject/Makefile-local-default.mk @@ -15,11 +15,11 @@ # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... # SHELL=cmd.exe -PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v6.00/mplab_platform/platform/../mplab_ide/modules/../../bin/ +PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/ # Adding MPLAB X bin directory to path. -PATH:=C:/Program Files/Microchip/MPLABX/v6.00/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH) +PATH:=C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH) # Path to java used to run MPLAB X when this makefile was created -MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v6.00\sys\java\zulu8.54.0.21-ca-fx-jre8.0.292-win_x64/bin/" +MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v6.15\sys\java\zulu8.64.0.19-ca-fx-jre8.0.345-win_x64/bin/" OS_CURRENT="$(shell uname -s)" MP_CC="C:\Program Files\Microchip\xc8\v2.41\bin\xc8-cc.exe" # MP_CPPC is not defined @@ -27,12 +27,11 @@ MP_CC="C:\Program Files\Microchip\xc8\v2.41\bin\xc8-cc.exe" MP_AS="C:\Program Files\Microchip\xc8\v2.41\bin\xc8-cc.exe" MP_LD="C:\Program Files\Microchip\xc8\v2.41\bin\xc8-cc.exe" MP_AR="C:\Program Files\Microchip\xc8\v2.41\bin\xc8-ar.exe" -DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v6.00/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar" +DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v6.15/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar" MP_CC_DIR="C:\Program Files\Microchip\xc8\v2.41\bin" # MP_CPPC_DIR is not defined # MP_BC_DIR is not defined MP_AS_DIR="C:\Program Files\Microchip\xc8\v2.41\bin" MP_LD_DIR="C:\Program Files\Microchip\xc8\v2.41\bin" MP_AR_DIR="C:\Program Files\Microchip\xc8\v2.41\bin" -# MP_BC_DIR is not defined DFP_DIR=C:/Users/remi.heredero/.mchp_packs/Microchip/PIC18F-K_DFP/1.7.134 diff --git a/306-controller_interface.X/nbproject/configurations.xml b/306-controller_interface.X/nbproject/configurations.xml index cf78aa9..ac746da 100644 --- a/306-controller_interface.X/nbproject/configurations.xml +++ b/306-controller_interface.X/nbproject/configurations.xml @@ -210,1036 +210,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -