diff --git a/workspace/AUTOM10/Core/Src/eeprom.c b/workspace/AUTOM10/Core/Src/eeprom.c index 9d325e9..2fb23ba 100644 --- a/workspace/AUTOM10/Core/Src/eeprom.c +++ b/workspace/AUTOM10/Core/Src/eeprom.c @@ -472,6 +472,13 @@ void loadEE(void){ HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); sprintf((char*)s,"\nm1pwmMan=%d m2pwmMan=%d m3pwmMan=%d m4pwmMan=%d",m1pwmMan,m2pwmMan,m3pwmMan,m4pwmMan); HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); - + sprintf((char*)s,"\napM1start=%d apM1stop=%d chM1start=%d chM1stop=%d",apM1start,apM1stop,chM1start,chM1stop); + HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); + sprintf((char*)s,"\napM2start=%d apM2stop=%d chM2start=%d chM2stop=%d",apM2start,apM2stop,chM2start,chM2stop); + HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); + sprintf((char*)s,"\napM3start=%d apM3stop=%d chM3start=%d chM3stop=%d",apM3start,apM3stop,chM3start,chM3stop); + HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); + sprintf((char*)s,"\napM4start=%d apM4stop=%d chM4start=%d chM4stop=%d",apM4start,apM4stop,chM4start,chM4stop); + HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); } diff --git a/workspace/AUTOM10/Core/Src/main.c b/workspace/AUTOM10/Core/Src/main.c index 844f484..c08e790 100644 --- a/workspace/AUTOM10/Core/Src/main.c +++ b/workspace/AUTOM10/Core/Src/main.c @@ -245,7 +245,7 @@ void managePulsanti(void){ } void manageCiclo(void){ - + motMov_st m1,m2,m3,m4; switch(stCiclo){ case omchiuso: if(stPulsanti&P1START){ @@ -352,7 +352,8 @@ void manageCiclo(void){ case omapertura0: if(rtCiclo>=30){//doppo 3 secondi stBuz=bzmoving; - if((m1ap()==motStop)&&(m2ap()==motStop)&&(m3ap()==motStop)&&(m4ap()==motStop)){ + m1=m1ap();m2=m2ap();m3=m3ap();m4=m4ap(); + if((m1==motStop)&&(m2==motStop)&&(m3==motStop)&&(m4==motStop)){ stBuz=bzoff; stCiclo=omaperto; } diff --git a/workspace/AUTOM10/Core/Src/mot.c b/workspace/AUTOM10/Core/Src/mot.c index a097cde..8d875b6 100644 --- a/workspace/AUTOM10/Core/Src/mot.c +++ b/workspace/AUTOM10/Core/Src/mot.c @@ -4,6 +4,8 @@ * Created on: May 2, 2026 * Author: user */ +#include +#include #include "main.h" #include "mot.h" #include "pwm.h" @@ -36,8 +38,17 @@ extern uint16_t m4pwmch; extern uint16_t mrampstart[4]; extern uint16_t tramp; +extern UART_HandleTypeDef huart1; + motMov_st m1ap(void){ - static motMov_st m1st; + static motMov_st m1st=motWaiting; + static motMov_st memm1st=motStop; + char s[100]; + if(memm1st!=m1st){ + memm1st=m1st; + sprintf(s,"\nm1ap=%d",m1st); + HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY); + } if(rtCiclo