andrea/AUTOM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aggiornati tempi

Browse Source
This commit is contained in:
andrea
2026-07-08 18:14:47 +02:00
parent 687c222259
commit 5cdb13c44a
198 changed files with 444007 additions and 500718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
workspace/AUTOM10/Core/Src/eeprom.c
View File

@@ -117,9 +117,9 @@ const uint16_t deftab[EE_NUM_VIRTUAL_ADDR]={
310, //apM1start;
450, //apM1stop;
30, //apM2start;
310, //apM2stop;
340, //apM2stop;
340, //apM3start;
430, //apM3stop;
450, //apM3stop;
30, //apM4start;
430, //apM4stop;
10, //chM1start;
@@ -462,53 +462,101 @@ void loadDefault(void){
void loadEE(void){
char s [200];
EEW_Read(M1PWMAP, &m1pwmap);
EEW_Read(M1PWMCH, &m1pwmch);
EEW_Read(M2PWMAP, &m2pwmap);
EEW_Read(M2PWMCH, &m2pwmch);
EEW_Read(M3PWMAP, &m3pwmap);
EEW_Read(M3PWMCH, &m3pwmch);
EEW_Read(M4PWMAP, &m4pwmap);
EEW_Read(M4PWMCH, &m4pwmch);
EEW_Read(M1RAMPSTART, &mrampstart[M1-1]);
EEW_Read(M2RAMPSTART, &mrampstart[M2-1]);
EEW_Read(M3RAMPSTART, &mrampstart[M3-1]);
EEW_Read(M4RAMPSTART, &mrampstart[M4-1]);
EEW_Read(M1TIMEOUTMAN, &m1TimeoutMan);
EEW_Read(M2TIMEOUTMAN, &m2TimeoutMan);
EEW_Read(M3TIMEOUTMAN, &m3TimeoutMan);
EEW_Read(M4TIMEOUTMAN, &m4TimeoutMan);
m1pwmap=deftab[M1PWMAP];
m1pwmch=deftab[M1PWMCH];
m2pwmap=deftab[M2PWMAP];
m2pwmch=deftab[M2PWMCH];
m3pwmap=deftab[M3PWMAP];
m3pwmch=deftab[M3PWMCH];
m4pwmap=deftab[M4PWMAP];
m4pwmch=deftab[M4PWMCH];
EEW_Read(THANEM, &thanem);
EEW_Read(TANEM, &tanem);
EEW_Read(M1PWMMAN, &m1pwmMan);
EEW_Read(M2PWMMAN, &m2pwmMan);
EEW_Read(M3PWMMAN, &m3pwmMan);
EEW_Read(M4PWMMAN, &m4pwmMan);
EEW_Read(TRAMPMAN, &trampman);
EEW_Read(TRAMP, &tramp);
mrampstart[M1-1]=deftab[M1RAMPSTART];
mrampstart[M2-1]=deftab[M2RAMPSTART];
mrampstart[M3-1]=deftab[M3RAMPSTART];
mrampstart[M4-1]=deftab[M4RAMPSTART];
EEW_Read(APM1START,&apM1start);
EEW_Read(APM1STOP ,&apM1stop);
EEW_Read(APM2START,&apM2start);
EEW_Read(APM2STOP ,&apM2stop);
EEW_Read(APM3START,&apM3start);
EEW_Read(APM3STOP ,&apM3stop);
EEW_Read(APM4START,&apM4start);
EEW_Read(APM4STOP ,&apM4stop);
EEW_Read(CHM1START,&chM1start);
EEW_Read(CHM1STOP ,&chM1stop);
EEW_Read(CHM2START,&chM2start);
EEW_Read(CHM2STOP ,&chM2stop);
EEW_Read(CHM3START,&chM3start);
EEW_Read(CHM3STOP ,&chM3stop);
EEW_Read(CHM4START,&chM4start);
EEW_Read(CHM4STOP ,&chM4stop);
m1TimeoutMan=deftab[M1TIMEOUTMAN];
m2TimeoutMan=deftab[M2TIMEOUTMAN];
m3TimeoutMan=deftab[M3TIMEOUTMAN];
m4TimeoutMan=deftab[M4TIMEOUTMAN];
EEW_Read(FLAGPAR ,&flagPar);
thanem=deftab[THANEM];
tanem=deftab[TANEM];
m1pwmMan=deftab[M1PWMMAN];
m2pwmMan=deftab[M2PWMMAN];
m3pwmMan=deftab[M3PWMMAN];
m4pwmMan=deftab[M4PWMMAN];
trampman=deftab[TRAMPMAN];
tramp=deftab[TRAMP];
apM1start=deftab[APM1START];
apM1stop=deftab[APM1STOP];
apM2start=deftab[APM2START];
apM2stop=deftab[APM2STOP];
apM3start=deftab[APM3START];
apM3stop=deftab[APM3STOP];
apM4start=deftab[APM4START];
apM4stop=deftab[APM4STOP];
chM1start=deftab[CHM1START];
chM1stop=deftab[CHM1STOP];
chM2start=deftab[CHM2START];
chM2stop=deftab[CHM2START];
chM3start=deftab[CHM3START];
chM3stop=deftab[CHM3STOP];
chM4start=deftab[CHM4START];
chM4stop=deftab[CHM4STOP];
flagPar=deftab[FLAGPAR];
// EEW_Read(M1PWMAP, &m1pwmap);
// EEW_Read(M1PWMCH, &m1pwmch);
// EEW_Read(M2PWMAP, &m2pwmap);
// EEW_Read(M2PWMCH, &m2pwmch);
// EEW_Read(M3PWMAP, &m3pwmap);
// EEW_Read(M3PWMCH, &m3pwmch);
// EEW_Read(M4PWMAP, &m4pwmap);
// EEW_Read(M4PWMCH, &m4pwmch);
//
// EEW_Read(M1RAMPSTART, &mrampstart[M1-1]);
// EEW_Read(M2RAMPSTART, &mrampstart[M2-1]);
// EEW_Read(M3RAMPSTART, &mrampstart[M3-1]);
// EEW_Read(M4RAMPSTART, &mrampstart[M4-1]);
//
// EEW_Read(M1TIMEOUTMAN, &m1TimeoutMan);
// EEW_Read(M2TIMEOUTMAN, &m2TimeoutMan);
// EEW_Read(M3TIMEOUTMAN, &m3TimeoutMan);
// EEW_Read(M4TIMEOUTMAN, &m4TimeoutMan);
//
// EEW_Read(THANEM, &thanem);
// EEW_Read(TANEM, &tanem);
// EEW_Read(M1PWMMAN, &m1pwmMan);
// EEW_Read(M2PWMMAN, &m2pwmMan);
// EEW_Read(M3PWMMAN, &m3pwmMan);
// EEW_Read(M4PWMMAN, &m4pwmMan);
// EEW_Read(TRAMPMAN, &trampman);
// EEW_Read(TRAMP, &tramp);
//
// EEW_Read(APM1START,&apM1start);
// EEW_Read(APM1STOP ,&apM1stop);
// EEW_Read(APM2START,&apM2start);
// EEW_Read(APM2STOP ,&apM2stop);
// EEW_Read(APM3START,&apM3start);
// EEW_Read(APM3STOP ,&apM3stop);
// EEW_Read(APM4START,&apM4start);
// EEW_Read(APM4STOP ,&apM4stop);
// EEW_Read(CHM1START,&chM1start);
// EEW_Read(CHM1STOP ,&chM1stop);
// EEW_Read(CHM2START,&chM2start);
// EEW_Read(CHM2STOP ,&chM2stop);
// EEW_Read(CHM3START,&chM3start);
// EEW_Read(CHM3STOP ,&chM3stop);
// EEW_Read(CHM4START,&chM4start);
// EEW_Read(CHM4STOP ,&chM4stop);
//
// EEW_Read(FLAGPAR ,&flagPar);
sprintf((char*)s,"LoadEE\n");
HAL_UART_Transmit(&huart1,(uint8_t*) s, strlen(s), HAL_MAX_DELAY);

12
workspace/AUTOM10/Core/Src/main.c
View File

@@ -711,12 +711,12 @@ int main(void) {
; //errore eeprom
}
loadEE();
if (flagPar != VERSIONE) {
HAL_GPIO_WritePin(GPIOA, BUZ_Pin, GPIO_PIN_SET);
loadDefault();
loadEE();
HAL_GPIO_WritePin(GPIOA, BUZ_Pin, GPIO_PIN_RESET);
}
// if (flagPar != VERSIONE) {
// HAL_GPIO_WritePin(GPIOA, BUZ_Pin, GPIO_PIN_SET);
// loadDefault();
// loadEE();
// HAL_GPIO_WritePin(GPIOA, BUZ_Pin, GPIO_PIN_RESET);
// }
/* USER CODE END 2 */
/* Infinite loop */