dplimin
/
F203
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beta

main
dplimin 2023-12-19 15:16:42 +03:00
parent c450c4706c
commit 6d771f1407
6 changed files with 31529 additions and 32263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/my.h
View File

@ -463,7 +463,7 @@ typedef enum
Sens_4, Val_4, Kikdt_4, Kikt_4, Kiks_4, Kikd_4, Kike_4, Kpt_4 Sens_4, Val_4, Kikdt_4, Kikt_4, Kiks_4, Kikd_4, Kike_4, Kpt_4
} pSettingsMenupos; } pSettingsMenupos;
typedef enum { Accel = 0, Velocity, Pascal, k_Pascal, M_Pascal, Nython, k_Nuthon, pQ, mV } typeVALUE; typedef enum { Accel = 0, Velocity, Pascal, k_Pascal, M_Pascal, Nython, k_Nuthon, pQ_mV } typeVALUE;
typedef enum { Ch1 = 0, Ch2, Ch3, Ch4, Ch5, Ch6, Ch7, Ch8, Ch9, Ch10, Ch11, Ch12, Ch13, Ch14, Ch15, Ch16 } typeCHANNEL; typedef enum { Ch1 = 0, Ch2, Ch3, Ch4, Ch5, Ch6, Ch7, Ch8, Ch9, Ch10, Ch11, Ch12, Ch13, Ch14, Ch15, Ch16 } typeCHANNEL;
typedef enum typedef enum
{ {

59
Core/Src/keys.c
View File

@ -346,7 +346,7 @@ uint16_t last_val, last_iin;
last_iin = pardata.amplif[Ch4].IIN; last_iin = pardata.amplif[Ch4].IIN;
last_val = pardata.amplif[Ch4].VAL; last_val = pardata.amplif[Ch4].VAL;
if(pardata.amplif[Ch4].VAL < mV) if(pardata.amplif[Ch4].VAL < pQ_mV)
{ {
if(pardata.amplif[Ch4].IIN < ICP) if(pardata.amplif[Ch4].IIN < ICP)
pardata.amplif[Ch4].IIN++; pardata.amplif[Ch4].IIN++;
@ -382,7 +382,7 @@ uint16_t last_val, last_iin;
last_iin = pardata.amplif[Ch3].IIN; last_iin = pardata.amplif[Ch3].IIN;
last_val = pardata.amplif[Ch3].VAL; last_val = pardata.amplif[Ch3].VAL;
if(pardata.amplif[Ch3].VAL < mV) if(pardata.amplif[Ch3].VAL < pQ_mV)
{ {
if(pardata.amplif[Ch3].IIN < ICP) if(pardata.amplif[Ch3].IIN < ICP)
pardata.amplif[Ch3].IIN++; pardata.amplif[Ch3].IIN++;
@ -418,7 +418,7 @@ uint16_t last_val, last_iin;
last_iin = pardata.amplif[Ch2].IIN; last_iin = pardata.amplif[Ch2].IIN;
last_val = pardata.amplif[Ch4].VAL; last_val = pardata.amplif[Ch4].VAL;
if(pardata.amplif[Ch2].VAL < mV) if(pardata.amplif[Ch2].VAL < pQ_mV)
{ {
if(pardata.amplif[Ch2].IIN < ICP) if(pardata.amplif[Ch2].IIN < ICP)
pardata.amplif[Ch2].IIN++; pardata.amplif[Ch2].IIN++;
@ -454,7 +454,7 @@ uint16_t last_val, last_iin;
last_iin = pardata.amplif[Ch1].IIN; last_iin = pardata.amplif[Ch1].IIN;
last_val = pardata.amplif[Ch1].VAL; last_val = pardata.amplif[Ch1].VAL;
if(pardata.amplif[Ch1].VAL < mV) if(pardata.amplif[Ch1].VAL < pQ_mV)
{ {
if(pardata.amplif[Ch1].IIN < ICP) if(pardata.amplif[Ch1].IIN < ICP)
pardata.amplif[Ch1].IIN++; pardata.amplif[Ch1].IIN++;
@ -736,7 +736,7 @@ uint16_t last_val, last_iin;
else else
{ {
pardata.amplif[Ch1].IIN = ICP; pardata.amplif[Ch1].IIN = ICP;
pardata.amplif[Ch1].VAL = mV; pardata.amplif[Ch1].VAL = pQ_mV;
} }
if(WriteChannel(Ch1)) if(WriteChannel(Ch1))
@ -772,7 +772,7 @@ uint16_t last_val, last_iin;
else else
{ {
pardata.amplif[Ch2].IIN = ICP; pardata.amplif[Ch2].IIN = ICP;
pardata.amplif[Ch2].VAL = mV; pardata.amplif[Ch2].VAL = pQ_mV;
} }
if(WriteChannel(Ch2)) if(WriteChannel(Ch2))
@ -808,7 +808,7 @@ uint16_t last_val, last_iin;
else else
{ {
pardata.amplif[Ch3].IIN = ICP; pardata.amplif[Ch3].IIN = ICP;
pardata.amplif[Ch3].VAL = mV; pardata.amplif[Ch3].VAL = pQ_mV;
} }
if(WriteChannel(Ch3)) if(WriteChannel(Ch3))
@ -844,7 +844,7 @@ uint16_t last_val, last_iin;
else else
{ {
pardata.amplif[Ch4].IIN = ICP; pardata.amplif[Ch4].IIN = ICP;
pardata.amplif[Ch4].VAL = mV; pardata.amplif[Ch4].VAL = pQ_mV;
} }
if(WriteChannel(Ch4)) if(WriteChannel(Ch4))
@ -2632,6 +2632,7 @@ uint32_t s, ikdt, ikt, iks, ikd, ike, ipt;
void VerifyGain(float32_t sens) void VerifyGain(float32_t sens)
{ {
return; //!!!Îòêëþ÷èë
if(sens <= 0.0010f) //0.001 if(sens <= 0.0010f) //0.001
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1000) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1000)
@ -2640,15 +2641,17 @@ void VerifyGain(float32_t sens)
} }
} }
else else
if(/*sens >= 0.0011f && */sens <= 10.000f) //0.002 if(sens <= 10.000f) //0.002
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1000) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1000)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku1000; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku1000;
} }
} }
/*
else else
if(/*sens >= 10.001f && */sens <= 20.000f) //20 if(sens <= 20.000f) //20
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku500) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku500)
{ {
@ -2656,23 +2659,27 @@ void VerifyGain(float32_t sens)
} }
} }
else else
if(/*sens >= 20.001f && */sens <= 50.000f) //50 if(sens <= 50.000f) //50
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku200) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku200)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku200; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku200;
} }
} }
*/
else else
if(/*sens >= 50.001f && */sens <= 100.00f) //100 if(sens <= 100.00f) //100
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku100) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku100)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku100; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku100;
} }
} }
/*
else else
if(/*sens >= 100.01f && */sens <= 200.00f) //200 if(sens <= 200.00f) //200
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku50) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku50)
{ {
@ -2680,23 +2687,27 @@ void VerifyGain(float32_t sens)
} }
} }
else else
if(/*sens >= 200.01f && */sens <= 500.00f) //500 if(sens <= 500.00f) //500
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku20) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku20)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku20; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku20;
} }
} }
*/
else else
if(/*sens >= 500.01f && */sens <= 1000.0f) //1000 if(sens <= 1000.0f) //1000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku10) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku10)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku10; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku10;
} }
} }
/*
else else
if(/*sens >= 1000.01f && */sens <= 2000.0f) //2000 if(sens <= 2000.0f) //2000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku5) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku5)
{ {
@ -2704,23 +2715,28 @@ void VerifyGain(float32_t sens)
} }
} }
else else
if(/*sens >= 2000.01f && */sens <= 5000.0f) //5000 if(sens <= 5000.0f) //5000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku2) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku2)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku2; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku2;
} }
} }
*/
else else
if(/*sens >= 5000.01f && */sens <= 10000.0f) //10000 if(sens <= 10000.0f) //10000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku1)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku1; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku1;
} }
} }
/*
else else
if(/*sens >= 10001.0f && */sens <= 20000.0f) //20000 if(sens <= 20000.0f) //20000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku0_5) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku0_5)
{ {
@ -2728,13 +2744,16 @@ void VerifyGain(float32_t sens)
} }
} }
else else
if(/*sens >= 20001.0f && */sens <= 50000.0f) //50000 if(sens <= 50000.0f) //50000
{ {
if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku0_2) if(pardata.amplif[ACTIVE_CHANNEL].IKU > Ku0_2)
{ {
pardata.amplif[ACTIVE_CHANNEL].IKU = Ku0_2; pardata.amplif[ACTIVE_CHANNEL].IKU = Ku0_2;
} }
} }
*/
else else
if(sens < 100000.0f) //99999 if(sens < 100000.0f) //99999
{ {

418
Core/Src/screen.c
View File

@ -708,7 +708,7 @@ const char *pVAL[2][16] =
}; };
const char *pOUT[9][25] = const char *pOUT[9][33] =
{ {
{ {
"0.0001 ìÂ/ì/c2", "0.0001 ìÂ/ì/c2",
@ -735,7 +735,17 @@ const char *pOUT[9][25] =
"1 Â/ì/c2", "1 Â/ì/c2",
"2 Â/ì/c2", "2 Â/ì/c2",
"5 Â/ì/c2", "5 Â/ì/c2",
"10 Â/ì/c2" "10 Â/ì/c2",
"20 Â/ì/c2",
"50 Â/ì/c2",
"100 Â/ì/c2",
"200 Â/ì/c2",
"500 Â/ì/c2",
"1000 Â/ì/c2",
"2000 Â/ì/c2",
"5000 Â/ì/c2",
"10000 Â/ì/c2",
}, // Accel }, // Accel
{ {
"0.0001 ìÂ/ìì/c", "0.0001 ìÂ/ìì/c",
@ -762,7 +772,16 @@ const char *pOUT[9][25] =
"1 Â/ìì/c", "1 Â/ìì/c",
"2 Â/ìì/c", "2 Â/ìì/c",
"5 Â/ìì/c", "5 Â/ìì/c",
"10 Â/ìì/c" "10 Â/ìì/c",
"20 Â/ìì/c",
"50 Â/ìì/c",
"100 Â/ìì/c",
"200 Â/ìì/c",
"500 Â/ìì/c",
"1000 Â/ìì/c",
"2000 Â/ìì/c",
"5000 Â/ìì/c",
"10000 Â/ìì/c",
}, // Velocity }, // Velocity
{ {
@ -790,7 +809,16 @@ const char *pOUT[9][25] =
"1 Â/Ïà", "1 Â/Ïà",
"2 Â/Ïà", "2 Â/Ïà",
"5 Â/Ïà", "5 Â/Ïà",
"10 Â/Ïà" "10 Â/Ïà",
"20 Â/Ïà",
"50 Â/Ïà",
"100 Â/Ïà",
"200 Â/Ïà",
"500 Â/Ïà",
"1000 Â/Ïà",
"2000 Â/Ïà",
"5000 Â/Ïà",
"10000 Â/Ïà",
}, //Pascal }, //Pascal
{ {
"0.0001 ìÂ/êÏà", "0.0001 ìÂ/êÏà",
@ -817,7 +845,16 @@ const char *pOUT[9][25] =
"1 Â/êÏà", "1 Â/êÏà",
"2 Â/êÏà", "2 Â/êÏà",
"5 Â/êÏà", "5 Â/êÏà",
"10 Â/êÏà" "10 Â/êÏà",
"20 Â/êÏà",
"50 Â/êÏà",
"100 Â/êÏà",
"200 Â/êÏà",
"500 Â/êÏà",
"1000 Â/êÏà",
"2000 Â/êÏà",
"5000 Â/êÏà",
"10000 Â/êÏà",
}, //k_Pascal }, //k_Pascal
{ {
"0.0001 ìÂ/ÌÏà", "0.0001 ìÂ/ÌÏà",
@ -844,7 +881,17 @@ const char *pOUT[9][25] =
"1 Â/ÌÏà", "1 Â/ÌÏà",
"2 Â/ÌÏà", "2 Â/ÌÏà",
"5 Â/ÌÏà", "5 Â/ÌÏà",
"10 Â/ÌÏà" "10 Â/ÌÏà",
"20 Â/ÌÏà",
"50 Â/ÌÏà",
"100 Â/ÌÏà",
"200 Â/ÌÏà",
"500 Â/ÌÏà",
"1000 Â/ÌÏà",
"2000 Â/ÌÏà",
"5000 Â/ÌÏà",
"10000 Â/ÌÏà",
}, //M_Pascal }, //M_Pascal
{ {
"0.0001 ìÂ/Í", "0.0001 ìÂ/Í",
@ -871,7 +918,16 @@ const char *pOUT[9][25] =
"1 Â/Í", "1 Â/Í",
"2 Â/Í", "2 Â/Í",
"5 Â/Í", "5 Â/Í",
"10 Â/Í" "10 Â/Í",
"20 Â/Í",
"50 Â/Í",
"100 Â/Í",
"200 Â/Í",
"500 Â/Í",
"1000 Â/Í",
"2000 Â/Í",
"5000 Â/Í",
"10000 Â/Í",
}, // Nuthon }, // Nuthon
{ {
"0.0001 ìÂ/êÍ", "0.0001 ìÂ/êÍ",
@ -898,7 +954,16 @@ const char *pOUT[9][25] =
"1 Â/êÍ", "1 Â/êÍ",
"2 Â/êÍ", "2 Â/êÍ",
"5 Â/êÍ", "5 Â/êÍ",
"10 Â/êÍ" "10 Â/êÍ",
"20 Â/êÍ",
"50 Â/êÍ",
"100 Â/êÍ",
"200 Â/êÍ",
"500 Â/êÍ",
"1000 Â/êÍ",
"2000 Â/êÍ",
"5000 Â/êÍ",
"10000 Â/êÍ",
}, // k_Nuthon }, // k_Nuthon
{ {
@ -926,7 +991,17 @@ const char *pOUT[9][25] =
"1 Â/ïÊë", "1 Â/ïÊë",
"2 Â/ïÊë", "2 Â/ïÊë",
"5 Â/ïÊë", "5 Â/ïÊë",
"10 Â/ïÊë" "10 Â/ïÊë",
"20 Â/ïÊë",
"50 Â/ïÊë",
"100 Â/ïÊë",
"200 Â/ïÊë",
"500 Â/ïÊë",
"1000 Â/ïÊë",
"2000 Â/ïÊë",
"5000 Â/ïÊë",
"10000 Â/ïÊë",
}, // pQ }, // pQ
{ {
"0.0001 ìÂ/ìÂ", "0.0001 ìÂ/ìÂ",
@ -954,6 +1029,15 @@ const char *pOUT[9][25] =
"2 Â/ìÂ", "2 Â/ìÂ",
"5 Â/ìÂ", "5 Â/ìÂ",
"10 Â/ìÂ" "10 Â/ìÂ"
"20 Â/ìÂ",
"50 Â/ìÂ",
"100 Â/ìÂ",
"200 Â/ìÂ",
"500 Â/ìÂ",
"1000 Â/ìÂ",
"2000 Â/ìÂ",
"5000 Â/ìÂ",
"10000 Â/ìÂ",
}, // mV }, // mV
}; };
@ -985,7 +1069,17 @@ const char *pOUT_ENG[9][25] =
"1 V/m/s2", "1 V/m/s2",
"2 V/m/s2", "2 V/m/s2",
"5 V/m/s2", "5 V/m/s2",
"10 V/m/s2" "10 V/m/s2",
"20 V/m/s2",
"50 V/m/s2",
"100 V/m/s2",
"200 V/m/s2",
"500 V/m/s2",
"1000 V/m/s2",
"2000 V/m/s2",
"5000 V/m/s2",
"10000 V/m/s2",
}, // Accel }, // Accel
{ {
"0.0001 mV/mm/s", "0.0001 mV/mm/s",
@ -1012,7 +1106,16 @@ const char *pOUT_ENG[9][25] =
"1 V/mm/s", "1 V/mm/s",
"2 V/mm/s", "2 V/mm/s",
"5 V/mm/s", "5 V/mm/s",
"10 V/mm/s" "10 V/mm/s",
"20 V/mm/s",
"50 V/mm/s",
"100 V/mm/s",
"200 V/mm/s",
"500 V/mm/s",
"1000 V/mm/s",
"2000 V/mm/s",
"5000 V/mm/s",
"10000 V/mm/s",
}, // Velocity }, // Velocity
{ {
@ -1040,7 +1143,16 @@ const char *pOUT_ENG[9][25] =
"1 V/Pa", "1 V/Pa",
"2 V/Pa", "2 V/Pa",
"5 V/Pa", "5 V/Pa",
"10 V/Pa" "10 V/Pa",
"20 V/Pa",
"50 V/Pa",
"100 V/Pa",
"200 V/Pa",
"500 V/Pa",
"1000 V/Pa",
"2000 V/Pa",
"5000 V/Pa",
"10000 V/Pa",
}, //Pascal }, //Pascal
{ {
"0.0001 mV/kPa", "0.0001 mV/kPa",
@ -1067,7 +1179,16 @@ const char *pOUT_ENG[9][25] =
"1 V/kPa", "1 V/kPa",
"2 V/kPa", "2 V/kPa",
"5 V/kPa", "5 V/kPa",
"10 V/kPa" "10 V/kPa",
"20 V/kPa",
"50 V/kPa",
"100 V/kPa",
"200 V/kPa",
"500 V/kPa",
"1000 V/kPa",
"2000 V/kPa",
"5000 V/kPa",
"10000 V/kPa",
}, //k_Pascal }, //k_Pascal
{ {
"0.0001 mV/MPa", "0.0001 mV/MPa",
@ -1094,7 +1215,16 @@ const char *pOUT_ENG[9][25] =
"1 V/MPa", "1 V/MPa",
"2 V/MPa", "2 V/MPa",
"5 V/MPa", "5 V/MPa",
"10 V/MPa" "10 V/MPa",
"20 V/MPa",
"50 V/MPa",
"100 V/MPa",
"200 V/MPa",
"500 V/MPa",
"1000 V/MPa",
"2000 V/MPa",
"5000 V/MPa",
"10000 V/MPa",
}, //M_Pascal }, //M_Pascal
{ {
"0.0001 mV/N", "0.0001 mV/N",
@ -1121,7 +1251,16 @@ const char *pOUT_ENG[9][25] =
"1 V/N", "1 V/N",
"2 V/N", "2 V/N",
"5 V/N", "5 V/N",
"10 V/N" "10 V/N",
"20 V/N",
"50 V/N",
"100 V/N",
"200 V/N",
"500 V/N",
"1000 V/N",
"2000 V/N",
"5000 V/N",
"10000 V/N",
}, // Nuthon }, // Nuthon
{ {
"0.0001 mV/kN", "0.0001 mV/kN",
@ -1148,7 +1287,16 @@ const char *pOUT_ENG[9][25] =
"1 V/kN", "1 V/kN",
"2 V/kN", "2 V/kN",
"5 V/kN", "5 V/kN",
"10 V/kN" "10 V/kN",
"20 V/kN",
"50 V/kN",
"100 V/kN",
"200 V/kN",
"500 V/kN",
"1000 V/kN",
"2000 V/kN",
"5000 V/kN",
"10000 V/kN",
}, // k_Nuthon }, // k_Nuthon
{ {
@ -1176,7 +1324,17 @@ const char *pOUT_ENG[9][25] =
"1 V/pQ", "1 V/pQ",
"2 V/pQ", "2 V/pQ",
"5 V/pQ", "5 V/pQ",
"10 V/pQ" "10 V/pQ",
"20 V/pQ",
"50 V/pQ",
"100 V/pQ",
"200 V/pQ",
"500 V/pQ",
"1000 V/pQ",
"2000 V/pQ",
"5000 V/pQ",
"10000 V/pQ",
}, // pQ }, // pQ
{ {
"0.0001 mV/mV", "0.0001 mV/mV",
@ -1203,7 +1361,16 @@ const char *pOUT_ENG[9][25] =
"1 V/mV", "1 V/mV",
"2 V/mV", "2 V/mV",
"5 V/mV", "5 V/mV",
"10 V/mV" "10 V/mV",
"20 V/mV",
"50 V/mV",
"100 V/mV",
"200 V/mV",
"500 V/mV",
"1000 V/mV",
"2000 V/mV",
"5000 V/mV",
"10000 V/mV",
}, // mV }, // mV
}; };
@ -4037,150 +4204,55 @@ char *p8;
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
if(pardata.amplif[ch].SENS <= 0.0010f) //0.001 if((pardata.amplif[ch].SENS >= 0.0010f)&&(pardata.amplif[ch].SENS < 0.001f)) //0.001
{ {
out = pardata.amplif[ch].IKU; out = pardata.amplif[ch].IKU;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0011f && */pardata.amplif[ch].SENS <= 0.0020f) //0.002 if((pardata.amplif[ch].SENS >= 0.0010f)&&(pardata.amplif[ch].SENS < 0.010f)) //0.001
{ {
out = pardata.amplif[ch].IKU + 1; out = pardata.amplif[ch].IKU;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0021f && */pardata.amplif[ch].SENS <= 0.0050f) //0.005 if((pardata.amplif[ch].SENS>=0.01f)&&(pardata.amplif[ch].SENS<0.1f)) //0.002
{
out = pardata.amplif[ch].IKU + 2;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0051f && */pardata.amplif[ch].SENS <= 0.0100f) //0.01
{ {
out = pardata.amplif[ch].IKU +3; out = pardata.amplif[ch].IKU +3;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0101f && */pardata.amplif[ch].SENS <= 0.0200f) //0.02 if((pardata.amplif[ch].SENS>=0.1f)&&(pardata.amplif[ch].SENS<1.0f)) //0.005
{
out = pardata.amplif[ch].IKU + 4;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0201f && */pardata.amplif[ch].SENS <= 0.0500f) //0.05
{
out = pardata.amplif[ch].IKU + 5;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0501f && */pardata.amplif[ch].SENS <= 0.1000f) //0.1
{ {
out = pardata.amplif[ch].IKU + 6; out = pardata.amplif[ch].IKU + 6;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.1001f && */pardata.amplif[ch].SENS <= 0.2000f) //0.2 if((pardata.amplif[ch].SENS>=1.0f)&&(pardata.amplif[ch].SENS<10.0f)) //0.01
{
out = pardata.amplif[ch].IKU + 7;
}
else
if(/*pardata.amplif[ch].SENS >= 0.2001f && */pardata.amplif[ch].SENS <= 0.5000f) //0.5
{
out = pardata.amplif[ch].IKU + 8;
}
else
if(/*pardata.amplif[ch].SENS >= 0.5001f && */pardata.amplif[ch].SENS <= 1.0000f) //1
{ {
out = pardata.amplif[ch].IKU + 9; out = pardata.amplif[ch].IKU + 9;
} }
else else
if(/*pardata.amplif[ch].SENS >= 1.0001f && */pardata.amplif[ch].SENS <= 2.0000f) //2 if((pardata.amplif[ch].SENS>=10.0f)&&(pardata.amplif[ch].SENS<100.0f)) //0.02
{
out = pardata.amplif[ch].IKU + 10;
}
else
if(/*pardata.amplif[ch].SENS >= 2.0001f && */pardata.amplif[ch].SENS <= 5.0000f) //5
{
out = pardata.amplif[ch].IKU + 11;
}
else
if(/*pardata.amplif[ch].SENS >= 5.0001f && */pardata.amplif[ch].SENS <= 10.000f) //10
{ {
out = pardata.amplif[ch].IKU + 12; out = pardata.amplif[ch].IKU + 12;
} }
else else
if(/*pardata.amplif[ch].SENS >= 10.001f && */pardata.amplif[ch].SENS <= 20.000f) //20 if((pardata.amplif[ch].SENS>=100.0f)&&(pardata.amplif[ch].SENS<1000.0f)) //0.05
{
out = pardata.amplif[ch].IKU + 13;
}
else
if(/*pardata.amplif[ch].SENS >= 20.001f && */pardata.amplif[ch].SENS <= 50.000f) //50
{
out = pardata.amplif[ch].IKU + 14;
}
else
if(/*pardata.amplif[ch].SENS >= 50.001f && */pardata.amplif[ch].SENS <= 100.00f) //100
{ {
out = pardata.amplif[ch].IKU + 15; out = pardata.amplif[ch].IKU + 15;
} }
else else
if(/*pardata.amplif[ch].SENS >= 100.01f && */pardata.amplif[ch].SENS <= 200.00f) //200 if((pardata.amplif[ch].SENS >= 1000.0f)&&(pardata.amplif[ch].SENS<10000.0f)) //0.1
{
out = pardata.amplif[ch].IKU + 16;
}
else
if(/*pardata.amplif[ch].SENS >= 200.01f && */pardata.amplif[ch].SENS <= 500.00f) //500
{
out = pardata.amplif[ch].IKU + 17;
}
else
if(/*pardata.amplif[ch].SENS >= 500.01f && */pardata.amplif[ch].SENS <= 1000.0f) //1000
{ {
out = pardata.amplif[ch].IKU + 18; out = pardata.amplif[ch].IKU + 18;
} }
else else
if(/*pardata.amplif[ch].SENS >= 1000.1f && */pardata.amplif[ch].SENS <= 2000.0f) //2000 if((pardata.amplif[ch].SENS >= 10000.0f)&&(pardata.amplif[ch].SENS < 100000.0f)) //0.2
{
out = pardata.amplif[ch].IKU + 19;
}
else
if(/*pardata.amplif[ch].SENS >= 2000.1f && */pardata.amplif[ch].SENS <= 5000.0f) //2000
{
out = pardata.amplif[ch].IKU + 20;
}
else
if(/*pardata.amplif[ch].SENS >= 5000.1f && */pardata.amplif[ch].SENS <= 10000.0f) //10000
{ {
out = pardata.amplif[ch].IKU + 21; out = pardata.amplif[ch].IKU + 21;
} }
else
if(/*pardata.amplif[ch].SENS >= 10001 && */pardata.amplif[ch].SENS <= 20000.0f) //20000
{
out = pardata.amplif[ch].IKU + 22;
}
else
if(/*pardata.amplif[ch].SENS >= 20001 && */pardata.amplif[ch].SENS <= 50000.0f) //50000
{
out = pardata.amplif[ch].IKU + 23;
}
else
if(/*pardata.amplif[ch].SENS >= 50001 && */pardata.amplif[ch].SENS <= 100000) //100000
{
out = pardata.amplif[ch].IKU + 24;
}
} }
void DrawChannel_4(uint8_t ch, uint32_t blk) void DrawChannel_4(uint8_t ch, uint32_t blk)
{ {
uint32_t i, j, k, s, ikdt, ikt, iks, ikd, ike, ipt, out; uint32_t i, j, k, s, ikdt, ikt, iks, ikd, ike, ipt, out;
@ -4249,130 +4321,50 @@ char *p8;
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
if(pardata.amplif[ch].SENS <= 0.0010f) //0.001 if((pardata.amplif[ch].SENS >= 0.0010f)&&(pardata.amplif[ch].SENS < 0.001f)) //0.001
{ {
out = pardata.amplif[ch].IKU; out = pardata.amplif[ch].IKU;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0011f && */pardata.amplif[ch].SENS <= 0.0020f) //0.002 if((pardata.amplif[ch].SENS >= 0.0010f)&&(pardata.amplif[ch].SENS < 0.010f)) //0.001
{ {
out = pardata.amplif[ch].IKU + 1; out = pardata.amplif[ch].IKU;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0021f && */pardata.amplif[ch].SENS <= 0.0050f) //0.005 if((pardata.amplif[ch].SENS>=0.01f)&&(pardata.amplif[ch].SENS<0.1f)) //0.002
{
out = pardata.amplif[ch].IKU + 2;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0051f && */pardata.amplif[ch].SENS <= 0.0100f) //0.01
{ {
out = pardata.amplif[ch].IKU +3; out = pardata.amplif[ch].IKU +3;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.0101f && */pardata.amplif[ch].SENS <= 0.0200f) //0.02 if((pardata.amplif[ch].SENS>=0.1f)&&(pardata.amplif[ch].SENS<1.0f)) //0.005
{
out = pardata.amplif[ch].IKU + 4;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0201f && */pardata.amplif[ch].SENS <= 0.0500f) //0.05
{
out = pardata.amplif[ch].IKU + 5;
}
else
if(/*pardata.amplif[ch].SENS >= 0.0501f && */pardata.amplif[ch].SENS <= 0.1000f) //0.1
{ {
out = pardata.amplif[ch].IKU + 6; out = pardata.amplif[ch].IKU + 6;
} }
else else
if(/*pardata.amplif[ch].SENS >= 0.1001f && */pardata.amplif[ch].SENS <= 0.2000f) //0.2 if((pardata.amplif[ch].SENS>=1.0f)&&(pardata.amplif[ch].SENS<10.0f)) //0.01
{
out = pardata.amplif[ch].IKU + 7;
}
else
if(/*pardata.amplif[ch].SENS >= 0.2001f && */pardata.amplif[ch].SENS <= 0.5000f) //0.5
{
out = pardata.amplif[ch].IKU + 8;
}
else
if(/*pardata.amplif[ch].SENS >= 0.5001f && */pardata.amplif[ch].SENS <= 1.0000f) //1
{ {
out = pardata.amplif[ch].IKU + 9; out = pardata.amplif[ch].IKU + 9;
} }
else else
if(/*pardata.amplif[ch].SENS >= 1.0001f && */pardata.amplif[ch].SENS <= 2.0000f) //2 if((pardata.amplif[ch].SENS>=10.0f)&&(pardata.amplif[ch].SENS<100.0f)) //0.02
{
out = pardata.amplif[ch].IKU + 10;
}
else
if(/*pardata.amplif[ch].SENS >= 2.0001f && */pardata.amplif[ch].SENS <= 5.0000f) //5
{
out = pardata.amplif[ch].IKU + 11;
}
else
if(/*pardata.amplif[ch].SENS >= 5.0001f && */pardata.amplif[ch].SENS <= 10.000f) //10
{ {
out = pardata.amplif[ch].IKU + 12; out = pardata.amplif[ch].IKU + 12;
} }
else else
if(/*pardata.amplif[ch].SENS >= 10.001f && */pardata.amplif[ch].SENS <= 20.000f) //20 if((pardata.amplif[ch].SENS>=100.0f)&&(pardata.amplif[ch].SENS<1000.0f)) //0.05
{
out = pardata.amplif[ch].IKU + 13;
}
else
if(/*pardata.amplif[ch].SENS >= 20.001f && */pardata.amplif[ch].SENS <= 50.000f) //50
{
out = pardata.amplif[ch].IKU + 14;
}
else
if(/*pardata.amplif[ch].SENS >= 50.001f && */pardata.amplif[ch].SENS <= 100.00f) //100
{ {
out = pardata.amplif[ch].IKU + 15; out = pardata.amplif[ch].IKU + 15;
} }
else else
if(/*pardata.amplif[ch].SENS >= 100.01f && */pardata.amplif[ch].SENS <= 200.00f) //200 if((pardata.amplif[ch].SENS >= 1000.0f)&&(pardata.amplif[ch].SENS<10000.0f)) //0.1
{
out = pardata.amplif[ch].IKU + 16;
}
else
if(/*pardata.amplif[ch].SENS >= 200.01f && */pardata.amplif[ch].SENS <= 500.00f) //500
{
out = pardata.amplif[ch].IKU + 17;
}
else
if(/*pardata.amplif[ch].SENS >= 500.01f && */pardata.amplif[ch].SENS <= 1000.0f) //1000
{ {
out = pardata.amplif[ch].IKU + 18; out = pardata.amplif[ch].IKU + 18;
} }
else else
if(/*pardata.amplif[ch].SENS >= 1000.1f && */pardata.amplif[ch].SENS <= 2000.0f) //2000 if((pardata.amplif[ch].SENS >= 10000.0f)&&(pardata.amplif[ch].SENS < 100000.0f)) //0.2
{
out = pardata.amplif[ch].IKU + 19;
}
else
if(/*pardata.amplif[ch].SENS >= 2000.1f && */pardata.amplif[ch].SENS <= 5000.0f) //2000
{
out = pardata.amplif[ch].IKU + 20;
}
else
if(/*pardata.amplif[ch].SENS >= 5000.1f && */pardata.amplif[ch].SENS <= 10000.0f) //10000
{ {
out = pardata.amplif[ch].IKU + 21; out = pardata.amplif[ch].IKU + 21;
} }
else
if(/*pardata.amplif[ch].SENS >= 10001 && */pardata.amplif[ch].SENS <= 20000.0f) //20000
{
out = pardata.amplif[ch].IKU + 22;
}
else
if(/*pardata.amplif[ch].SENS >= 20001 && */pardata.amplif[ch].SENS <= 50000.0f) //50000
{
out = pardata.amplif[ch].IKU + 23;
}
else
if(/*pardata.amplif[ch].SENS >= 50001 && */pardata.amplif[ch].SENS <= 100000) //100000
{
out = pardata.amplif[ch].IKU + 24;
}
LCD_SetColors(LCD_COLOR_ORANGE, LCD_COLOR_BLACK); LCD_SetColors(LCD_COLOR_ORANGE, LCD_COLOR_BLACK);
BSP_LCD_DisplayStringAt(XPOS_INPUT_4[ch] + 5, YPOS_INPUT_4[ch], str, LEFT_MODE); BSP_LCD_DisplayStringAt(XPOS_INPUT_4[ch] + 5, YPOS_INPUT_4[ch], str, LEFT_MODE);

60448
Debug/F203 VER 4.list
View File

File diff suppressed because it is too large Load Diff

2311
Debug/F203 VER 4.map
View File

File diff suppressed because it is too large Load Diff

20
F203 VER 4.elf.launch
View File

@ -12,30 +12,30 @@
<intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_irpre" value="0"/> <intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_irpre" value="0"/>
<intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_pos" value="0"/> <intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_pos" value="0"/>
<stringAttribute key="com.atollic.hardwaredebug.jlink_common.selected_rtos" value="No RTOS"/> <stringAttribute key="com.atollic.hardwaredebug.jlink_common.selected_rtos" value="No RTOS"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.enable_live_expr" value="true"/>
<intAttribute key="com.atollic.hardwaredebug.launch.formatVersion" value="2"/> <intAttribute key="com.atollic.hardwaredebug.launch.formatVersion" value="2"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.hwinitCommands" value="# Initialize your hardware here&#10;"/> <stringAttribute key="com.atollic.hardwaredebug.launch.hwinitCommands" value="# Initialize your hardware here&#10;"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.initCommands" value=""/> <stringAttribute key="com.atollic.hardwaredebug.launch.initCommands" value=""/>
<stringAttribute key="com.atollic.hardwaredebug.launch.ipAddress" value="localhost"/> <stringAttribute key="com.atollic.hardwaredebug.launch.ipAddress" value="localhost"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.jtagDevice" value="SEGGER J-LINK"/> <stringAttribute key="com.atollic.hardwaredebug.launch.jtagDevice" value="ST-LINK"/>
<intAttribute key="com.atollic.hardwaredebug.launch.portNumber" value="2331"/> <intAttribute key="com.atollic.hardwaredebug.launch.portNumber" value="61234"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.remoteCommand" value="target extended-remote"/> <stringAttribute key="com.atollic.hardwaredebug.launch.remoteCommand" value="target extended-remote"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.runCommands" value="# Default GDB command file (FLASH) for SEGGER J-LINK and STMicroelectronics STM32F767ZI microcontroller.&#10;&#10;# Set character encoding&#10;set host-charset CP1252&#10;set target-charset CP1252&#10;&#10;# Set JTAG speed to 30 kHz&#10;monitor speed 30&#10;&#10;# Set GDBServer to little endian&#10;monitor endian little&#10;&#10;# Reset the chip to get to a known state.&#10;monitor reset&#10;&#10;# Set auto JTAG speed&#10;monitor speed auto&#10;&#10;# Setup GDB FOR FASTER DOWNLOADS&#10;set remote memory-write-packet-size 1024&#10;set remote memory-write-packet-size fixed&#10;&#10;# Enable flash download&#10;monitor flash download = 1&#10;&#10;# Load the program executable&#10;load&#9;&#9;&#10;&#10;# Reset the chip to get to a known state. Remove &quot;monitor reset&quot; command &#10;# if the code is not located at default address and does not run by reset. &#10;monitor reset&#10;# Set a breakpoint at main().&#10;tbreak main&#10;&#10;# Run to the breakpoint.&#10;continue"/> <stringAttribute key="com.atollic.hardwaredebug.launch.runCommands" value="# Set flash parallelism mode to 32, 16, or 8 bit when using STM32 F2/F4 microcontrollers&#10;# Uncomment next line, 2=32 bit, 1=16 bit and 0=8 bit parallelism mode&#10;#monitor flash set_parallelism_mode 2&#10;&#10;# Set character encoding&#10;set host-charset CP1252&#10;set target-charset CP1252&#10;&#10;# Reset to known state&#10;monitor reset&#10;&#10;# Load the program executable&#10;load&#9;&#9;&#10;&#10;# Reset the chip to get to a known state. Remove &quot;monitor reset&quot; command &#10;# if the code is not located at default address and does not run by reset. &#10;monitor reset&#10;&#10;# Enable Debug connection in low power modes (DBGMCU-&gt;CR)&#10;set *0xE0042004 = (*0xE0042004) | 0x7&#10;# Set a breakpoint at main().&#10;tbreak main&#10;&#10;# Run to the breakpoint.&#10;continue"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.serverParam" value="-port 2331 -s -CPU Cortex-M -device STM32F767ZI -endian little -speed 4000 -if swd -select USB=51006446 -vd"/> <stringAttribute key="com.atollic.hardwaredebug.launch.serverParam" value="-p 61234 -l 1 -d -s -i 0666FF525171494867103125 -cp &quot;C:\Program Files (x86)\Atollic\TrueSTUDIO for STM32 9.1.0\Servers\STM32CubeProgrammer\bin&quot;"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.startServer" value="true"/> <booleanAttribute key="com.atollic.hardwaredebug.launch.startServer" value="true"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.swd_mode" value="true"/> <booleanAttribute key="com.atollic.hardwaredebug.launch.swd_mode" value="true"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.swv_port" value="2332"/> <stringAttribute key="com.atollic.hardwaredebug.launch.swv_port" value="61235"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_div" value="0"/> <stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_div" value="8"/>
<stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_hclk" value="8000000"/> <stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_hclk" value="8000000"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.swv_wait_for_sync" value="true"/>
<intAttribute key="com.atollic.hardwaredebug.launch.trace_system" value="0"/> <intAttribute key="com.atollic.hardwaredebug.launch.trace_system" value="0"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.useRemoteTarget" value="true"/> <booleanAttribute key="com.atollic.hardwaredebug.launch.useRemoteTarget" value="true"/>
<booleanAttribute key="com.atollic.hardwaredebug.launch.verify_flash_download" value="true"/> <booleanAttribute key="com.atollic.hardwaredebug.launch.verify_flash_download" value="true"/>
<booleanAttribute key="com.atollic.hardwaredebug.stlink.enable_external_loader" value="false"/> <booleanAttribute key="com.atollic.hardwaredebug.stlink.enable_external_loader" value="false"/>
<booleanAttribute key="com.atollic.hardwaredebug.stlink.enable_logging" value="false"/> <booleanAttribute key="com.atollic.hardwaredebug.stlink.enable_logging" value="false"/>
<stringAttribute key="com.atollic.hardwaredebug.stlink.external_loader" value=""/> <stringAttribute key="com.atollic.hardwaredebug.stlink.external_loader" value=""/>
<stringAttribute key="com.atollic.hardwaredebug.stlink.log_file" value="D:\My Work\A141\Device\F203\F203 VER 4\Debug\st-link_gdbserver_log.txt"/> <stringAttribute key="com.atollic.hardwaredebug.stlink.log_file" value="C:\Works\F203 VER 4\Debug\st-link_gdbserver_log.txt"/>
<booleanAttribute key="com.atollic.hardwaredebug.stlink.stlink_check_serial_number" value="false"/> <booleanAttribute key="com.atollic.hardwaredebug.stlink.stlink_check_serial_number" value="true"/>
<stringAttribute key="com.atollic.hardwaredebug.stlink.stlink_txt_serial_number" value=""/> <stringAttribute key="com.atollic.hardwaredebug.stlink.stlink_txt_serial_number" value="0666FF525171494867103125"/>
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-atollic-eabi-gdb"/> <stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-atollic-eabi-gdb"/>
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/> <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/> <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>