diff --git a/projects_ini/23550_1.ini b/projects_ini/23550_1.ini index 623cea9..21f7875 100644 --- a/projects_ini/23550_1.ini +++ b/projects_ini/23550_1.ini @@ -1365,6 +1365,39 @@ CheckBoxOUT6_Caption= CheckBoxOUT7_Caption=Ñîáðàòü ñõåìó CheckBoxOUT8_Caption=Ðàçîáðàòü ñõåìó CheckBoxOUT9_Caption=Âêë Íàñîñ_àâòî(0)_ðó÷íîé(1) +CheckBoxOUT1_PanelCaption=Óïð_1 +CheckBoxOUT2_PanelCaption=Óïð_2 +CheckBoxOUT3_PanelCaption=Óïð_3 +CheckBoxOUT4_PanelCaption=Óïð_4 +CheckBoxOUT5_PanelCaption=Óïð_5 +CheckBoxOUT6_PanelCaption=Óïð_6 +CheckBoxOUT7_PanelCaption=Óïð_7 +CheckBoxOUT8_PanelCaption=Óïð_8 +CheckBoxOUT9_PanelCaption=Óïð_9 +CheckBoxOUT10_PanelCaption=Óïð_10 +CheckBoxOUT11_PanelCaption=Óïð_11 +CheckBoxOUT12_PanelCaption=Óïð_12 +CheckBoxOUT13_PanelCaption=Óïð_13 +CheckBoxOUT14_PanelCaption=Óïð_14 +CheckBoxOUT15_PanelCaption=Óïð_15 +CheckBoxOUT16_PanelCaption=Óïð_16 +CheckBoxOUT17_PanelCaption=Óïð_17 +CheckBoxOUT18_PanelCaption=Óïð_18 +CheckBoxOUT19_PanelCaption=Óïð_19 +CheckBoxOUT20_PanelCaption=Óïð_20 +CheckBoxOUT21_PanelCaption=Óïð_21 +CheckBoxOUT22_PanelCaption=Óïð_22 +CheckBoxOUT23_PanelCaption=Óïð_23 +CheckBoxOUT24_PanelCaption=Óïð_24 +CheckBoxOUT25_PanelCaption=Óïð_25 +CheckBoxOUT26_PanelCaption=Óïð_26 +CheckBoxOUT27_PanelCaption=Óïð_27 +CheckBoxOUT28_PanelCaption=Óïð_28 +CheckBoxOUT29_PanelCaption=Óïð_29 +CheckBoxOUT30_PanelCaption=Óïð_30 +CheckBoxOUT31_PanelCaption=Óïð_31 +CheckBoxOUT32_PanelCaption=Óïð_32 +CheckBoxOUT33_PanelCaption=Óïð_33 [VALUE_ANALOG_OUT] AnalogOUT1_Value=0 diff --git a/projects_ini/23550_3.ini b/projects_ini/23550_3.ini index 3ed9a04..094b27b 100644 --- a/projects_ini/23550_3.ini +++ b/projects_ini/23550_3.ini @@ -1,6 +1,6 @@ [SETUP] MaxWordsLights=25 -MaxWordsAnalogIN=67 +MaxWordsAnalogIN=68 MaxWordsAnalogOUT=15 MaxWordsCheckBoxOUT=2 CountDigitalINRow=32 @@ -59,7 +59,7 @@ LabelLight44_Caption=T_AIR0_MAX LabelLight45_Caption=T_AIR1_MAX LabelLight46_Caption=T_AIR2_MAX LabelLight47_Caption=T_AIR3_MAX -LabelLight48_Caption=- +LabelLight48_Caption=ERROR_RAZBOR_SHEMA LabelLight49_Caption=NOT_READY_TK_0 LabelLight50_Caption=NOT_READY_TK_1 LabelLight51_Caption=NOT_READY_TK_2 @@ -75,7 +75,7 @@ LabelLight60_Caption=NOT_READY_ADC_1 LabelLight61_Caption=NOT_READY_HWP_0 LabelLight62_Caption=NOT_READY_HWP_1 LabelLight63_Caption=NOT_READY_CONTR -LabelLight64_Caption=ERR_UPDATE_PWM_WDOG +LabelLight64_Caption=ERR_WDOG LabelLight65_Caption=ERR_TK_0 LabelLight66_Caption=ERR_TK_1 LabelLight67_Caption=ERR_TK_2 @@ -339,8 +339,8 @@ LabelLight324_Caption=DISBALANCE_Uin_1 LabelLight325_Caption=DISBALANCE_Uin_2 LabelLight326_Caption=U_IN_FREQ_NOT_NORMA LabelLight327_Caption=U_IN_FREQ_NOT_STABLE -LabelLight328_Caption=8 -LabelLight329_Caption=8 +LabelLight328_Caption=ERR_PWM_WDOG +LabelLight329_Caption=ERR_INT_PWM_VERY_LONG LabelLight330_Caption=8 LabelLight331_Caption=8 LabelLight332_Caption=8 @@ -408,9 +408,9 @@ LabelLight393_Caption=SBOR_SHEMA LabelLight394_Caption=ZADA_DISPLAY LabelLight395_Caption=SVU LabelLight396_Caption=QTV_ON_OFF -LabelLight397_Caption=READY_UMP -LabelLight398_Caption=SVU_BLOCK_QTV -LabelLight399_Caption=- +LabelLight397_Caption=UMP_ON_OFF +LabelLight398_Caption=READY_UMP +LabelLight399_Caption=SVU_BLOCK_QTV LabelLight400_Caption=- [LABEL_LIGHT_COLOR] LabelLight1_LitColor=32768 @@ -509,8 +509,8 @@ LabelLight93_LitColor=255 LabelLight94_LitColor=255 LabelLight95_LitColor=255 LabelLight96_LitColor=255 -LabelLight97_LitColor=255 -LabelLight98_LitColor=255 +LabelLight97_LitColor=32768 +LabelLight98_LitColor=32768 LabelLight99_LitColor=32768 LabelLight100_LitColor=32768 LabelLight101_LitColor=255 @@ -565,14 +565,14 @@ LabelLight149_LitColor=255 LabelLight150_LitColor=32768 LabelLight151_LitColor=32768 LabelLight152_LitColor=255 -LabelLight153_LitColor=255 +LabelLight153_LitColor=32768 LabelLight154_LitColor=32768 LabelLight155_LitColor=255 -LabelLight156_LitColor=255 -LabelLight157_LitColor=255 -LabelLight158_LitColor=255 +LabelLight156_LitColor=32768 +LabelLight157_LitColor=32768 +LabelLight158_LitColor=32768 LabelLight159_LitColor=255 -LabelLight160_LitColor=255 +LabelLight160_LitColor=32768 LabelLight161_LitColor=255 LabelLight162_LitColor=255 LabelLight163_LitColor=255 @@ -648,11 +648,11 @@ LabelLight232_LitColor=255 LabelLight233_LitColor=32768 LabelLight234_LitColor=32768 LabelLight235_LitColor=32768 -LabelLight236_LitColor=255 -LabelLight237_LitColor=255 +LabelLight236_LitColor=32768 +LabelLight237_LitColor=32768 LabelLight238_LitColor=255 LabelLight239_LitColor=255 -LabelLight240_LitColor=255 +LabelLight240_LitColor=32768 LabelLight241_LitColor=32768 LabelLight242_LitColor=32768 LabelLight243_LitColor=32768 @@ -685,7 +685,7 @@ LabelLight269_LitColor=255 LabelLight270_LitColor=255 LabelLight271_LitColor=32768 LabelLight272_LitColor=32768 -LabelLight273_LitColor=255 +LabelLight273_LitColor=32768 LabelLight274_LitColor=255 LabelLight275_LitColor=32768 LabelLight276_LitColor=255 @@ -797,7 +797,7 @@ LabelLight381_LitColor=255 LabelLight382_LitColor=255 LabelLight383_LitColor=255 LabelLight384_LitColor=255 -LabelLight385_LitColor=255 +LabelLight385_LitColor=32768 LabelLight386_LitColor=255 LabelLight387_LitColor=255 LabelLight388_LitColor=255 @@ -810,7 +810,7 @@ LabelLight394_LitColor=255 LabelLight395_LitColor=255 LabelLight396_LitColor=255 LabelLight397_LitColor=255 -LabelLight398_LitColor=255 +LabelLight398_LitColor=32768 LabelLight399_LitColor=255 LabelLight400_LitColor=255 LabelLight401_LitColor=255 @@ -1297,7 +1297,7 @@ LabelLight880_LitColor=255 LabelCu1_Caption=U1 LabelCu2_Caption=U2 LabelCu3_Caption=Uin1 -LabelCu4_Caption=Status_Sbor +LabelCu4_Caption=Uin_m2 LabelCu5_Caption=Power,kWt LabelCu6_Caption=Iin2 LabelCu7_Caption=Im1 @@ -1361,12 +1361,12 @@ LabelCu64_Caption= LabelCu65_Caption=optical_data_in.local_count_error LabelCu66_Caption=optical_data_out.local_count_error LabelCu67_Caption=count_error_wdog -LabelCu68_Caption=- +LabelCu68_Caption=period_calc_pwm_int2 LabelCu69_Caption=- LabelCu70_Caption=- [LABEL_ANALOG_OUT] -LabelAnalogOut1_Caption=Oborots, ob/min -LabelAnalogOut2_Caption=Km +LabelAnalogOut1_Caption=Oborots, ob/min/ F*100 Hz +LabelAnalogOut2_Caption=Km*100 LabelAnalogOut3_Caption=Power,kWt LabelAnalogOut4_Caption=Izad LabelAnalogOut5_Caption=Uin çàðÿä*2.11=Uzpt @@ -1398,8 +1398,8 @@ CheckBoxOUT21_Caption= CheckBoxOUT22_Caption=Çàïðåò âêë. íàñîñà CheckBoxOUT23_Caption=Ðàçðåø âíóòð öåïè çàðÿäà CheckBoxOUT24_Caption=Çàïðåò âêë. QTV -CheckBoxOUT25_Caption=--- -CheckBoxOUT26_Caption=--- +CheckBoxOUT25_Caption=disable_int_sync +CheckBoxOUT26_Caption=disable_int_timer2_opt_bus CheckBoxOUT27_Caption=--- CheckBoxOUT28_Caption=---- CheckBoxOUT29_Caption=---- @@ -1429,6 +1429,39 @@ CheckBoxOUT45_Caption=- CheckBoxOUT46_Caption=- CheckBoxOUT47_Caption=- CheckBoxOUT48_Caption=- +CheckBoxOUT1_PanelCaption=Óïð_1 +CheckBoxOUT2_PanelCaption=Óïð_2 +CheckBoxOUT3_PanelCaption=Óïð_3 +CheckBoxOUT4_PanelCaption=Óïð_4 +CheckBoxOUT5_PanelCaption=Óïð_5 +CheckBoxOUT6_PanelCaption=Óïð_6 +CheckBoxOUT7_PanelCaption=Óïð_7 +CheckBoxOUT8_PanelCaption=Óïð_8 +CheckBoxOUT9_PanelCaption=Óïð_9 +CheckBoxOUT10_PanelCaption=Óïð_10 +CheckBoxOUT11_PanelCaption=Óïð_11 +CheckBoxOUT12_PanelCaption=Óïð_12 +CheckBoxOUT13_PanelCaption=Óïð_13 +CheckBoxOUT14_PanelCaption=Óïð_14 +CheckBoxOUT15_PanelCaption=Óïð_15 +CheckBoxOUT16_PanelCaption=Óïð_16 +CheckBoxOUT17_PanelCaption=Óïð_17 +CheckBoxOUT18_PanelCaption=Óïð_18 +CheckBoxOUT19_PanelCaption=Óïð_19 +CheckBoxOUT20_PanelCaption=Óïð_20 +CheckBoxOUT21_PanelCaption=Óïð_21 +CheckBoxOUT22_PanelCaption=Óïð_22 +CheckBoxOUT23_PanelCaption=Óïð_23 +CheckBoxOUT24_PanelCaption=Óïð_24 +CheckBoxOUT25_PanelCaption=Óïð_25 +CheckBoxOUT26_PanelCaption=Óïð_26 +CheckBoxOUT27_PanelCaption=Óïð_27 +CheckBoxOUT28_PanelCaption=Óïð_28 +CheckBoxOUT29_PanelCaption=Óïð_29 +CheckBoxOUT30_PanelCaption=Óïð_30 +CheckBoxOUT31_PanelCaption=Óïð_31 +CheckBoxOUT32_PanelCaption=Óïð_32 +CheckBoxOUT33_PanelCaption=Óïð_33 [VALUE_ANALOG_OUT] AnalogOUT1_Value=0 diff --git a/setterminal_test_14.exe b/setterminal_test_14.exe index 3de74c4..81417b5 100644 Binary files a/setterminal_test_14.exe and b/setterminal_test_14.exe differ