Начало и конец управляющего тока УМП регулируются

This commit is contained in:
2026-09-16 12:09:49 +03:00
parent ed9680a36e
commit 341f194b4d
12 changed files with 1552 additions and 1571 deletions

View File

@@ -102,6 +102,8 @@ Log_to_mem(modbus[0x1D]);
void Load_runner()
{
static unsigned int count_dac=0, count_load=0, x=1;
static unsigned int preStart=0;
static float dac_go,dac_stop;
float sinus=0;
int kod;
@@ -128,12 +130,23 @@ void Load_runner()
{
if(cUMPstart)
{
if(!preStart)
{
dac_go=DAC_go-4;
dac_stop=DAC_stop-4;
if(dac_go<0) dac_go=0;
if(dac_go>5) dac_go=5;
if(dac_stop>16) dac_go=16;
if(dac_stop<=dac_go) dac_stop=dac_go+1;
}
if(count_load > (time_dac/2))count_load++;
if(++count_load > time_dac) count_load = time_dac;
// sinus = ((float)(DAC_stop - DAC_go) / 16.0 * count_load) + ((float)(DAC_go - 4.0) / 16.0 * time_dac);
sinus = (10.0 / 16.0 * count_load) + (2.0 / 16.0 * time_dac);
sinus = ((dac_stop - dac_go) / 16.0 * count_load) + (dac_go / 16.0 * time_dac);
// sinus = (10.0 / 16.0 * count_load) + (2.0 / 16.0 * time_dac);
}
else
{ count_load = 0;
@@ -141,6 +154,8 @@ void Load_runner()
x = (x+1)&0x3FF;
}
preStart = cUMPstart;
if(!x || cInitDac)
{
Init_DAC(); x=1; cInitDac=0;

View File

@@ -91,17 +91,16 @@
#define bSecretBt Buttons.bit.bit1
#define bTermoCal Buttons.bit.bit2
// Ïðèøëî âðåìà!
#define DAC_go modbus[0x50] // íà÷àëî çàðàäà
#define DAC_stop modbus[0x51] // êîíåö çàðàäà
#define Cancount (modbus+0x60) // ïàóçà ìåæäó I ïîñûëêàìè CAN
#define Bright (modbus+0x62) // àðêîñòü ñèãíàëüíûõ ëàìïî÷åê
#define Brightness modbus[0x62] // àðêîñòü ñèãíàëüíûõ ëàìïî÷åê
#define Owncount modbus[0x63] // ïàóçà ìåæäó îïðîñàìè OWEN
/* Íå âðåìà!
#define DAC_go modbus[0x64] // íà÷àëî çàðàäà
#define DAC_stop modbus[0x65] // êîíåö çàðàäà
*/
#define m_FAST 0
#define m_SLOW 1

View File

@@ -411,6 +411,7 @@ void Init_packMask()
if(Owen) Maska[m_FAST][6]|= 0x0008; // Ïåðèîä îïðîñà OWEN
if(Desk==dsk_LOAD)
{ Maska[m_SLOW][7]|= 0x0030; // Êàëèáðîâêà ÖÀÏ
Maska[m_SLOW][5]|= 0x0003; // Начало и конец зарада
Maska[m_FAST][7]|= 0xE000; // Äóáëèðîâàòü êîìàíäû
Maska[m_FAST][1]|= 0x3000; // Óïðàâëàþùèé òîê ÑÈÔÓ
} }

View File

@@ -122,10 +122,10 @@ void Default_params()
DAC_20 = Caliber[6];
DAC_04 = Caliber[7];
/* Не врема!
// Пришло врема!
DAC_go = 6; // íà÷àëî çàðàäà
DAC_stop= 15; // конец зарада
*/
DAC_stop= 16; // конец зарада
}
if(Kurrent)