Razvalyaev/diplom
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлен ForceDisconnect

Browse Source
This commit is contained in:
Razvalyaev 2025-05-16 13:47:41 +03:00
parent 30adaef420
commit 4b0f6db86b
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab_stm_emulate

@ -1 +1 @@
Subproject commit 1c5ce14f0f63f77ed57a30b2d30d6a8eae14f044
Subproject commit 6392d351290206d1cc21e8f8330d45846cb1f560

15
mcu_project/upp/Core/upp/upp.c
View File

@ -24,10 +24,22 @@ void upp_main(void)
connect_upp();
return;
}
if(Upp.ForceDisconnect)
{
phase_A.ctrl.f.TiristorReady = 1;
phase_B.ctrl.f.TiristorReady = 1;
phase_C.ctrl.f.TiristorReady = 1;
Upp.Go = 0;
disconnect_upp();
return;
}
// отключаем упп если выставлен флаг
if(Upp.GoDisconnect)
{
phase_A.ctrl.f.TiristorReady = 1;
phase_B.ctrl.f.TiristorReady = 1;
phase_C.ctrl.f.TiristorReady = 1;
disconnect_upp();
}
// останавливаем упп если выставлен флаг
@ -114,7 +126,6 @@ void upp_safe_go(void)
if(Upp.GoSafe > prev_gosafe)
{
Upp.angleInit.direction = 0;
Upp.ForceStop = 0;
Upp.Prepare = 1;
Upp.Go = 1;
tiristor_angle_reset(&phase_A.ctrl);
@ -267,7 +278,7 @@ int GetAngleInit(AngleInit_t *angle)
void upp_init(void)
{
Upp.max_duty = 0.8;
Upp.max_duty = 0.9;
Upp.min_duty = 0.1;
Upp.angleInit.sample_time_ms = 100;

1
mcu_project/upp/Core/upp/upp.h
View File

@ -38,6 +38,7 @@ typedef struct
unsigned Disconnected:1;
unsigned GoDisconnect:1;
unsigned ForceStop:1;
unsigned ForceDisconnect:1;
unsigned PreGoDone:1;