|
|
@@ -19,12 +19,12 @@ static u32 _hall_detect_task(void *args);
|
|
|
static void _hall_init_el_angle(void);
|
|
|
|
|
|
|
|
|
-#define HALL_PLACE_OFFSET (230 << 19) //(345) //315
|
|
|
+#define HALL_PLACE_OFFSET (220 << 19) //(345) //315
|
|
|
/*
|
|
|
4,5,1,3,2,6,4
|
|
|
*/
|
|
|
|
|
|
-static hall_sensor_t _sensor_hander;
|
|
|
+hall_t _sensor_hander;
|
|
|
|
|
|
measure_time_t g_meas_hall = {.exec_max_time = 6,};
|
|
|
|
|
|
@@ -48,6 +48,15 @@ static void __inline _hall_put_sample(u32 ticks, s32q19_t angle) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static u32 __inline__ _hall_get_angle_ticks(void) {
|
|
|
+ hall_sample_t *s = &_sensor_hander.samples;
|
|
|
+ if (!s->full) {
|
|
|
+ return s->ticks[s->index-1];
|
|
|
+ }else {
|
|
|
+ return s->ticks_sum/SAMPLE_MAX_COUNT;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static s32q5_t __inline _hall_angle_speed(void){
|
|
|
hall_sample_t *s = &_sensor_hander.samples;
|
|
|
if (s->ticks_sum == 0) {
|
|
|
@@ -78,7 +87,10 @@ static bool __inline _hall_data_empty(void) {
|
|
|
static void hall_sensor_default(void) {
|
|
|
memset(&_sensor_hander, 0, sizeof(_sensor_hander));
|
|
|
_sensor_hander.phase_offset = HALL_PLACE_OFFSET;//mc_config_get()->hall_offset;
|
|
|
- memcpy((char *)_sensor_hander.angle_table, (char *)mc_config_get()->hall_table, sizeof(_sensor_hander.angle_table));
|
|
|
+ for (int i = 0; i < 8; i++) {
|
|
|
+ _sensor_hander.angle_table[i] = S32Q19(mc_config_get()->hall_table[i]);
|
|
|
+ }
|
|
|
+ _sensor_hander.manual_angle = 0x3FF;
|
|
|
_hall_init_el_angle();
|
|
|
hall_debug_log();
|
|
|
}
|
|
|
@@ -107,19 +119,21 @@ static u32 _hall_detect_task(void *args) {
|
|
|
}
|
|
|
|
|
|
s16q5_t hall_sensor_get_theta(void){
|
|
|
- u32 us_now = timer_count32_get();
|
|
|
- u32 us_delta = timer_count32_delta(us_now, _sensor_hander.estimate_time_ticks);
|
|
|
- _sensor_hander.estimate_time_ticks = us_now;
|
|
|
- s32q19_t angle_step = _sensor_hander.estimate_el_speed * us_2_s(us_delta);
|
|
|
- _sensor_hander.estimate_delta_angle += angle_step;
|
|
|
- if (_sensor_hander.estimate_delta_angle >= _sensor_hander.next_delta_angle) {
|
|
|
- _sensor_hander.estimate_delta_angle = _sensor_hander.next_delta_angle;
|
|
|
+ s32q19_t angle_add = _sensor_hander.delta_angle_ts;
|
|
|
+ if (_sensor_hander.comp_count > 0) {
|
|
|
+ _sensor_hander.comp_count--;
|
|
|
+ angle_add += _sensor_hander.angle_comp_ts;
|
|
|
+ }
|
|
|
+ _sensor_hander.estimate_delta_angle += angle_add;
|
|
|
+
|
|
|
+ s32q19_t el_angle = _sensor_hander.estimate_delta_angle;
|
|
|
+ if (el_angle > _sensor_hander.next_delta_angle) {
|
|
|
+ el_angle = _sensor_hander.next_delta_angle;
|
|
|
}
|
|
|
- s32q19_t el_angle = 0;
|
|
|
if (_sensor_hander.direction == POSITIVE) {
|
|
|
- el_angle = _sensor_hander.estimate_el_angle + _sensor_hander.estimate_delta_angle;
|
|
|
+ el_angle = _sensor_hander.estimate_el_angle + el_angle;
|
|
|
}else {
|
|
|
- el_angle = _sensor_hander.estimate_el_angle - _sensor_hander.estimate_delta_angle;
|
|
|
+ el_angle = _sensor_hander.estimate_el_angle - el_angle;
|
|
|
}
|
|
|
|
|
|
rand_angle(el_angle);
|
|
|
@@ -146,7 +160,53 @@ s32 *hall_get_table(void) {
|
|
|
return _sensor_hander.angle_table;
|
|
|
}
|
|
|
|
|
|
+static float sin_hall[8];
|
|
|
+static float cos_hall[8];
|
|
|
+static int hall_iterations[8];
|
|
|
+void hall_detect_angle(s16 angle) {
|
|
|
+ _sensor_hander.manual_angle = (angle);
|
|
|
+ int hall = get_hall_stat(HALL_READ_TIMES);
|
|
|
+ float s, c;
|
|
|
+ normal_sincosf(degree_2_pi(angle), &s, &c);
|
|
|
+ sin_hall[hall] += s;
|
|
|
+ cos_hall[hall] += c;
|
|
|
+ hall_iterations[hall]++;
|
|
|
+}
|
|
|
+
|
|
|
+bool hall_detect_angle_finish(void) {
|
|
|
+ int fails = 0;
|
|
|
+ for(int i = 0;i < 8;i++) {
|
|
|
+ if (hall_iterations[i] > 30) {
|
|
|
+ float ang = pi_2_degree(atan2f(sin_hall[i], cos_hall[i]));
|
|
|
+ fast_norm_angle(&ang);
|
|
|
+ _sensor_hander.angle_table[i] = (ang);
|
|
|
+ } else {
|
|
|
+ _sensor_hander.angle_table[i] = S32Q19(0x3FF);
|
|
|
+ fails++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (fails == 2) {
|
|
|
+ store_hall_table(_sensor_hander.angle_table);
|
|
|
+ }
|
|
|
+ memset(sin_hall, 0, sizeof(sin_hall));
|
|
|
+ memset(cos_hall, 0, sizeof(cos_hall));
|
|
|
+ memset(hall_iterations, 0, sizeof(hall_iterations));
|
|
|
+ return fails == 2;
|
|
|
+}
|
|
|
|
|
|
+void hall_detect_offset(s16 angle) {
|
|
|
+ _sensor_hander.manual_angle = (angle);
|
|
|
+}
|
|
|
+
|
|
|
+bool hall_detect_offset_finish(void) {
|
|
|
+ int fails = 0;
|
|
|
+ for(int i = 0;i < 8;i++) {
|
|
|
+ if (hall_iterations[i] > 20) {
|
|
|
+ _sensor_hander.angle_table[i] = _sensor_hander.angle_table[i] / hall_iterations[i];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return (fails == 2);
|
|
|
+}
|
|
|
static void _hall_init_el_angle(void) {
|
|
|
_sensor_hander.hall_stat = get_hall_stat(HALL_READ_TIMES);
|
|
|
#ifdef USE_DETECTED_ANGLE
|
|
|
@@ -188,7 +248,6 @@ static void _hall_init_el_angle(void) {
|
|
|
rand_angle(_sensor_hander.measured_el_angle);
|
|
|
_sensor_hander.estimate_el_angle = _sensor_hander.measured_el_angle;
|
|
|
_sensor_hander.hall_ticks = timer_count32_get();
|
|
|
- _sensor_hander.estimate_time_ticks = timer_count32_get();
|
|
|
}
|
|
|
|
|
|
static __inline__ s32 _get_angle(u8 state, s32 added) {
|
|
|
@@ -327,7 +386,6 @@ static __inline__ s32 _get_delta_angle(u8 now, u8 next) {
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-extern s16 _g_hall_angle;
|
|
|
void HALL_IRQHandler(void) {
|
|
|
time_measure_start(&g_meas_hall);
|
|
|
u8 hall_stat_now = get_hall_stat(HALL_READ_TIMES);
|
|
|
@@ -339,6 +397,7 @@ void HALL_IRQHandler(void) {
|
|
|
if (theta_now == 0xFFFFFFFF) {
|
|
|
return;
|
|
|
}
|
|
|
+ //plot_2data16(hall_stat_now*60, _sensor_hander.manual_angle);
|
|
|
//获取两次中断的时间间隔,估计速度
|
|
|
u32 delta_us = timer_count32_delta(hall_ticks_now, _sensor_hander.hall_ticks);
|
|
|
if (delta_us == 0) {
|
|
|
@@ -356,41 +415,34 @@ void HALL_IRQHandler(void) {
|
|
|
s32 prev_imme_el_speed = _sensor_hander.immediately_el_speed + 1;
|
|
|
_sensor_hander.immediately_el_speed = delta_angle/delta_time; //s32q5
|
|
|
s32 delta_el_speed = abs(_sensor_hander.immediately_el_speed - prev_imme_el_speed);
|
|
|
- if (delta_el_speed*100/prev_imme_el_speed >= 20) { //即时速度增加10%,认为不稳定,需要使用即时速度估计转子位置
|
|
|
+ if (delta_el_speed*100/prev_imme_el_speed >= 40) { //即时速度增加40%,认为不稳定,需要使用即时速度估计转子位置
|
|
|
_sensor_hander.trns_detect = true;
|
|
|
}else {
|
|
|
_sensor_hander.trns_detect = false;
|
|
|
}
|
|
|
_hall_put_sample(delta_us, delta_angle);
|
|
|
os_disable_irq();
|
|
|
- _sensor_hander.el_speed = _hall_angle_speed(); //s32q5
|
|
|
- s32q14_t est_el_speed = 0;
|
|
|
-#if 0
|
|
|
-
|
|
|
if (_sensor_hander.samples.full) {
|
|
|
- s32 estimate_delta_angle = _sensor_hander.estimate_delta_angle - _sensor_hander.next_delta_angle;
|
|
|
- //plot_1data16(estimate_delta_angle>>19);
|
|
|
+ //s32 estimate_delta_angle = _sensor_hander.next_delta_angle - _sensor_hander.estimate_delta_angle;
|
|
|
+ //plot_2data16(estimate_delta_angle>>19, (estimate_delta_angle/((s32)(delta_us/FOC_CTRL_US)))>>10);//, _sensor_hander.estimate_delta_angle>>19);
|
|
|
/*通过上次预估的转子位置,对当前的预估速度进行补偿*/
|
|
|
- s32 delta_ration = estimate_delta_angle/(_sensor_hander.next_delta_angle >> 5); //q5
|
|
|
- est_el_speed = (delta_ration * _sensor_hander.el_speed)>>5 + _sensor_hander.el_speed;
|
|
|
- if (_sensor_hander.trns_detect) { //s32q14
|
|
|
- est_el_speed = (delta_ration * _sensor_hander.immediately_el_speed)>>5 + _sensor_hander.immediately_el_speed;
|
|
|
- }
|
|
|
+ _sensor_hander.comp_count = 0;//(s32)(delta_us/FOC_CTRL_US)/2;
|
|
|
+ _sensor_hander.angle_comp_ts = 0;//estimate_delta_angle/_sensor_hander.comp_count;
|
|
|
+ _sensor_hander.estimate_el_angle = theta_now;
|
|
|
}else {
|
|
|
- est_el_speed = _sensor_hander.el_speed;
|
|
|
+ _sensor_hander.comp_count = 0;
|
|
|
+ _sensor_hander.angle_comp_ts = 0;
|
|
|
+ _sensor_hander.estimate_el_angle = theta_now;
|
|
|
}
|
|
|
-#else
|
|
|
- est_el_speed = _sensor_hander.el_speed;
|
|
|
-#endif
|
|
|
- //s32q5
|
|
|
- _sensor_hander.estimate_el_speed = est_el_speed;
|
|
|
+ _sensor_hander.estimate_delta_angle = 0;
|
|
|
+ _sensor_hander.delta_angle_ts = next_delta_angle/(delta_us/FOC_CTRL_US);
|
|
|
_sensor_hander.next_delta_angle = next_delta_angle;
|
|
|
_sensor_hander.measured_el_angle = theta_now;
|
|
|
- _sensor_hander.estimate_el_angle = theta_now;
|
|
|
- _sensor_hander.estimate_delta_angle = 0;
|
|
|
+
|
|
|
os_enable_irq();
|
|
|
_sensor_hander.hall_stat = hall_stat_now;
|
|
|
_sensor_hander.hall_ticks = hall_ticks_now;
|
|
|
+ _sensor_hander.el_speed = _hall_angle_speed(); //s32q5
|
|
|
_sensor_hander.rpm = _sensor_hander.el_speed / 360 * 60; //s32q5
|
|
|
//plot_3data16(_sensor_hander.rpm >> 5, (_sensor_hander.immediately_el_speed/6) >> 5, (_sensor_hander.estimate_el_speed/6)>>5);
|
|
|
time_measure_end(&g_meas_hall);
|