Исправлен момент загрузки, чтоб CAN не подтягивался к единице.

Bin/UKSSTMS320F28335.map

@@ -12,7 +12,7 @@ PHYSICAL MEMORY PARAMETERS
 
 BOOT LOADER PARAMETERS
    Table Type:		  SERIAL PORT (SCI 8 bit Mode)
-   Entry Point:		  0x0000b74f
+   Entry Point:		  0x0000b7f1
 
 
 OUTPUT TRANSLATION MAP
@@ -21,9 +21,9 @@ OUTPUT TRANSLATION MAP
 --------------------------------------------------------------------------------
    OUTPUT FILES: D:\project2833\GIT\Balsam_166\bin\UKSSTMS320F28335.bin [b0..b7]
 
-   CONTENTS: 00000000..00007971   BOOT TABLE
+   CONTENTS: 00000000..00007ab5   BOOT TABLE
-                           .cinit : dest=0000b8df  size=00000262  width=00000002
+                           .cinit : dest=0000b981  size=00000262  width=00000002
-                            .text : dest=00008000  size=000038df  width=00000002
+                            .text : dest=00008000  size=00003981  width=00000002
                          ramfuncs : dest=0000c15d  size=00000023  width=00000002
                           .econst : dest=0000c000  size=00000112  width=00000002
                           .switch : dest=0000c112  size=00000028  width=00000002

Source/External/v120/DSP2833x_common/source/DSP2833x_Xintf.c

@@ -222,18 +222,19 @@ void InitXintf16Gpio()
      GpioCtrlRegs.GPCMUX2.bit.GPIO85 = 3;  // XA13
      GpioCtrlRegs.GPCMUX2.bit.GPIO86 = 3;  // XA14
      GpioCtrlRegs.GPCMUX2.bit.GPIO87 = 3;  // XA15
-     GpioCtrlRegs.GPBMUX1.bit.GPIO39 = 3;  // XA16
-     GpioCtrlRegs.GPAMUX2.bit.GPIO31 = 3;  // XA17
-     GpioCtrlRegs.GPAMUX2.bit.GPIO30 = 3;  // XA18
-     GpioCtrlRegs.GPAMUX2.bit.GPIO29 = 3;  // XA19
 
-     GpioCtrlRegs.GPBMUX1.bit.GPIO34 = 3;  // XREADY
+     GpioCtrlRegs.GPBMUX1.bit.GPIO39 = 3;  // XA16
+//     GpioCtrlRegs.GPAMUX2.bit.GPIO31 = 3;  // XA17
+//     GpioCtrlRegs.GPAMUX2.bit.GPIO30 = 3;  // XA18
+//     GpioCtrlRegs.GPAMUX2.bit.GPIO29 = 3;  // XA19
+
+//     GpioCtrlRegs.GPBMUX1.bit.GPIO34 = 3;  // XREADY
 	 GpioCtrlRegs.GPBMUX1.bit.GPIO35 = 3;  // XRNW
      GpioCtrlRegs.GPBMUX1.bit.GPIO38 = 3;  // XWE0
 
-     GpioCtrlRegs.GPBMUX1.bit.GPIO36 = 3;  // XZCS0
+//     GpioCtrlRegs.GPBMUX1.bit.GPIO36 = 3;  // XZCS0
      GpioCtrlRegs.GPBMUX1.bit.GPIO37 = 3;  // XZCS7
-     GpioCtrlRegs.GPAMUX2.bit.GPIO28 = 3;  // XZCS6
+//     GpioCtrlRegs.GPAMUX2.bit.GPIO28 = 3;  // XZCS6
      EDIS;
 }
 

Source/Internal/Include/DAC.h

@@ -3,6 +3,5 @@ void Anal_output(long vrot, long maxx);
 void Init_DAC(void);
 void Setup_DAC_time(void);
 
-extern unsigned long WAKEpowse;
 extern unsigned long IMPowse;
 extern unsigned int period_dac, time_dac;

Source/Internal/Include/package.h

@@ -1,7 +1,7 @@
 #ifndef PACKAGE
 #define PACKAGE
 
-#define BALSAM	164
+#define BALSAM	165
 
 #if BALSAM == 166
 #define OBOROT	REVERSE

Source/Internal/Include/peripher.h

@@ -3,6 +3,7 @@
 extern int Mode,Desk,TermoAD,TermoRS,TermoSW,Kurrent,Kalibro;
 
 void setup_leds_line(void);
+void unsetup_leds_line(void);
 
 #define led1_toggle()	GpioDataRegs.GPBTOGGLE.bit.GPIO32=1
 #define led2_toggle()	GpioDataRegs.GPBTOGGLE.bit.GPIO48=1

