update code, for temp & vbus sensor

Signed-off-by: huhui <huhui@sharkgulf.com>

Application/FOC/foc.c

@@ -6,7 +6,7 @@
 #include "foc/svpwm.h"
 #include "foc/foc_task.h"
 #include "foc/phase_current.h"
-#include "foc/hall_speed.h"
+#include "foc/hall_sensor.h"
 
 static void charge_cap_timer_handler(timer_t *t);
 static u32 foc_main_task_handler(void);
@@ -15,17 +15,15 @@ static timer_t charge_cap_timer = {.handler = charge_cap_timer_handler};
 static motor_foc_t m_foc;
 
 void foc_init(void) {
-	/* init pwm hardware timer */
+	memset(&m_foc, 0, sizeof(m_foc));
 	m_foc.state = IDLE;
 	m_foc.gate_output = false;
 
 	hall_sensor_init();
-	
+	/* init pwm hardware timer */
 	PWM_TimerInit();
 
 	task_start(foc_main_task_handler, 0);
-
-	foc_hall_detect(6.0f, (u16 *)m_foc.hall_table);
 }
 
 int foc_hall_detect(float current, u16 *hall_table){

Application/FOC/foc_task.c

@@ -3,7 +3,7 @@
 #include "foc_task.h"
 #include "phase_current.h"
 #include "park_clark.h"
-#include "hall_speed.h"
+#include "hall_sensor.h"
 #include "svpwm.h"
 
 void foc_task(motor_foc_t *foc){

Application/FOC/hall_speed.c → Application/FOC/hall_sensor.c

@@ -2,7 +2,7 @@
 #include "bsp/bsp.h"
 #include "libs/task.h"
 #include "math/fast_math.h"
-#include "hall_speed.h"
+#include "hall_sensor.h"
 
 #define HALL_READ_TIMES 7
 

Application/FOC/hall_speed.h → Application/FOC/hall_sensor.h

@@ -1,5 +1,5 @@
-#ifndef _HALL_SPEED_H__
-#define _HALL_SPEED_H__
+#ifndef _HALL_SENSOR_H__
+#define _HALL_SENSOR_H__
 #include "libs/types.h"
 #include "hal/hal.h"
 
@@ -22,5 +22,5 @@ void hall_sensor_init(void);
 float hall_sensor_get_theta(void); //return degree
 float hall_sensor_get_speed(void); //return rpm
 
-#endif /* _HALL_SPEED_H__ */
+#endif /* _HALL_SENSOR_H__ */
 

Application/FOC/ntc_sensor.c

@@ -0,0 +1,21 @@
+#include "ntc_sensor.h"
+#include "bsp/bsp.h"
+
+static ntc_t _ntc;
+void ntc_sensor_init(void) {
+	_ntc.temp_avg = 0;
+	_ntc.low_pass_filter = 0.5f;
+	HAL_ADC1_ChanConfig(TEMP_SENSOR_ADC_CHANNEL);
+}
+
+int ntc_sensor_get_temperature(void){
+	u16 w_temp = HAL_ADC1_ReadValue(TEMP_SENSOR_ADC_CHANNEL);
+    w_temp -= ( s32 )(V0_V *65536/ ADC_REFERENCE_VOLTAGE );
+    w_temp *= (ADC_REFERENCE_VOLTAGE/dV_dT);
+    w_temp = w_temp / 65536 + ( s32 )( T0_C );
+
+	_ntc.temp_avg = w_temp * _ntc.low_pass_filter + _ntc.temp_avg * (1.0f - _ntc.low_pass_filter);
+
+	return _ntc.temp_avg;
+}
+

Application/FOC/ntc_sensor.h

@@ -0,0 +1,20 @@
+#ifndef _NTC_H__
+#define _NTC_H__
+typedef struct {
+	int temp_avg;
+	float low_pass_filter;
+}ntc_t;
+
+/************ Temperature sensing section ***************/
+/* V[V]=V0+dV/dT[V/Celsius]*(T-T0)[Celsius]*/
+#define V0_V                          1.055f /*!< in Volts */
+#define T0_C                          25 /*!< in Celsius degrees */
+#define dV_dT                         0.023f /*!< V/Celsius degrees */
+#define T_MAX                         110 /*!< Sensor measured
+                                                       temperature at maximum
+                                                       power stage working
+                                                       temperature, Celsius degrees */
+void ntc_sensor_init(void);
+int ntc_sensor_get_temperature(void);
+#endif /* _NTC_H__ */
+

Application/FOC/vbus_sensor.c

@@ -0,0 +1,31 @@
+#include "vbus_sensor.h"
+#include "bsp/bsp.h"
+
+static vbus_t _vbus;
+void vbus_sensor_init(void){
+	_vbus.voltage_avg = 0;
+	_vbus.avg_count = 16;
+	HAL_ADC1_ChanConfig(VBUS_SENSOR_ADC_CHANNEL);
+
+}
+
+float vbus_get_voltage(void){
+	u32 vadc = 0;
+	u32 max = 0, min = 0xFFFFFFF;
+	for (int i = 0; i < _vbus.avg_count; i++) {
+		u32 one = HAL_ADC1_ReadValue(VBUS_SENSOR_ADC_CHANNEL);
+		vadc += one;
+		if (min > one) {
+			min = one;
+		}
+		if (max < one) {
+			max = one;
+		}
+	}
+	vadc -= (max + min);
+	vadc = vadc / (_vbus.avg_count - 2);
+	_vbus.voltage_avg = vadc/65536 * ADC_REFERENCE_VOLTAGE / VBUS_PARTITIONING_FACTOR;
+
+	return _vbus.voltage_avg;
+}
+

Application/FOC/vbus_sensor.h

@@ -0,0 +1,18 @@
+#ifndef _VBUS_SENSOR_H__
+#define _VBUS_SENSOR_H__
+
+
+#define VBUS_PARTITIONING_FACTOR      0.0522f /*!< It expresses how
+                                                       much the Vbus is attenuated
+                                                       before being converted into
+                                                       digital value */
+
+typedef struct {
+	int voltage_avg;
+	int avg_count;
+}vbus_t;
+
+void vbus_sensor_init(void);
+float vbus_get_voltage(void);
+#endif /* _VBUS_SENSOR_H__ */
+

Application/Hal/adc.c

@@ -81,3 +81,40 @@ void HAL_ADC1_Init(void){
 
 }
 
+
+void HAL_ADC1_ChanConfig(u32 channel) {
+	if (LL_ADC_IsEnabled(hadc1.Instance) == 0 )
+	{
+	 	LL_ADC_DisableIT_EOC(hadc1.Instance);
+		LL_ADC_ClearFlag_EOC(hadc1.Instance);
+	 	LL_ADC_DisableIT_JEOC(hadc1.Instance);
+	 	LL_ADC_ClearFlag_JEOC(hadc1.Instance);
+	
+	  	LL_ADC_StartCalibration( hadc1.Instance, LL_ADC_SINGLE_ENDED );
+	  	while ( LL_ADC_IsCalibrationOnGoing( hadc1.Instance ) )
+	  	{ }
+	  	LL_ADC_Enable( hadc1.Instance );
+	}
+	/* reset regular conversion sequencer length set by cubeMX */
+	LL_ADC_REG_SetSequencerLength( hadc1.Instance, LL_ADC_REG_SEQ_SCAN_DISABLE );
+	/* configure the sampling time (should already be configured by for non user conversions)*/
+	LL_ADC_SetChannelSamplingTime ( hadc1.Instance, __LL_ADC_DECIMAL_NB_TO_CHANNEL(channel) ,ADC_SAMPLETIME_61CYCLES_5);
+}
+
+u16 HAL_ADC1_ReadValue(u32 channel)
+{
+  	u16 retVal;
+
+  	LL_ADC_REG_SetSequencerRanks( hadc1.Instance,
+                                LL_ADC_REG_RANK_1,
+                                __LL_ADC_DECIMAL_NB_TO_CHANNEL( channel ) );
+
+  	LL_ADC_REG_ReadConversionData12(hadc1.Instance);
+
+    LL_ADC_REG_StartConversion(hadc1.Instance);
+  	/* Wait until end of regular conversion */
+  	while ( LL_ADC_IsActiveFlag_EOC(hadc1.Instance) == 0u ) {}
+  	retVal = LL_ADC_REG_ReadConversionData12(hadc1.Instance);
+	return retVal;
+}
+

Application/Hal/adc.h

@@ -45,6 +45,9 @@ static const R3_F30x_8_ADC_Config_t adc_config = {
 };
 
 void HAL_ADC1_Init(void);
+void HAL_ADC1_ChanConfig(u32 channel);
+u16 HAL_ADC1_ReadValue(u32 channel);
+
 void __inline HAL_ADC1_Inject_Config(u8 sector, u32 inject_flags) {
 	adc_config.ADCx->JSQR = adc_config.ADCConfig[sector] | inject_flags;
 	MODIFY_REG(adc_config.TIMx->CR2, TIM_CR2_MMS, LL_TIM_TRGO_OC4REF);

Application/Hal/hal.h

@@ -42,6 +42,10 @@
 #define CURRENT_U_ADC_CHANNAL 6
 #define CURRENT_V_ADC_CHANNAL 7
 #define CURRENT_W_ADC_CHANNAL 1
+#define TEMP_SENSOR_ADC_CHANNEL 8
+#define VBUS_SENSOR_ADC_CHANNEL 2
+
+#define ADC_REFERENCE_VOLTAGE  3.30f
 
 
 #define READ_HALL1() (HAL_GPIO_ReadPin(HALL_1_GROUP, HALL_1_PIN) == GPIO_PIN_SET ?1:0)

Project/Motor_PMSM.uvoptx

@@ -165,22 +165,6 @@
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>93</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\Application\FOC\foc.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
@@ -340,8 +324,32 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\Application\FOC\hall_speed.c</PathWithFileName>
-      <FilenameWithoutPath>hall_speed.c</FilenameWithoutPath>
+      <PathWithFileName>..\Application\FOC\vbus_sensor.c</PathWithFileName>
+      <FilenameWithoutPath>vbus_sensor.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Application\FOC\ntc_sensor.c</PathWithFileName>
+      <FilenameWithoutPath>ntc_sensor.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Application\FOC\hall_sensor.c</PathWithFileName>
+      <FilenameWithoutPath>hall_sensor.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -355,7 +363,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -367,7 +375,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -387,7 +395,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -399,7 +407,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -411,7 +419,7 @@
     </File>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -431,7 +439,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -443,7 +451,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -455,7 +463,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
+      <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -469,13 +477,13 @@
 
   <Group>
     <GroupName>Drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -487,7 +495,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -499,7 +507,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -511,7 +519,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -523,7 +531,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -535,7 +543,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -547,7 +555,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -559,7 +567,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -571,7 +579,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -583,7 +591,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -595,7 +603,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -607,7 +615,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -619,7 +627,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -631,7 +639,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -643,7 +651,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -655,7 +663,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -667,7 +675,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -679,7 +687,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -691,7 +699,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -703,7 +711,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -715,7 +723,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -727,7 +735,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -739,7 +747,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -751,7 +759,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -763,7 +771,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -783,7 +791,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -795,7 +803,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>44</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>

Project/Motor_PMSM.uvprojx

@@ -419,9 +419,19 @@
               <FilePath>..\Application\FOC\phase_current.c</FilePath>
             </File>
             <File>
-              <FileName>hall_speed.c</FileName>
+              <FileName>vbus_sensor.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Application\FOC\hall_speed.c</FilePath>
+              <FilePath>..\Application\FOC\vbus_sensor.c</FilePath>
+            </File>
+            <File>
+              <FileName>ntc_sensor.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Application\FOC\ntc_sensor.c</FilePath>
+            </File>
+            <File>
+              <FileName>hall_sensor.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Application\FOC\hall_sensor.c</FilePath>
             </File>
           </Files>
         </Group>