rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix AT32 ACC definition conflict

This commit is contained in:
Hugo Chiang 2022-10-01 23:15:00 +08:00
parent 9056674121
commit ad19528e9c
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/main/AT32F43x/drivers/inc/at32f435_437_acc.h
View File

@ -40,7 +40,7 @@ extern "C" {
* @{
*/
/** @addtogroup ACC
/** @addtogroup ACC_DEV
* @{
*/
@ -165,7 +165,7 @@ typedef struct
* @}
*/
#define ACC ((acc_type *) ACC_BASE)
#define ACC_DEV ((acc_type *) ACC_BASE)
/** @defgroup ACC_exported_functions
* @{

40
lib/main/AT32F43x/drivers/src/at32f435_437_acc.c
View File

@ -30,8 +30,8 @@
* @{
*/
/** @defgroup ACC
* @brief ACC driver modules
/** @defgroup ACC_DEV
* @brief ACC_DEV driver modules
* @{
*/
@ -54,13 +54,13 @@ void acc_calibration_mode_enable(uint16_t acc_trim, confirm_state new_state)
{
if(acc_trim == ACC_CAL_HICKCAL)
{
ACC->ctrl1_bit.entrim = FALSE;
ACC_DEV->ctrl1_bit.entrim = FALSE;
}
else
{
ACC->ctrl1_bit.entrim = TRUE;
ACC_DEV->ctrl1_bit.entrim = TRUE;
}
ACC->ctrl1_bit.calon = new_state;
ACC_DEV->ctrl1_bit.calon = new_state;
}
/**
@ -70,7 +70,7 @@ void acc_calibration_mode_enable(uint16_t acc_trim, confirm_state new_state)
*/
void acc_step_set(uint8_t step_value)
{
ACC->ctrl1_bit.step = step_value;
ACC_DEV->ctrl1_bit.step = step_value;
}
/**
@ -83,7 +83,7 @@ void acc_step_set(uint8_t step_value)
*/
void acc_sof_select(uint16_t sof_sel)
{
ACC->ctrl1 |= sof_sel;
ACC_DEV->ctrl1 |= sof_sel;
}
/**
@ -99,11 +99,11 @@ void acc_interrupt_enable(uint16_t acc_int, confirm_state new_state)
{
if(acc_int == ACC_CALRDYIEN_INT)
{
ACC->ctrl1_bit.calrdyien = new_state;
ACC_DEV->ctrl1_bit.calrdyien = new_state;
}
else
{
ACC->ctrl1_bit.eien = new_state;
ACC_DEV->ctrl1_bit.eien = new_state;
}
}
@ -114,7 +114,7 @@ void acc_interrupt_enable(uint16_t acc_int, confirm_state new_state)
*/
uint8_t acc_hicktrim_get(void)
{
return ((uint8_t)(ACC->ctrl2_bit.hicktrim));
return ((uint8_t)(ACC_DEV->ctrl2_bit.hicktrim));
}
/**
@ -124,7 +124,7 @@ uint8_t acc_hicktrim_get(void)
*/
uint8_t acc_hickcal_get(void)
{
return ((uint8_t)(ACC->ctrl2_bit.hickcal));
return ((uint8_t)(ACC_DEV->ctrl2_bit.hickcal));
}
/**
@ -134,7 +134,7 @@ uint8_t acc_hickcal_get(void)
*/
void acc_write_c1(uint16_t acc_c1_value)
{
ACC->c1 = acc_c1_value;
ACC_DEV->c1 = acc_c1_value;
}
/**
@ -144,7 +144,7 @@ void acc_write_c1(uint16_t acc_c1_value)
*/
void acc_write_c2(uint16_t acc_c2_value)
{
ACC->c2 = acc_c2_value;
ACC_DEV->c2 = acc_c2_value;
}
/**
@ -154,7 +154,7 @@ void acc_write_c2(uint16_t acc_c2_value)
*/
void acc_write_c3(uint16_t acc_c3_value)
{
ACC->c3 = acc_c3_value;
ACC_DEV->c3 = acc_c3_value;
}
/**
@ -164,7 +164,7 @@ void acc_write_c3(uint16_t acc_c3_value)
*/
uint16_t acc_read_c1(void)
{
return ((uint16_t)(ACC->c1));
return ((uint16_t)(ACC_DEV->c1));
}
/**
@ -174,7 +174,7 @@ uint16_t acc_read_c1(void)
*/
uint16_t acc_read_c2(void)
{
return ((uint16_t)(ACC->c2));
return ((uint16_t)(ACC_DEV->c2));
}
/**
@ -184,7 +184,7 @@ uint16_t acc_read_c2(void)
*/
uint16_t acc_read_c3(void)
{
return ((uint16_t)(ACC->c3));
return ((uint16_t)(ACC_DEV->c3));
}
/**
@ -198,9 +198,9 @@ uint16_t acc_read_c3(void)
flag_status acc_flag_get(uint16_t acc_flag)
{
if(acc_flag == ACC_CALRDY_FLAG)
return (flag_status)(ACC->sts_bit.calrdy);
return (flag_status)(ACC_DEV->sts_bit.calrdy);
else
return (flag_status)(ACC->sts_bit.rslost);
return (flag_status)(ACC_DEV->sts_bit.rslost);
}
/**
@ -213,7 +213,7 @@ flag_status acc_flag_get(uint16_t acc_flag)
*/
void acc_flag_clear(uint16_t acc_flag)
{
ACC->sts = ~acc_flag;
ACC_DEV->sts = ~acc_flag;
}
/**

14
src/main/blackbox/blackbox.c
View File

@ -225,9 +225,9 @@ static const blackboxDeltaFieldDefinition_t blackboxMainFields[] = {
{"gyroADC", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)},
{"gyroADC", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)},
{"gyroADC", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)},
{"accSmooth", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)},
{"accSmooth", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)},
{"accSmooth", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)},
{"accSmooth", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)},
{"accSmooth", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)},
{"accSmooth", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)},
{"debug", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)},
{"debug", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)},
{"debug", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)},
@ -485,8 +485,8 @@ static bool testBlackboxConditionUncached(FlightLogFieldCondition condition)
case CONDITION(GYRO):
return isFieldEnabled(FIELD_SELECT(GYRO));
case CONDITION(ACCELERATE):
return sensors(SENSOR_ACC) && isFieldEnabled(FIELD_SELECT(ACCELERATE));
case CONDITION(ACC):
return sensors(SENSOR_ACC) && isFieldEnabled(FIELD_SELECT(ACC));
case CONDITION(DEBUG_LOG):
return (debugMode != DEBUG_NONE) && isFieldEnabled(FIELD_SELECT(DEBUG_LOG));
@ -628,7 +628,7 @@ static void writeIntraframe(void)
blackboxWriteSigned16VBArray(blackboxCurrent->gyroADC, XYZ_AXIS_COUNT);
}
if (testBlackboxCondition(CONDITION(ACCELERATE))) {
if (testBlackboxCondition(CONDITION(ACC))) {
blackboxWriteSigned16VBArray(blackboxCurrent->accADC, XYZ_AXIS_COUNT);
}
@ -778,7 +778,7 @@ static void writeInterframe(void)
if (testBlackboxCondition(CONDITION(GYRO))) {
blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, gyroADC), XYZ_AXIS_COUNT);
}
if (testBlackboxCondition(CONDITION(ACCELERATE))) {
if (testBlackboxCondition(CONDITION(ACC))) {
blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, accADC), XYZ_AXIS_COUNT);
}
if (testBlackboxCondition(CONDITION(DEBUG_LOG))) {

4
src/main/blackbox/blackbox_fielddefs.h
View File

@ -50,7 +50,7 @@ typedef enum FlightLogFieldCondition {
FLIGHT_LOG_FIELD_CONDITION_NOT_LOGGING_EVERY_FRAME,
FLIGHT_LOG_FIELD_CONDITION_GYRO,
FLIGHT_LOG_FIELD_CONDITION_ACCELERATE,//ACC 与at32f43x的自动频率矫正 ACC 冲突
FLIGHT_LOG_FIELD_CONDITION_ACC,
FLIGHT_LOG_FIELD_CONDITION_DEBUG_LOG,
FLIGHT_LOG_FIELD_CONDITION_NEVER,
@ -68,7 +68,7 @@ typedef enum FlightLogFieldSelect_e { // no more than 32
FLIGHT_LOG_FIELD_SELECT_ALTITUDE,
FLIGHT_LOG_FIELD_SELECT_RSSI,
FLIGHT_LOG_FIELD_SELECT_GYRO,
FLIGHT_LOG_FIELD_SELECT_ACCELERATE,//ACC 与at32f43x的 acc 自动频率矫正冲突
FLIGHT_LOG_FIELD_SELECT_ACC,
FLIGHT_LOG_FIELD_SELECT_DEBUG_LOG,
FLIGHT_LOG_FIELD_SELECT_MOTOR,
FLIGHT_LOG_FIELD_SELECT_GPS,

2
src/main/cli/settings.c
View File

@ -830,7 +830,7 @@ const clivalue_t valueTable[] = {
{ "blackbox_disable_rssi", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_RSSI, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },
{ "blackbox_disable_gyro", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_GYRO, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },
#if defined(USE_ACC)
{ "blackbox_disable_acc", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_ACCELERATE, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },
{ "blackbox_disable_acc", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_ACC, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },
#endif
{ "blackbox_disable_debug", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_DEBUG_LOG, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },
{ "blackbox_disable_motors", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_MOTOR, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },