Добавлены калибровки для 164

This commit is contained in:
Dimas 2024-06-17 11:26:57 +03:00
parent 4386deba67
commit 05966d0716
12 changed files with 1543 additions and 1527 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
TMS320C2000 Hex Converter v5.2.7
********************************************************************************
INPUT FILE NAME: <E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out>
INPUT FILE NAME: <D:\project2833\GIT\Balsam_166\bin\UKSSTMS320F28335.out>
OUTPUT FORMAT: Binary
PHYSICAL MEMORY PARAMETERS
@ -12,18 +12,18 @@ PHYSICAL MEMORY PARAMETERS
BOOT LOADER PARAMETERS
Table Type: SERIAL PORT (SCI 8 bit Mode)
Entry Point: 0x0000ba07
Entry Point: 0x0000ba56
OUTPUT TRANSLATION MAP
--------------------------------------------------------------------------------
00000000..003fffff Page=0 Memory Width=8 ROM Width=8
--------------------------------------------------------------------------------
OUTPUT FILES: E:\project28335\Balzam_166\bin\UKSSTMS320F28335.bin [b0..b7]
OUTPUT FILES: D:\project2833\GIT\Balsam_166\bin\UKSSTMS320F28335.bin [b0..b7]
CONTENTS: 00000000..00007ef5 BOOT TABLE
.cinit : dest=0000bb99 size=00000262 width=00000002
.text : dest=00008000 size=00003b99 width=00000002
CONTENTS: 00000000..00007f95 BOOT TABLE
.cinit : dest=0000bbe9 size=00000262 width=00000002
.text : dest=00008000 size=00003be9 width=00000002
ramfuncs : dest=0000c13d size=0000002b width=00000002
.econst : dest=0000c000 size=00000112 width=00000002
.switch : dest=0000c168 size=00000028 width=00000002

Binary file not shown.

View File

