Compare commits

..

3 Commits

Author SHA1 Message Date
weiting2 9f33098b52 update rec cali data 2021-01-21 17:39:55 +08:00
weiting2 dd9f64662e update rec cali data 2021-01-21 17:32:06 +08:00
weiting2 a80ab9a72f E7DA special version, update cali and its formula 2021-01-21 17:14:12 +08:00
3 changed files with 81 additions and 71 deletions
@@ -2,7 +2,7 @@
#ifndef NEU_CALI_TABLE
#define NEU_CALI_TABLE
#define BOARD_TEST
#define BOARD_A4_DA_32_D4_E7_DA
typedef struct _SingleChannelCali{
uint16_t Gain[4];
@@ -1673,70 +1673,70 @@ struct _CaliTable{
#elif defined(BOARD_A4_DA_32_D4_E7_DA)
{
.DeviceName = "BOARD_A4_DA_32_D4_E7_DA",
.Ch[0].Gain[0] = 49,
.Ch[0].Offset[0] = -13,
.Ch[1].Gain[0] = 49,
.Ch[0].Gain[0] = 48,
.Ch[0].Offset[0] = -14,
.Ch[1].Gain[0] = 48,
.Ch[1].Offset[0] = 26,
.Ch[2].Gain[0] = 49,
.Ch[2].Offset[0] = -14,
.Ch[3].Gain[0] = 49,
.Ch[2].Gain[0] = 48,
.Ch[2].Offset[0] = -15,
.Ch[3].Gain[0] = 48,
.Ch[3].Offset[0] = 17,
.Ch[4].Gain[0] = 49,
.Ch[4].Offset[0] = 5,
.Ch[5].Gain[0] = 49,
.Ch[5].Offset[0] = -2,
.Ch[6].Gain[0] = 47,
.Ch[6].Offset[0] = -8,
.Ch[7].Gain[0] = 47,
.Ch[7].Offset[0] = -11,
.Ch[0].Gain[1] = 359,
.Ch[0].Offset[1] = -54,
.Ch[1].Gain[1] = 359,
.Ch[4].Gain[0] = 48,
.Ch[4].Offset[0] = 4,
.Ch[5].Gain[0] = 48,
.Ch[5].Offset[0] = -3,
.Ch[6].Gain[0] = 46,
.Ch[6].Offset[0] = -9,
.Ch[7].Gain[0] = 46,
.Ch[7].Offset[0] = -12,
.Ch[0].Gain[1] = 354,
.Ch[0].Offset[1] = -55,
.Ch[1].Gain[1] = 355,
.Ch[1].Offset[1] = 230,
.Ch[2].Gain[1] = 362,
.Ch[2].Offset[1] = -70,
.Ch[3].Gain[1] = 361,
.Ch[3].Offset[1] = 164,
.Ch[4].Gain[1] = 361,
.Ch[4].Offset[1] = 72,
.Ch[5].Gain[1] = 360,
.Ch[2].Gain[1] = 356,
.Ch[2].Offset[1] = -71,
.Ch[3].Gain[1] = 355,
.Ch[3].Offset[1] = 163,
.Ch[4].Gain[1] = 356,
.Ch[4].Offset[1] = 73,
.Ch[5].Gain[1] = 355,
.Ch[5].Offset[1] = 22,
.Ch[6].Gain[1] = 345,
.Ch[6].Offset[1] = -23,
.Ch[7].Gain[1] = 345,
.Ch[7].Offset[1] = -39,
.Ch[0].Gain[2] = 1482,
.Ch[0].Offset[2] = -197,
.Ch[1].Gain[2] = 1372,
.Ch[1].Offset[2] = 946,
.Ch[2].Gain[2] = 1473,
.Ch[2].Offset[2] = -275,
.Ch[3].Gain[2] = 1443,
.Ch[3].Offset[2] = 686,
.Ch[4].Gain[2] = 1477,
.Ch[4].Offset[2] = 313,
.Ch[5].Gain[2] = 1479,
.Ch[5].Offset[2] = 104,
.Ch[6].Gain[2] = 1424,
.Ch[6].Offset[2] = -75,
.Ch[7].Gain[2] = 1436,
.Ch[6].Gain[1] = 336,
.Ch[6].Offset[1] = -21,
.Ch[7].Gain[1] = 335,
.Ch[7].Offset[1] = -37,
.Ch[0].Gain[2] = 1458,
.Ch[0].Offset[2] = -198,
.Ch[1].Gain[2] = 1347,
.Ch[1].Offset[2] = 944,
.Ch[2].Gain[2] = 1455,
.Ch[2].Offset[2] = -271,
.Ch[3].Gain[2] = 1423,
.Ch[3].Offset[2] = 677,
.Ch[4].Gain[2] = 1454,
.Ch[4].Offset[2] = 320,
.Ch[5].Gain[2] = 1454,
.Ch[5].Offset[2] = 106,
.Ch[6].Gain[2] = 1369,
.Ch[6].Offset[2] = -65,
.Ch[7].Gain[2] = 1381,
.Ch[7].Offset[2] = -134,
.Ch[0].Gain[3] = 2821,
.Ch[0].Offset[3] = -357,
.Ch[1].Gain[3] = 1262,
.Ch[1].Offset[3] = 1440,
.Ch[2].Gain[3] = 2746,
.Ch[2].Offset[3] = -506,
.Ch[3].Gain[3] = 1934,
.Ch[3].Offset[3] = 1131,
.Ch[4].Gain[3] = 2659,
.Ch[4].Offset[3] = 576,
.Ch[5].Gain[3] = 2873,
.Ch[5].Offset[3] = 212,
.Ch[6].Gain[3] = 2770,
.Ch[6].Offset[3] = -142,
.Ch[7].Gain[3] = 2764,
.Ch[7].Offset[3] = -239
.Ch[0].Gain[3] = 2775,
.Ch[0].Offset[3] = -362,
.Ch[1].Gain[3] = 1257,
.Ch[1].Offset[3] = 1442,
.Ch[2].Gain[3] = 2713,
.Ch[2].Offset[3] = -503,
.Ch[3].Gain[3] = 1929,
.Ch[3].Offset[3] = 1125,
.Ch[4].Gain[3] = 2621,
.Ch[4].Offset[3] = 580,
.Ch[5].Gain[3] = 2834,
.Ch[5].Offset[3] = 206,
.Ch[6].Gain[3] = 2698,
.Ch[6].Offset[3] = -115,
.Ch[7].Gain[3] = 2690,
.Ch[7].Offset[3] = -250
};
#elif defined(BOARD_A4_DA_32_D4_E6_EA)
@@ -15,14 +15,24 @@ static uint16_t UserCode2StiCode(uint16_t amp, uint8_t positive_ch){
return amp;
}
// trans into sti code
if(positive_ch){
sti_code = StiCaliTable.p_ch.coefficient * real_amp + StiCaliTable.p_ch.offset;
if(real_amp < 200){
sti_code = 2023 * real_amp -4170;
}
else if(real_amp <500){
sti_code = 2077 * real_amp - 11729;
}
else{
sti_code = StiCaliTable.n_ch.coefficient * real_amp + StiCaliTable.n_ch.offset;
sti_code = 2096 * real_amp - 45970;
}
// trans into sti code
// if(positive_ch){
// sti_code = StiCaliTable.p_ch.coefficient * real_amp + StiCaliTable.p_ch.offset;
// }
// else{
// sti_code = StiCaliTable.n_ch.coefficient * real_amp + StiCaliTable.n_ch.offset;
// }
if(sti_code <= 10000){
sti_code = 10000;
}
@@ -2,16 +2,16 @@
#ifndef VERSION_DATE
#define VERSION_DATE
#define VERSION_DATE_YEAR 20
#define VERSION_DATE_MONTH 12
#define VERSION_DATE_DAY 22
#define VERSION_DATE_HOUR 18
#define VERSION_DATE_MINUTE 26
#define VERSION_DATE_YEAR 21
#define VERSION_DATE_MONTH 1
#define VERSION_DATE_DAY 21
#define VERSION_DATE_HOUR 17
#define VERSION_DATE_MINUTE 39
// this is NOT the version hash !!
// it's the last version hash
#define VERSION_HASH 2937fa6a1124e6bac1d7726e51313a0d42c805dd
#define VERSION_GIT_BRANCH neulive20_development_onchange_central
#define VERSION_HASH dd9f64662e1a9a993a1c28c18256d230f429f8ac
#define VERSION_GIT_BRANCH neulive2_E7DA_special_version
static void get_board_name(char *board_name_ch, uint8 *board_name_int, uint8 name_size){
uint8 name_offset = 18;