Parcourir la source

母线电压上报不从PMSM FOC中获取,直接获取采样值

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui il y a 3 ans
Parent
commit
7eea79d70e
2 fichiers modifiés avec 5 ajouts et 1 suppressions
  1. 4 0
      Applications/foc/samples.c
  2. 1 1
      Applications/prot/can_foc_msg.c

+ 4 - 0
Applications/foc/samples.c

@@ -6,6 +6,7 @@
 #include "os/os_task.h"
 #include "foc/foc_config.h"
 #include "bsp/delay.h"
+#include "libs/logger.h"
 
 typedef struct {
 	float value;
@@ -96,10 +97,13 @@ void sample_uvw_phase(void) {
 #ifdef U_VOL_ADC_CHAN
 	u16 uvw[3];
 	adc_get_uvw_phaseV(uvw);
+
 	_uvw_phase[0].value = (float)uvw[0] * UVW_VOL_CEOF;
 	LowPass_Filter(_uvw_phase[0].filted_value, _uvw_phase[0].value, _uvw_phase[0].lowpass);
+
 	_uvw_phase[1].value = (float)uvw[1] * UVW_VOL_CEOF;
 	LowPass_Filter(_uvw_phase[1].filted_value, _uvw_phase[1].value, _uvw_phase[1].lowpass);
+
 	_uvw_phase[2].value = (float)uvw[2] * UVW_VOL_CEOF;
 	LowPass_Filter(_uvw_phase[2].filted_value, _uvw_phase[2].value, _uvw_phase[2].lowpass);
 

+ 1 - 1
Applications/prot/can_foc_msg.c

@@ -15,7 +15,7 @@ void can_report_speed(u8 can, s16 rpm) {
 void can_report_power(u8 can) {
 	u8 data[8];
 	s16 rpm = (s16)PMSM_FOC_GetSpeed();
-	float vDC = PMSM_FOC_GetVbusVoltage();
+	float vDC = get_vbus_float();
 	float iDC = PMSM_FOC_GetVbusCurrent();	
 	s16 v = (s16)(vDC * 10.0f);
 	s16 i = (s16)(iDC * 10.0f);