@ -1,31 +1,31 @@
-z -c -e_c_int00 -m"E:/project28335/Balzam_166/UKSSTMS320F28335.map" -o"E:/project28335/Balzam_166/bin/UKSSTMS320F28335.out" -stack0x3f0 -w -x -i"C:/CCStudio_v3.3PLA/C2000/xdais/lib" -i"C:/CCStudio_v3.3PLA/bios_5_33_05/packages/ti/bios/lib" -i"C:/CCStudio_v3.3PLA/bios_5_33_05/packages/ti/rtdx/lib/c2000" -i"C:/Program Files (x86)/Texas Instruments/C2000 Code Generation Tools 5.2.15/lib" -l"rts2800_fpu32.lib"
"E:\project28335\Balzam_166\F28335.cmd"
"E:\project28335\Balzam_166\Source\External\v120\DSP2833x_headers\cmd\DSP2833x_Headers_nonBIOS.cmd"
"E:\project28335\Balzam_166\Debug\ADC.obj"
"E:\project28335\Balzam_166\Debug\bios.obj"
"E:\project28335\Balzam_166\Debug\cntrl_adr.obj"
"E:\project28335\Balzam_166\Debug\crc16.obj"
"E:\project28335\Balzam_166\Debug\DAC.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_Adc.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_ADC_cal.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_CpuTimers.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_GlobalVariableDefs.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_PieCtrl.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_SWPrioritizedDefaultIsr.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_SWPrioritizedPieVect.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_SysCtrl.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_usDelay.obj"
"E:\project28335\Balzam_166\Debug\DSP2833x_Xintf.obj"
"E:\project28335\Balzam_166\Debug\ecan.obj"
"E:\project28335\Balzam_166\Debug\filter_bat2.obj"
"E:\project28335\Balzam_166\Debug\kanal.obj"
"E:\project28335\Balzam_166\Debug\log_to_mem.obj"
"E:\project28335\Balzam_166\Debug\main.obj"
"E:\project28335\Balzam_166\Debug\measure.obj"
"E:\project28335\Balzam_166\Debug\message.obj"
"E:\project28335\Balzam_166\Debug\peripher.obj"
"E:\project28335\Balzam_166\Debug\pulto.obj"
"E:\project28335\Balzam_166\Debug\RS485.obj"
"E:\project28335\Balzam_166\Debug\spise2p.obj"
"E:\project28335\Balzam_166\Debug\tools.obj"
"E:\project28335\Balzam_166\Libraries\rts2800_fpu32.lib"
-z -c -e_c_int00 -m"D:/project2833/GIT/Balsam_166/UKSSTMS320F28335.map" -o"D:/project2833/GIT/Balsam_166/bin/UKSSTMS320F28335.out" -stack0x3f0 -w -x -i"D:/CCStudio_v3.3PLA/C2000/xdais/lib" -i"D:/CCStudio_v3.3PLA/bios_5_33_05/packages/ti/bios/lib" -i"D:/CCStudio_v3.3PLA/bios_5_33_05/packages/ti/rtdx/lib/c2000" -i"D:/CCStudio_v3.3PLA/C2000/cgtools/lib" -l"rts2800_fpu32.lib"
"D:\project2833\GIT\Balsam_166\F28335.cmd"
"D:\project2833\GIT\Balsam_166\Source\External\v120\DSP2833x_headers\cmd\DSP2833x_Headers_nonBIOS.cmd"
"D:\project2833\GIT\Balsam_166\Debug\ADC.obj"
"D:\project2833\GIT\Balsam_166\Debug\bios.obj"
"D:\project2833\GIT\Balsam_166\Debug\cntrl_adr.obj"
"D:\project2833\GIT\Balsam_166\Debug\crc16.obj"
"D:\project2833\GIT\Balsam_166\Debug\DAC.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_Adc.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_ADC_cal.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_CpuTimers.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_GlobalVariableDefs.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_PieCtrl.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_SWPrioritizedDefaultIsr.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_SWPrioritizedPieVect.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_SysCtrl.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_usDelay.obj"
"D:\project2833\GIT\Balsam_166\Debug\DSP2833x_Xintf.obj"
"D:\project2833\GIT\Balsam_166\Debug\ecan.obj"
"D:\project2833\GIT\Balsam_166\Debug\filter_bat2.obj"
"D:\project2833\GIT\Balsam_166\Debug\kanal.obj"
"D:\project2833\GIT\Balsam_166\Debug\log_to_mem.obj"
"D:\project2833\GIT\Balsam_166\Debug\main.obj"
"D:\project2833\GIT\Balsam_166\Debug\measure.obj"
"D:\project2833\GIT\Balsam_166\Debug\message.obj"
"D:\project2833\GIT\Balsam_166\Debug\peripher.obj"
"D:\project2833\GIT\Balsam_166\Debug\pulto.obj"
"D:\project2833\GIT\Balsam_166\Debug\RS485.obj"
"D:\project2833\GIT\Balsam_166\Debug\spise2p.obj"
"D:\project2833\GIT\Balsam_166\Debug\tools.obj"
"D:\project2833\GIT\Balsam_166\Libraries\rts2800_fpu32.lib"

Binary file not shown.

View File