Source/Internal/kanal.c

@@ -70,7 +70,9 @@ void SENDBIT(int x)
 #if	POWS0>0
 	DSP28x_usDelay(POWS0); 
 #endif
-	DCLK(0); DOUT(0); 
+	DOUT(0); 
+	DSP28x_usDelay(POWS0+1); 
+	DCLK(0);  
 #if	POWS1>0
 	DSP28x_usDelay(POWS1); 
 #endif

Source/Internal/main.c

@@ -54,9 +54,11 @@ void main()
 	IFR = 0x0000;
 
 	InitPieVectTable();
-
 	init_zone7();
 
+	get_Mode();
+	InitCan(0,Mode);
+
 	create_uart_vars(sizeof(CMD_TO_TMS));
 	setup_uart(COM_1,115200);
 	setup_uart(COM_2,115200);
@@ -73,17 +75,11 @@ void main()
 	}
 	led1_off();
 	led2_off();
+	unsetup_leds_line();
 
 	clear_mem();
-
-	get_Mode();
-
-	InitCan(0,Mode);
-
 	set_cntrl_addr(Mode,16);
-
 	timer_Init();
-
 	EnableInterrupts();
 
 	if(Desk!=dsk_EPLT)
@@ -94,7 +90,6 @@ void main()
 	Init_packMask();
 
 	Load_params();
-
 	Init_sensors_more();
 
 	if(Desk==dsk_LOAD)
@@ -159,10 +154,11 @@ void main()
 
 		get_Buttons();
 
