Добавлены калибровки для 165
This commit is contained in:
parent
f8c8d84cd1
commit
609150cd76
7
.gitignore
vendored
Normal file
7
.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
/Debug/
|
||||
/UKSSTMS320F28335.CS_/
|
||||
/Debug.lkf
|
||||
/cc_build_Debug.log
|
||||
/UKSSTMS320F28335.map
|
||||
/UKSSTMS320F28335.paf2
|
||||
/UKSSTMS320F28335.sbl
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,7 @@ PHYSICAL MEMORY PARAMETERS
|
||||
|
||||
BOOT LOADER PARAMETERS
|
||||
Table Type: SERIAL PORT (SCI 8 bit Mode)
|
||||
Entry Point: 0x0000b747
|
||||
Entry Point: 0x0000b74f
|
||||
|
||||
|
||||
OUTPUT TRANSLATION MAP
|
||||
@ -21,9 +21,9 @@ OUTPUT TRANSLATION MAP
|
||||
--------------------------------------------------------------------------------
|
||||
OUTPUT FILES: D:\project2833\GIT\Balsam_166\bin\UKSSTMS320F28335.bin [b0..b7]
|
||||
|
||||
CONTENTS: 00000000..00007961 BOOT TABLE
|
||||
.cinit : dest=0000b8d7 size=00000262 width=00000002
|
||||
.text : dest=00008000 size=000038d7 width=00000002
|
||||
CONTENTS: 00000000..00007971 BOOT TABLE
|
||||
.cinit : dest=0000b8df size=00000262 width=00000002
|
||||
.text : dest=00008000 size=000038df width=00000002
|
||||
ramfuncs : dest=0000c15d size=00000023 width=00000002
|
||||
.econst : dest=0000c000 size=00000112 width=00000002
|
||||
.switch : dest=0000c112 size=00000028 width=00000002
|
||||
|
||||
Binary file not shown.
BIN
Bin/UKSS_BALSAM_164.bin
Normal file
BIN
Bin/UKSS_BALSAM_164.bin
Normal file
Binary file not shown.
BIN
Bin/UKSS_BALSAM_165.bin
Normal file
BIN
Bin/UKSS_BALSAM_165.bin
Normal file
Binary file not shown.
BIN
Bin/UKSS_BALSAM_166.bin
Normal file
BIN
Bin/UKSS_BALSAM_166.bin
Normal file
Binary file not shown.
@ -13,6 +13,21 @@
|
||||
1281, 1272, 0, 0, 2049, 2050, 2749, 2750 };
|
||||
#endif //---------------------------------------------------------------------
|
||||
|
||||
#if BALSAM == 165 //-------------------------------------------------------------
|
||||
int def_cal[][8] = {
|
||||
|
||||
// Ñèëîâîé UA1 UB1 UA2 UB2 300 1 300 2 400 1 400 2
|
||||
5130, 4960, 4925, 5070, 1881, 1881, 2506, 2516, // Áîðò 0
|
||||
5020, 5040, 4950, 5030, 1871, 1879, 2507, 2514, // Áîðò 1
|
||||
|
||||
// ÓÌÏ UA UC IA IC 20mA O 4mA O 20mA I 4mA I
|
||||
3890, 3865, 5100, 4850, 1730, 675, 854, 14, // Áîðò 0
|
||||
3845, 3800, 3250, 3100, 1044, 0, 860, 17, // Áîðò 1
|
||||
|
||||
// ÂÝÏ 380Ô1 380Ô2 300 1 300 2 400 1 400 2
|
||||
1289, 1280, 0, 0, 2073, 2071, 2773, 2771 };
|
||||
#endif //---------------------------------------------------------------------
|
||||
|
||||
#if BALSAM == 164 //-------------------------------------------------------------
|
||||
int def_cal[][8] = {
|
||||
|
||||
|
||||
@ -1,7 +1,17 @@
|
||||
#ifndef PACKAGE
|
||||
#define PACKAGE
|
||||
|
||||
#define BALSAM 166
|
||||
#define BALSAM 164
|
||||
|
||||
#if BALSAM == 166
|
||||
#define OBOROT REVERSE
|
||||
#endif
|
||||
#if BALSAM == 165
|
||||
#define OBOROT STRAIGHT
|
||||
#endif
|
||||
#if BALSAM == 164
|
||||
#define OBOROT REVERSE
|
||||
#endif
|
||||
|
||||
#define ONBOARDCALIBER
|
||||
#define TERMOPAIR 14
|
||||
|
||||
@ -29,8 +29,8 @@ int period_ready, period_blink;
|
||||
FLAG chk,sig;
|
||||
long time_1_5sec, time_5msec, time_5sec;
|
||||
|
||||
int READY = 1 * ADC_FREQ;
|
||||
int WAKE = 3 * ADC_FREQ;
|
||||
int READY = 100;
|
||||
int WAKE = 5 * ADC_FREQ;
|
||||
|
||||
long low_count[2] = {0,0};
|
||||
long err_count[6];
|
||||
@ -362,6 +362,7 @@ void Init_packMask()
|
||||
Maska[m_SLOW][7]|= 0x0F00; // Êàëèáðîâêà òåðìîäàò÷èêîâ
|
||||
if(Kurrent)
|
||||
{ Maska[m_SLOW][7]|= 0x000F; // Íîëü äàò÷èêîâ íàïðàæåíèà
|
||||
Maska[m_SLOW][7]|= 0x00F0; // Êàëèáðîâêà äàò÷èêîâ íàïðàæåíèà
|
||||
Maska[m_FAST][6]|= 0x3F00; // Ôàçíûå çíà÷åíèà
|
||||
}
|
||||
|
||||
@ -374,9 +375,6 @@ void Init_packMask()
|
||||
Maska[m_FAST][1]|= 0x0001; // Äèñêðåòíûå âõîäû
|
||||
Maska[m_SLOW][6]|= 0x0007; // ßðêîñòü ëàìï è ïåðèîäû ïîñûëîê
|
||||
Maska[m_SLOW][7]|= 0xE000; // Àäðåñ, êîìàíäû, è ÷òîá íå âûëàçèëî
|
||||
|
||||
Maska[1][6] = 0xF3FF;
|
||||
Maska[1][7] = 0xC03F;
|
||||
}
|
||||
|
||||
int er_anal(int term, long * count, long edge, int pre)
|
||||
@ -547,7 +545,6 @@ modbus[0x68+fazz+2] = lev_count[thrd];
|
||||
error.bit.Over = 1;
|
||||
} }
|
||||
|
||||
|
||||
if(chan==1)
|
||||
if(error.all)
|
||||
if(!no_write)
|
||||
@ -571,9 +568,6 @@ Log_to_mem(error.all);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if(!WAKE)
|
||||
reset_errs(sens,error);
|
||||
}
|
||||
|
||||
@ -96,8 +96,13 @@ interrupt void cpu_timer1_isr_PULT(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
#if OBOROT == STRAIGHT
|
||||
if(cownt == 0) kanal_Send(0,modbus[0],1);
|
||||
if(cownt == 1) kanal_Send(1,modbus[1],1);
|
||||
#else
|
||||
if(cownt == 0) kanal_Send(0,modbus[1],1);
|
||||
if(cownt == 1) kanal_Send(1,modbus[0],1);
|
||||
#endif
|
||||
kanal_Send(2,modbus[2] & light,0);
|
||||
if(cownt == 2) kanal_Send(3,modbus[3],0);
|
||||
} }
|
||||
|
||||
1173
UKSSTMS320F28335.map
1173
UKSSTMS320F28335.map
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,73 +0,0 @@
|
||||
; 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
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user