Повышен уровень оптимизации компилятора, а то еле лезет
This commit is contained in:
@@ -127,10 +127,11 @@ void Load_runner()
|
||||
{
|
||||
if(cUMPstart)
|
||||
{
|
||||
if(++count_load > time_dac) count_load = time_dac;
|
||||
|
||||
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);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -74,6 +74,11 @@
|
||||
#define Bright (modbus+0x62) // àðêîñòü ñèãíàëüíûõ ëàìïî÷åê
|
||||
#define Brightness modbus[0x62] // àðêîñòü ñèãíàëüíûõ ëàìïî÷åê
|
||||
|
||||
/* Íå âðåìà!
|
||||
#define DAC_go modbus[0x64] // íà÷àëî çàðàäà
|
||||
#define DAC_stop modbus[0x65] // êîíåö çàðàäà
|
||||
*/
|
||||
|
||||
#define m_FAST 0
|
||||
#define m_SLOW 1
|
||||
|
||||
|
||||
@@ -304,7 +304,8 @@ void Init_sensors_more()
|
||||
for(i=0;i<24;i++) modbus[i] &= NOER;
|
||||
for(i=0;i<4; i++) zer_count[i] = Zero_lev[i];
|
||||
|
||||
for(i=0;i<24;i++)
|
||||
if(Desk==dsk_LOAD)
|
||||
for(i=0;i<4;i++)
|
||||
{
|
||||
if(sens_type[i]==VOLTAGE)
|
||||
{
|
||||
@@ -660,9 +661,6 @@ void Temper_count(int chan)
|
||||
K_T1 = 129.0/(K150_1 - K100_1);
|
||||
K_T2 = 129.0/(K150_2 - K100_2);
|
||||
|
||||
//modbus[68]=K_T1*10000;
|
||||
//modbus[69]=K_T2*10000;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -115,6 +115,11 @@ void Default_params()
|
||||
|
||||
DAC_20 = Caliber[6];
|
||||
DAC_04 = Caliber[7];
|
||||
|
||||
/* Íå âðåìà!
|
||||
DAC_go = 6; // íà÷àëî çàðàäà
|
||||
DAC_stop= 15; // êîíåö çàðàäà
|
||||
*/
|
||||
}
|
||||
|
||||
if(Kurrent)
|
||||
|
||||
Reference in New Issue
Block a user