-		if(WAKEpowse) bTermoCal=0;
+		if(Desk==dsk_COMM)
-
+		{
 			if(!bTermoCal & presbyt) cSaveParam=1;
 			presbyt = bTermoCal;
+		}
 
 		if(Desk==dsk_LOAD)
 		{

Source/Internal/measure.c

@@ -27,10 +27,10 @@ int cal_addr=0;
 int period_ready, period_blink;
 
 FLAG chk,sig;
-long time_1_5sec, time_5msec, time_5sec;
+long time_1_5sec, time_5msec, time_3sec, time_5sec;
 
 int READY = 100;
-int WAKE = 5 * ADC_FREQ;
+int WAKE = 10 * ADC_FREQ;
 
 long low_count[2] = {0,0};
 long err_count[6];
@@ -216,6 +216,7 @@ void Init_sensors()
 
 	time_1_5sec	= (3 * ADC_FREQ) / 2;
 	time_5msec	= (5 * ADC_FREQ) / 1000;
+	time_3sec	= (3 * ADC_FREQ);
 	time_5sec	= (5 * ADC_FREQ);
 
 	for(i=0;i<16;i++) 
@@ -301,12 +302,17 @@ void Init_sensors_more()
 {
   int i;
 
-	for(i=0;i<24;i++) modbus[i] &= NOER;
+	for(i=0;i<24;i++) 
-	for(i=0;i<4; i++) zer_count[i] = Zero_lev[i];
+	{
+		modbus[i] &= NOER;
+		sens_data[i]=0;
+	}
 
-	if(Desk==dsk_LOAD)
 	for(i=0;i<4;i++)
 	{
+		zer_count[i] = Zero_lev[i];
+
+		if(Desk==dsk_LOAD)
 		if(sens_type[i]==VOLTAGE)
 		{ 
 			if(i&1) sens_data[i]=560;
@@ -463,8 +469,11 @@ modbus[0x64+chan] = Numb;
 
 		Level = Amplitude / RADIX2;
 	
+		if(!WAKE)
+		{
 			sens_data[sens  ] = Amplitude;
 			sens_data[sens-1] = Level;
+		}
 
 //		Äåéñòâóþùåå (ñðåäíåêâàäðàòè÷íîå) çíà÷åíèå òðåòüåé ôàçû
 		Numb =-Current-aCurrent;
@@ -501,15 +510,15 @@ modbus[0x68+fazz+2] = lev_count[thrd];
 	error.all = 0;
 	no_ignor = !sens_error[chan].bit.Ignor;
 
-	if(er_anal( ((Numb-lev_count[chan])/Numb > 0.2) && (Numb>Curr_Edge),
+	if(er_anal( ((Numb-lev_count[chan])/Numb > 0.3) && (Numb>Curr_Edge),
-				&err_count[chan],time_1_5sec,0))
+				&err_count[chan],time_3sec,0))
 	{
 		error.bit.Wry = 1;
 		error.bit.Stop = no_ignor;
 	}
 
-	if(er_anal( ((Numb-lev_count[thrd])/Numb > 0.2) && (Numb>Curr_Edge),
+	if(er_anal( ((Numb-lev_count[thrd])/Numb > 0.3) && (Numb>Curr_Edge),
-				&err_count[thrd],time_1_5sec,0))
+				&err_count[thrd],time_3sec,0))
 	{
 		error.bit.Wry = 1;
 		error.bit.Stop = no_ignor;
@@ -527,7 +536,7 @@ modbus[0x68+fazz+2] = lev_count[thrd];
 		if(sens_type[chan]==VOLTAGE)
 
 		if(er_anal( (Level < sens_lo_edge[sens]), 
-					&low_count[feed],time_1_5sec,0))
+					&low_count[feed],time_3sec,0))
 		{
 			error.bit.Out	= 1;
 			error.bit.Stop = no_ignor;
@@ -545,11 +554,11 @@ modbus[0x68+fazz+2] = lev_count[thrd];
 			error.bit.Over	= 1;
 	}	}
 
-if(chan==1)
+if((chan==1)||(chan==3))
 if(error.all)
 if(!no_write)
 {
-Test_mem_limit(10);
+Test_mem_limit(12);
 
 Log_to_mem(Current);
 Log_to_mem(aCurrent);
@@ -561,10 +570,11 @@ Log_to_mem(lev_count[thrd]);
 
 Log_to_mem(Amplitude);
 Log_to_mem(Level);
+Log_to_mem(Zero_lev[chan]);
 
 Log_to_mem(Curr_Edge);
 Log_to_mem(error.all);
-
+Log_to_mem(WAKE);
 
 }
 

Source/Internal/peripher.c

@@ -14,8 +14,15 @@ int Mode,Desk,TermoAD=0,TermoRS=0,TermoSW=0,Kurrent=0,Kalibro=0;
 long INcount0=0,INcount1=0;
 LONGE DigErr;
 
+int MUX_GPIO32,MUX_GPIO48,DIR_GPIO32,DIR_GPIO48;
+
 void setup_leds_line()
 {
+	MUX_GPIO32 = GpioCtrlRegs.GPBMUX1.bit.GPIO32;
+	MUX_GPIO48 = GpioCtrlRegs.GPBMUX2.bit.GPIO48;
+	DIR_GPIO32 = GpioCtrlRegs.GPBDIR.bit.GPIO32;
+	DIR_GPIO48 = GpioCtrlRegs.GPBDIR.bit.GPIO48;
+
     EALLOW;
 	GpioCtrlRegs.GPBMUX1.bit.GPIO32 = 0;
 	GpioCtrlRegs.GPBMUX2.bit.GPIO48 = 0;
@@ -24,6 +31,16 @@ void setup_leds_line()
     EDIS;
 }
 
+void unsetup_leds_line()
+{
+    EALLOW;
+	GpioCtrlRegs.GPBMUX1.bit.GPIO32 = MUX_GPIO32;
+	GpioCtrlRegs.GPBMUX2.bit.GPIO48 = MUX_GPIO48;
+	GpioCtrlRegs.GPBDIR.bit.GPIO32 = DIR_GPIO32;
+	GpioCtrlRegs.GPBDIR.bit.GPIO48 = DIR_GPIO48;
+    EDIS;
+}
+
 void get_Mode()
 {
 	EALLOW;
@@ -53,15 +70,6 @@ void get_Mode()
 	if	(Mode==adr_PLT3)					Desk = dsk_EPLT;
 	if	(Mode==adr_SHKF)					Desk = dsk_SHKF;
 
-	if(Desk==dsk_LOAD)
-	{
-		GpioDataRegs.GPASET.bit.GPIO1=1;
-		GpioDataRegs.GPASET.bit.GPIO3=1;
-		GpioDataRegs.GPASET.bit.GPIO7=1;
-		GpioDataRegs.GPASET.bit.GPIO9=1;
-		GpioDataRegs.GPBSET.bit.GPIO61=1;
-	}
-
 	if(	(Desk==dsk_COMM)||(Desk==dsk_SHKF)||
 		(Desk==dsk_LOAD) )					Kalibro = 1;
 	if( (Desk==dsk_COMM)||(Desk==dsk_LOAD))	Kurrent = 1;
@@ -70,6 +78,11 @@ void get_Mode()
 	if(	(Desk==dsk_COMM)||(Desk==dsk_BKST))	TermoSW = 2;
 	if	(Desk==dsk_BKSD)					TermoSW = 1;
 
+	clear_LED_OUT_1();
+	clear_LED_OUT_2();
+	clear_RES_OUT_1();
+	clear_RES_OUT_2();
+
 	EALLOW;
 	switch(Desk)
 	{
@@ -91,7 +104,6 @@ void get_Mode()
 
 		case dsk_SHKF:	GpioCtrlRegs.GPADIR.all = SHKF_GPADIR;
 						GpioCtrlRegs.GPBDIR.all = SHKF_GPBDIR;	break;
-
 	}
 	EDIS;
 }

UKSSTMS320F28335.pjt

@@ -0,0 +1,73 @@
+; Code Composer Project File, Version 2.0 (do not modify or remove this line)
+
+[Project Settings]
+ProjectDir="D:\project2833\GIT\Balsam_166\"
+ProjectType=Executable
+CPUFamily=TMS320C28XX
+Tool="Compiler"
+Tool="CustomBuilder"
+Tool="DspBiosBuilder"
+Tool="Linker"
+Config="Debug"
+Config="Release"
+
+[Source Files]
+Source="Libraries\rts2800_fpu32.lib"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_Adc.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_ADC_cal.asm"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_CpuTimers.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_PieCtrl.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_SWPrioritizedDefaultIsr.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_SWPrioritizedPieVect.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_SysCtrl.c"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_usDelay.asm"
+Source="Source\External\v120\DSP2833x_common\source\DSP2833x_Xintf.c"
+Source="Source\External\v120\DSP2833x_headers\source\DSP2833x_GlobalVariableDefs.c"
+Source="Source\Internal\ADC.c"
+Source="Source\Internal\bios.c"
+Source="Source\Internal\cntrl_adr.c"
+Source="Source\Internal\crc16.c"
+Source="Source\Internal\DAC.c"
+Source="Source\Internal\ecan.c"
+Source="Source\Internal\filter_bat2.c"
+Source="Source\Internal\kanal.c"
+Source="Source\Internal\log_to_mem.c"
+Source="Source\Internal\main.c"
+Source="Source\Internal\measure.c"
+Source="Source\Internal\message.c"
+Source="Source\Internal\peripher.c"
+Source="Source\Internal\pulto.c"
+Source="Source\Internal\RS485.c"
+Source="Source\Internal\spise2p.c"
+Source="Source\Internal\tools.c"
+Source="F28335.cmd"
+Source="Source\External\v120\DSP2833x_headers\cmd\DSP2833x_Headers_nonBIOS.cmd"
+
+["Debug" Settings]
+FinalBuildCmd=$(Proj_dir)\bin\hex2000.exe $(Proj_dir)\bin\UKSSTMS320F28335.out -boot -sci8 -map  $(Proj_dir)\bin\UKSSTMS320F28335.map -o $(Proj_dir)\bin\UKSSTMS320F28335.hex -i
+FinalBuildCmd=$(Proj_dir)\bin\hex2000.exe $(Proj_dir)\bin\UKSSTMS320F28335.out -boot -sci8 -map  $(Proj_dir)\bin\UKSSTMS320F28335.map -o $(Proj_dir)\bin\UKSSTMS320F28335.bin -b
+
+["Compiler" Settings: "Debug"]
+Options=-g -pdsw225 -o1 -fr"$(Proj_dir)\Debug" -fs"$(Proj_dir)\Asm" -i"$(Proj_dir)\Source\External\v120\DSP2833x_headers\include" -i"$(Proj_dir)\Source\Internal\Include" -i"$(Proj_dir)\Source\External\v120\DSP2833x_common\include" -d"_DEBUG" -d"LARGE_MODEL" -md -ml -v28 --float_support=fpu32
+
+["Compiler" Settings: "Release"]
+Options=-pdsw225 -o3 -fr"$(Proj_dir)\Release" -d"LARGE_MODEL" -ml -v28
+
+["Linker" Settings: "Debug"]
+Options=-c -e_c_int00 -m"$(Proj_dir)\UKSSTMS320F28335.map" -o"$(Proj_dir)\bin\UKSSTMS320F28335.out" -stack0x3f0 -w -x -l"rts2800_fpu32.lib"
+
+["Linker" Settings: "Release"]
+Options=-c -m"$(Proj_dir)\Release\UKSSTMS320F28335.map" -o"$(Proj_dir)\Release\UKSSTMS320F28335.out" -w -x
+
+["F28335.cmd" Settings: "Debug"]
+LinkOrder=1
+
+["F28335.cmd" Settings: "Release"]
+LinkOrder=1
+
+["Source\External\v120\DSP2833x_headers\cmd\DSP2833x_Headers_nonBIOS.cmd" Settings: "Debug"]
+LinkOrder=2
+
+["Source\External\v120\DSP2833x_headers\cmd\DSP2833x_Headers_nonBIOS.cmd" Settings: "Release"]
+LinkOrder=1
+