@ -7,12 +7,27 @@
// ÓÌÏ UA UC IA IC 20mA O 4mA O 20mA I 4mA I
3820, 3790, 3505, 3380, 1718, 673, 854, 14, // Áîðò 0
3810, 3775, 3522, 3332, 1697, 653, 860, 17, // Αξπς 1
3835, 3785, 3522, 3332, 1697, 653, 860, 17, // Áîðò 1
// ÂÝÏ 380Ô1 380Ô2 300 1 300 2 400 1 400 2
1281, 1272, 0, 0, 2049, 2050, 2749, 2750 };
#endif //---------------------------------------------------------------------
#if BALSAM == 164 //-------------------------------------------------------------
int def_cal[][8] = {
// Ñèëîâîé UA1 UB1 UA2 UB2 300 1 300 2 400 1 400 2
7573, 7573, 7573, 7573, 1979, 1888, 2592, 2513, // Áîðò 0
7573, 7573, 7573, 7573, 1970, 1907, 2584, 2558, // Áîðò 1
// ÓÌÏ UA UC IA IC 20mA O 4mA O 20mA I 4mA I
3920, 3905, 3300, 3220, 1015, 0, 854, 14, // Áîðò 0
3835, 3785, 5100, 4600, 1750, 680, 860, 17, // Áîðò 1
// ÂÝÏ 380Ô1 380Ô2 300 1 300 2 400 1 400 2
1266, 1267, 0, 0, 2063, 2040, 2678, 2655 };
#endif //---------------------------------------------------------------------
/*
#if PXXXXX == 1 //-------------------------------------------------------------

View File

@ -60,7 +60,7 @@ typedef union
} FLAG;
#define NOER 0xC000
#define NOER 0xE000//C
#define EROR 0x01FF
#define READY_FREQ (500.0 * 2)// Ãö

View File

@ -87,16 +87,17 @@ float im_calc(float ia,float ib)
void calc_sensor_koef()
{
int i;
float K;
K_T1 = 100.0/(K400_1 - K300_1);
K_T2 = 100.0/(K400_2 - K300_2);
for(i=0;i<4;i++)
{
powK[i] = Caliber[i];
if(sens_type[i]==CURRENT) powK[i]/=1000.0;
else powK[i]/=10000.0;
K = Caliber[i];
if(sens_type[i]==CURRENT) K/=1000.0;
else K/=10000.0;
powK[i] = K;
} }
interrupt void cpu_timer1_isr_SENS(void)
@ -580,7 +581,8 @@ void Temper_count(int chan)
{
float Numb;
static int Temper;
int kun, no_ignor;
int i,j, kun, no_ignor;
long s;
ERROR error;
if(!chan)
@ -606,6 +608,24 @@ void Temper_count(int chan)
return;
}
if(chan<tpl_cans)
if(sens_error[chan].bit.Discr4)
{
j=0;s=0;
for(i=0;i<(tpl_cans-2*(Mode==adr_ENG1));i++)
{
if(!sens_error[i].bit.Bypas)
if(!sens_error[i].bit.Ignor)
if(!sens_error[i].bit.Discr4)
{
s+=adc_table_tpl[i];
j++;
} }
if(j) s/=j;
Numb = s;
}
kun = chan - cal_addr;
if(TermoAD)
@ -648,7 +668,7 @@ void Temper_count(int chan)
if(Desk==dsk_BKSD)
{
sens_data[chan+8] = Numb;
sens_data[chan+8] = adc_table_tpl[chan];
if(chan<6) Numb = (Numb-K100_D)*K100;
else Numb = (Numb-K100_D)*K_50;// - 6.56;
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,25 +0,0 @@
------------------------ UKSSTMS320F28335.pjt - Debug ------------------------
[measure.c] "C:\Program Files (x86)\Texas Instruments\C2000 Code Generation Tools 5.2.15\bin\cl2000" -g -pdsw225 -o0 -fr"E:/project28335/Balzam_166/Debug" -fs"E:/project28335/Balzam_166/Asm" -i"E:/project28335/Balzam_166/Source/External/v120/DSP2833x_headers/include" -i"E:/project28335/Balzam_166/Source/Internal/Include" -i"E:/project28335/Balzam_166/Source/External/v120/DSP2833x_common/include" -d"_DEBUG" -d"LARGE_MODEL" -md -ml -v28 --float_support=fpu32 -@"../../Debug.lkf" "measure.c"
[Linking...] "C:\Program Files (x86)\Texas Instruments\C2000 Code Generation Tools 5.2.15\bin\cl2000" -@"Debug.lkf"
<Linking>
E:\project28335\Balzam_166\bin\hex2000.exe E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out -boot -sci8 -map E:\project28335\Balzam_166\bin\UKSSTMS320F28335.map -o E:\project28335\Balzam_166\bin\UKSSTMS320F28335.hex -i
Translating to Intel format...
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .cinit (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .text (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> ramfuncs (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .econst (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .switch (BOOT LOAD)
E:\project28335\Balzam_166\bin\hex2000.exe E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out -boot -sci8 -map E:\project28335\Balzam_166\bin\UKSSTMS320F28335.map -o E:\project28335\Balzam_166\bin\UKSSTMS320F28335.bin -b
Translating to Binary format...
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .cinit (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .text (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> ramfuncs (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .econst (BOOT LOAD)
"E:\project28335\Balzam_166\bin\UKSSTMS320F28335.out" ==> .switch (BOOT LOAD)
Build Complete,
0 Errors, 0 Warnings, 0 Remarks.
Please view the build output for errors and warnings for any custom steps.