diff --git a/Core/Src/main.c b/Core/Src/main.c
index 26d4352..601c85a 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -74,7 +74,6 @@ const osThreadAttr_t defaultTask_attributes = {
};
/* USER CODE BEGIN PV */
-uint16_t gausAdcBuf[ADC_CHNL_NUM];
/* USER CODE END PV */
@@ -141,21 +140,6 @@ RETRY:
return temp;
}
-uint16_t adc2voltage(uint16_t adcVal)
-{
- return adcVal * 3000 / 65535;
-}
-
-uint16_t adc2Iflla(uint16_t adcVal)
-{
- return adc2voltage(adcVal) * 1000 / 20 / 20;
-}
-
-uint16_t adc2Vflla(uint16_t adcVal)
-{
- return adc2voltage(adcVal) * 3;
-}
-
/* USER CODE END 0 */
@@ -937,27 +921,6 @@ static void MX_GPIO_Init(void)
/* USER CODE BEGIN 4 */
-static uint16_t gusDuty = 0;
-
-void ifilaAdust(void)
-{
- static uint32_t ulLastTick = 0;
- uint32_t ulTick = HAL_GetTick();
- if (ulTick - ulLastTick < 5000) {
- return;
- }
- ulLastTick = ulTick;
-
- if (gusDuty == 0) {
- gusDuty = 300;
- } else if (gusDuty == 300) {
- gusDuty = 600;
- } else if (gusDuty == 600) {
- gusDuty = 300;
- }
-
- __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, gusDuty);
-}
void HAL_UARTEx_RxEventCallback_UART3(UART_HandleTypeDef *huart, uint16_t Size);
void HAL_UARTEx_RxEventCallback_UART4(UART_HandleTypeDef *huart, uint16_t Size);
@@ -989,18 +952,7 @@ void StartDefaultTask(void *argument)
HAL_GPIO_WritePin(WDO_GPIO_Port, WDO_Pin, GPIO_PIN_RESET);
- HAL_ADCEx_Calibration_Start(&hadc1, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
-
- HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
-
- debug("ADC_CHNL_NUM = %d\n", ADC_CHNL_NUM);
-
- __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 0);
-
- HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
-
- HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_1);
-
+ filamentInit();
osuInit();
iapThreadInit();
cpyProtInit();
@@ -1011,17 +963,13 @@ void StartDefaultTask(void *argument)
{
osDelay(2);
i++;
- ifilaAdust();
if (i % 250 != 0) {
continue;
}
gusTempVal = getBoardTemp();
// HAL_ADC_Start_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
- SCB_InvalidateDCache_by_Addr(gausAdcBuf, ADC_CHNL_NUM * sizeof(gausAdcBuf[0]));
- printf("IWDG refresh,%d,%d,%d,%d\n",
- gusTempVal, gausAdcBuf[0], gausAdcBuf[1], gausAdcBuf[2]);
- printf("duty:%d%%,I:%.2fA,V:%.2fV\n", gusDuty*100/2400, adc2Iflla(gausAdcBuf[1]) / 1000.0, adc2Vflla(gausAdcBuf[2])/1000.0);
+
iFaultFlag = 0;
HAL_GPIO_WritePin(WDO_GPIO_Port, WDO_Pin, GPIO_PIN_SET);
HAL_IWDG_Refresh(&hiwdg1);
diff --git a/Drivers/User/Filament/filament.c b/Drivers/User/Filament/filament.c
new file mode 100644
index 0000000..88557f8
--- /dev/null
+++ b/Drivers/User/Filament/filament.c
@@ -0,0 +1,100 @@
+#include "main.h"
+#include "cmsis_os.h"
+#include "filament.h"
+
+
+extern TIM_HandleTypeDef htim1;
+extern ADC_HandleTypeDef hadc1;
+extern DMA_HandleTypeDef hdma_adc1;
+
+uint16_t gausAdcBuf[ADC_CHNL_NUM];
+static uint16_t gusDuty = 0;
+
+void ifilaAdust(void)
+{
+ static uint32_t ulLastTick = 0;
+ uint32_t ulTick = osKernelGetTickCount();
+ if (ulTick - ulLastTick < 5000) {
+ return;
+ }
+ ulLastTick = ulTick;
+
+ if (gusDuty == 0) {
+ gusDuty = 300;
+ } else if (gusDuty == 300) {
+ gusDuty = 600;
+ } else if (gusDuty == 600) {
+ gusDuty = 300;
+ }
+
+ __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, gusDuty);
+}
+
+uint16_t adc2voltage(uint16_t adcVal)
+{
+ return adcVal * 3000 / 65535;
+}
+
+uint16_t adc2Iflla(uint16_t adcVal)
+{
+ return adc2voltage(adcVal) * 1000 / 20 / 20;
+}
+
+uint16_t adc2Vflla(uint16_t adcVal)
+{
+ return adc2voltage(adcVal) * 3;
+}
+
+
+static void filamentThread(void *arg)
+{
+ int iCnt = 0;
+
+ HAL_ADCEx_Calibration_Start(&hadc1, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
+
+ HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
+
+ debug("ADC_CHNL_NUM = %d\n", ADC_CHNL_NUM);
+
+ __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 0);
+
+ HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
+
+ HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_1);
+
+ ifilaAdust();
+ while (1) {
+ osDelay(10);
+ // ifilaAdust();
+
+ iCnt++;
+
+ if (iCnt < 100) {
+ continue;
+ }
+ iCnt = 0;
+
+ SCB_InvalidateDCache_by_Addr(gausAdcBuf, ADC_CHNL_NUM * sizeof(gausAdcBuf[0]));
+ printf("ADC: %d,%d,%d\n", gausAdcBuf[0], gausAdcBuf[1], gausAdcBuf[2]);
+ printf("duty:%d%%,I:%.2fA,V:%.2fV\n", gusDuty*100/2400, adc2Iflla(gausAdcBuf[1]) / 1000.0, adc2Vflla(gausAdcBuf[2])/1000.0);
+ }
+}
+
+void filamentInit(void)
+{
+ // 创建任务
+ const osThreadAttr_t filament_task_attributes = {
+ .name = "filament_task",
+ .stack_size = 4096 * 2,
+ .priority = (osPriority_t) osPriorityNormal,
+ };
+ if (osThreadNew(filamentThread, NULL, &filament_task_attributes) == NULL)
+ {
+ printf("failed to create filament_task\n");
+ }
+ else
+ {
+ printf("create filament_task success\n");
+ }
+}
+
diff --git a/Drivers/User/Filament/filament.h b/Drivers/User/Filament/filament.h
new file mode 100644
index 0000000..a039dc2
--- /dev/null
+++ b/Drivers/User/Filament/filament.h
@@ -0,0 +1,12 @@
+#ifndef CPY_FILAMENT_H
+#define CPY_FILAMENT_H
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* Exported types ------------------------------------------------------------*/
+
+void filamentInit(void);
+
+
+#endif // CPY_FILAMENT_H
diff --git a/Drivers/User/OSU/osu.h b/Drivers/User/OSU/osu.h
index bed547d..9f99a0c 100644
--- a/Drivers/User/OSU/osu.h
+++ b/Drivers/User/OSU/osu.h
@@ -1,5 +1,5 @@
-#ifndef CPY_PROT_H
-#define CPY_PROT_H
+#ifndef CPY_OSU_H
+#define CPY_OSU_H
/* Includes ------------------------------------------------------------------*/
@@ -9,4 +9,4 @@
void osuInit(void);
-#endif // CPY_PROT_H
+#endif // CPY_OSU_H
diff --git a/MDK-ARM/cpy_daq.uvoptx b/MDK-ARM/cpy_daq.uvoptx
index 6fb4e39..c75827d 100644
--- a/MDK-ARM/cpy_daq.uvoptx
+++ b/MDK-ARM/cpy_daq.uvoptx
@@ -811,6 +811,18 @@
0
0
+
+ 6
+ 48
+ 1
+ 0
+ 0
+ 0
+ ..\Drivers\User\Filament\filament.c
+ filament.c
+ 0
+ 0
+
diff --git a/MDK-ARM/cpy_daq.uvprojx b/MDK-ARM/cpy_daq.uvprojx
index e281e47..6f06d67 100644
--- a/MDK-ARM/cpy_daq.uvprojx
+++ b/MDK-ARM/cpy_daq.uvprojx
@@ -949,6 +949,11 @@
1
..\Drivers\User\OSU\osu.c
+
+ filament.c
+ 1
+ ..\Drivers\User\Filament\filament.c
+