小改動

開啟 vac brown out protector

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/.clang-format

@@ -0,0 +1,53 @@
+#Generated from Visual Studio settings
+---
+BasedOnStyle: webkit
+BraceWrapping: 
+  BeforeCatch: true
+  BeforeElse: true
+  AfterClass: true
+  AfterFunction: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+ColumnLimit: 0
+BreakBeforeBraces: Custom
+NamespaceIndentation: All
+TabWidth: 2
+IndentWidth: 2
+IndentCaseLabels: true
+AlignAfterOpenBracket: Align
+PointerAlignment: Right
+AlignOperands: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortLoopsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+BreakAfterJavaFieldAnnotations: true
+AlignTrailingComments: true
+BreakConstructorInitializers: AfterColon
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+AlignArrayOfStructures: Right
+AlignConsecutiveAssignments:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: false
+AlignConsecutiveBitFields:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: true
+  PadOperators: true 
+AlignEscapedNewlines: Right
+...

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/inc/app.h

@@ -67,6 +67,7 @@ extern "C"
   void bode_plot_param_read_from_flash(struct bode_plot_param_t *param, uint32_t addr);
 
   extern struct bode_plot_param_t bode_plot_param;
+  extern struct bode_plot_param_t pfc_vloop_bode_plot_param;
 
 #ifdef __cplusplus
 }

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/inc/main.h

@@ -32,11 +32,11 @@ extern "C"
 #define YN_MAX            (PFC_DUTY_MAX << 14)
 #define YN_MIN            (PFC_DUTY_MIN << 14)
 // VBUS 參數
-#define VBUS_SET          360             // unit: volt (Transformer N = 14)
+#define VBUS_SET          350             // unit: volt (Transformer N = 14)
 #define VBUS_SET_H        (VBUS_SET + 20) // burst mode in,  在過零區判斷
 #define VBUS_SET_L        (VBUS_SET - 20) // burst mode out, 在過零區判斷
 // #define VBUS_SET_H2			370 	// for skip mode
-#define VBUS_OVP          410     // 420V 電容
+#define VBUS_OVP          420     // 420V 電容
 #define VBUS_2ADC         149.15f // 4M + 27K
 #define VCOMP_2DUTY       0       // vbus_comp control duty
 #define V_COMP_MAX        16000   // (PFC_DUTY_MAX * 32) 	// 480 * 32 = 16360

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/src/app.c

@@ -9,6 +9,7 @@
 #define TICK_1000_MS 1000
 
 struct bode_plot_param_t bode_plot_param;
+struct bode_plot_param_t pfc_vloop_bode_plot_param;
 
 static int bode_plot_param_write_to_flash(const struct bode_plot_param_t *param, uint32_t addr);
 

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/src/init.c

@@ -129,7 +129,7 @@ void gpio_config()
   //  PA7(iac), PA10(vbus), PA13(vac)  //  PA11(cr), PA12(vfb)-->GPIO
   //-----------------//
   GPIO_InitTypeDef GPIO_InitADC;
-  GPIO_InitADC.GPIO_Pin = GPIO_Pin_07 | GPIO_Pin_10 | GPIO_Pin_13 | GPIO_Pin_11; // PA11(cr)
+  GPIO_InitADC.GPIO_Pin = GPIO_Pin_07 | GPIO_Pin_10 | GPIO_Pin_13; // | GPIO_Pin_11; // PA11(cr)
   GPIO_InitADC.GPIO_Mode = GPIO_Mode_ANAL;
   GPIO_Init(GPIOA, &GPIO_InitADC);
 
@@ -192,7 +192,7 @@ void adc_config(void)
   // ----------------------------------------------
   // vcr = 	PA11 	= ADC_Channel_05 (未使用)
   // vfb = 	PA12 	= ADC_Channel_06 (使用 GPIO)
-  init1.SelChannels = ADC_Channel_04 | ADC_Channel_07 | ADC_Channel_09;
+  init1.SelChannels = ADC_Channel_04 | ADC_Channel_07 | ADC_Channel_09 | ADC_Channel_05;
   // init1.SelChannels    = ADC_Channel_09 ;// OP_O 指定到 PA7 時，ADC 需要用 CH_09 讀取
   init1.ClkPrescaler = ADC_ClkDiv_4; // 60M/4 = 15M，接近 1MSPS (1us 轉換時間), 最快速度
   init1.DataAlign = ADC_DataAlign_Right;

pec930_sdk-v1.0.1/Examples/template/PFC_LLC_2026-05-20_2P2Z_ok/src/main.c

@@ -1,5 +1,4 @@
 
-
 #include "main.h"
 #include "app.h"
 #include "init.h"
@@ -10,15 +9,15 @@
 #define DATA_LOG       0
 #define DATA_MONITOR   0
 #define DEBOUNCE_TIME  20
-#define BUF_SIZE       100 // > 300 記憶體不夠用(4組) > 700 記憶體不夠用(2組)
+#define BUF_SIZE       300 // > 300 記憶體不夠用(4組) > 700 記憶體不夠用(2組)
 
 #define CR_1P1Z_B0_Q14 6313
 #define CR_1P1Z_B1_Q14 -5113
 #define CR_1P1Z_A1_Q14 -5803
 // 前饋輸出限制（請根據您主環 Q14 格式的數值範圍調整）
 // 假設最大前饋量限制為實數值 50.0 -> 50.0 * 16384 = 819200
-#define CR_FF_MAX_Q14  819200 // 50 duty << 14
-#define CR_FF_MIN_Q14  -819200
+#define CR_FF_MAX_Q14  1638400 //819200 // 50 duty << 14
+#define CR_FF_MIN_Q14  -1638400 //-819200
 
 //=============================================================================
 //                  Macro Definition
@@ -67,9 +66,10 @@ uint8_t llc_running = 0;
 uint8_t pfc_running = 0;
 static uint8_t last_is_zero_crossing = 0;
 uint8_t is_brown_in = 0; // 0: 關機/保護中, 1: 正常工作
+static uint8_t cur_loop_fun_en = 0;
 
-static volatile int32_t print1, print2;
-static volatile int64_t print3;
+// static volatile int32_t print1, print2;
+// static volatile int64_t print3;
 
 static uint16_t iac = 0;
 static uint16_t vac = 0;
@@ -111,18 +111,18 @@ uint8_t keyInput;
 //-----------------------------------------------
 uint8_t power_on_cmd = 0;
 uint8_t temp_off = 0;
-uint32_t msg_timer;
 uint16_t vbus_volt, vac_volt;
 int32_t tx_buf1[BUF_SIZE];
-int64_t tx_buf2[BUF_SIZE];
+int32_t tx_buf2[BUF_SIZE];
 // uint16_t tx_buf3[BUF_SIZE];
 // uint16_t tx_buf4[BUF_SIZE];
 uint16_t buf_idx = 0;
 uint8_t is_full = 0;
-uint16_t count_down = 60000; // for data log
+uint16_t count_down = 2000; // for data log
 uint16_t i_ff;
 uint32_t vac_avg1, vac_avg2, vac_avg3;
 uint32_t vbus_avg = 0;
+uint32_t vcr_avg;
 static volatile uint16_t vac_pk1, vac_pk2;
 uint8_t hi_line = 0; // 0=110V, 1=220V
 uint8_t vbus_ready = 0;
@@ -133,6 +133,7 @@ uint16_t llc_period_ss = LLC_SS_MIN;
 uint16_t llc_run_arr = LLC_PERIOD_MIN;
 uint16_t llc_arr_cmp = 0;
 uint8_t v_loop_cnt = 0;
+uint8_t v_loop_cnt2 = 0;
 uint16_t brownout_cnt = 0;
 
 uint8_t volatile tim0_trigger = 0;
@@ -318,35 +319,71 @@ void pfc_pwm_disable()
   REG_CLR_BITS(TIM2->CCER, TIM_CCER_CC1E_Msk);
 }
 //======================================================================================
-void Vol_Loop_PFC_1P1Z(void) // TEST OK
+// Cr 1P1Z 回授，做負載驟變補償，執行頻率 10KHZ
+// 抓取 vcr 的動態變化趨勢，並在穩態時回歸平靜
+void Load_Loop_1P1Z(void)
+{
+  int32_t x0;
+  int64_t temp_y0; // 使用 64 位元暫存，完全避免 32 位元相乘時溢位
+  int32_t y0;
+
+  // 1. 讀取當前 vcr
+  x0 = vcr_avg;
+
+  // 2. 執行 1P1Z 差分方程計算:
+  temp_y0 = ((int64_t)CR_1P1Z_B0_Q14 * x0) + ((int64_t)CR_1P1Z_B1_Q14 * vcr_x1_q14) - ((int64_t)CR_1P1Z_A1_Q14 * vcr_y1_q14);
+
+  // 將 Q28 格式還原回 Q14 格式（右移 14 位元
+  y0 = (int32_t)(temp_y0 >> 14);
+
+  // 更新歷史狀態變數 (Q14 格式)
+  vcr_x1_q14 = x0;
+  vcr_y1_q14 = y0;
+
+  // 定點數安全限幅 (Saturation)
+  if (y0 > CR_FF_MAX_Q14)
+    y0 = CR_FF_MAX_Q14;
+  else if (y0 > -CR_FF_MIN_Q14)
+    y0 = -CR_FF_MIN_Q14;
+
+  cr_feed_forward_output_q14 = y0;
+}
+//==========================================================================
+void Vol_Loop_PFC_1P1Z(void)
 {
   // 1. 計算誤差
   int32_t vbus_err_n = (int32_t)vbus_set - (int32_t)vbus_avg;
 
   // --- 策略 A：動態增益調整 ---
-  int32_t b0 = 135;
-  int32_t b1 = -134;
+   int32_t b0 = 139;
+   int32_t b1 = -129;
 
-  if (vbus_err_n > 30 || vbus_err_n < -30)
+  //  vloop_p->b0 = 139;
+  //  vloop_p->b1 = -129;
+  //  vloop_p->a1 = -16383;
+/*
+  if (vbus_err_n > 40 || vbus_err_n < -40) // ~ 20V
   {
     // 大誤差時（通常是剛啟動或大跳載），強化參數加快反應
-    // b0 = 250;
-    // b1 = -240;
-    b0 = 180; // 稍微調降強增益的力道
-    b1 = -175;
+    //b0 = 250;
+    //b1 = -249;
+     //b0 = 180; // 稍微調降強增益的力道
+     //b1 = -178;
+	 b0 = 500;
+	 b1 = -499;
   }
   // --- 策略 B：接近目標時微調零點 (抗過衝) ---
-  else if (vbus_err_n < 20 && vbus_err_n > -20)
+  else if (vbus_err_n < 20 && vbus_err_n > -20) // ~ 5V
   {
     // 當誤差縮小時，稍微減小 b0 與 b1 的差值，降低積分衝力
     b0 = 120;
     b1 = -119; // 如果不能用浮點數，請維持 120 / -119，增加阻尼感
   }
-
+*/
   // 2. 差分方程計算
   int64_t acc = (int64_t)b0 * vbus_err_n;
   acc += (int64_t)b1 * vbus_err_1;
-  acc += ((int64_t)16384 * vbus_comp_1) >> 14; // 16384 = 1 >> 14
+  acc += ((int64_t)16383 * vbus_comp_1) >> 14; // 16384 = 1 >> 14
 
   int32_t y_n = (int32_t)acc;
 
@@ -382,66 +419,71 @@ void Vol_Loop_PFC_1P1Z(void) // TEST OK
   vbus_comp_1 = y_n;
 
   // 5. 輸出 Duty >> 14
-  if (sys_state == STATE_PFC_SOFT_START) // 緩啟動期間直接控制 DUTY
-    TIM2->CCR1 = (vbus_comp_1 >> 14);    // 0~540
+  if (sys_state == STATE_PFC_SOFT_START || sys_state == STATE_RUN_SKIP) // 緩啟動期間直接控制 DUTY
+	  TIM2->CCR1 = (vbus_comp_1 >> 14); // 0 ~ 540
 
   // 6. 輸出 comp >> 9 (變大 32 倍) (MAX ~ 18000) (540*32=17280)差不多，>> 9 應該是對的
-  if (sys_state == STATE_RUN_NORMAL) // 正常工作時間輸出 COMP 值
-    vbus_comp2 = (vbus_comp_1 >> 9);
+  // if (sys_state == STATE_RUN_NORMAL) // 正常工作時間輸出 COMP 值
+  vbus_comp2 = (vbus_comp_1 >> 9) + (cr_feed_forward_output_q14 << 1); // 太大會直接 OVP
+  //vbus_comp2 = (vbus_comp_1 >> 9);
 }
-//==========================================================================
-// Cr 1P1Z 回授，做負載驟變補償，執行頻率 10KHZ
-// 抓取 vcr 的動態變化趨勢，並在穩態時回歸平靜
-void Load_Loop_1P1Z(void)
+//=============================================================
+static void Vol_Loop_PFC_1P1Z_UI(void) // ZERO: 120HZ, POLE:0.1HZ, G:10
 {
-  int32_t x0;
-  int64_t temp_y0; // 使用 64 位元暫存，完全避免 32 位元相乘時溢位
-  int32_t y0;
+  // 1. 計算誤差
+  int32_t vbus_err_0 = (int32_t)vbus_set - (int32_t)vbus_avg;
 
-  // 1. 讀取當前 vcr
-  x0 = vcr;
+  // 2. 2P2Z 運算 (Fixed-point Q14)
+  struct bode_plot_param_t *vloop_p = &pfc_vloop_bode_plot_param;
+  int64_t acc1 = (int64_t)vloop_p->b0 * vbus_err_0 + (int64_t)vloop_p->b1 * vbus_err_1;
 
-  // 2. 執行 1P1Z 差分方程計算:
-  temp_y0 = ((int64_t)CR_1P1Z_B0_Q14 * x0) + ((int64_t)CR_1P1Z_B1_Q14 * vcr_x1_q14) - ((int64_t)CR_1P1Z_A1_Q14 * vcr_y1_q14);
+  int64_t acc2 = (-((int64_t)vloop_p->a1 * vbus_comp_1)) >> 14;
 
-  // 將 Q28 格式還原回 Q14 格式（右移 14 位元
-  y0 = (int32_t)(temp_y0 >> 14);
+  acc1 += acc2;
+  int32_t y_n = acc1;
 
-  // 更新歷史狀態變數 (Q14 格式)
-  vcr_x1_q14 = x0;
-  vcr_y1_q14 = y0;
+  // 限制極限值
+  if (y_n > YN_MAX)
+    y_n = YN_MAX; // 540 << 14
+  else if (y_n < YN_MIN)
+    y_n = YN_MIN; // 12 << 14
 
-  // 定點數安全限幅 (Saturation)
-  if (y0 > CR_FF_MAX_Q14)
-    y0 = CR_FF_MAX_Q14; // 868352 = 53 duty
-  else if (y0 > -CR_FF_MIN_Q14)
-    y0 = -CR_FF_MIN_Q14;
+  //  更新狀態變數 (儲存原始計算值以保留積分能量)
+  vbus_err_1 = vbus_err_0;
 
-  cr_feed_forward_output_q14 = y0;
+  // 重要：vbus_comp_1 儲存 local_temp，確保下一個週期的 a1, a2 運算正確
+  vbus_comp_1 = y_n;
+
+  // 5. 輸出 Duty >> 14
+  if (sys_state == STATE_PFC_SOFT_START || sys_state == STATE_RUN_SKIP) // 緩啟動期間直接控制 DUTY
+	  TIM2->CCR1 = (vbus_comp_1 >> 14); // 0 ~ 540
+
+  // 6. 輸出 comp >> 9 (變大 32 倍) (MAX ~ 18000) (540*32=17280)差不多，>> 9 應該是對的
+  // if (sys_state == STATE_RUN_NORMAL) // 正常工作時間輸出 COMP 值
+  vbus_comp2 = (vbus_comp_1 >> 9);
 }
+
 //========================================================================
 __attribute__((always_inline)) static inline void Cur_Loop_PFC_2P2Z(void) // 優化後 3.65us
 {
-  if (sys_state != STATE_RUN_NORMAL) return;
+  if (sys_state != STATE_RUN_NORMAL)
+    return;
 
-  if (is_zero_crossing == 1) return; // 凍結積分，改善過零後上升緣的突波
+  // if (is_zero_crossing == 1) return; // 凍結積分，改善過零後上升緣的突波
 
   // 1. 取得回授與計算誤差
   int32_t local_vbus_comp2 = vbus_comp2;
   int32_t local_vac_avg1 = vac_avg1;
 
   // 電流採樣處理
-  int32_t local_iac = 3840 - iac;   // OPA 電路的關係，實際值為 CURR_OFFSET - ADC
-  if (local_iac < 0) local_iac = 0; // 避免負值
+  int32_t local_iac = 3840 - iac; // OPA 電路的關係，實際值為 CURR_OFFSET - ADC
+  if (local_iac < 0)
+    local_iac = 0; // 避免負值
 
   // 計算電流給定值
-  // int32_t local_iac_set = (local_vac_avg1 * local_vbus_comp2) / 5700;
   int32_t local_iac_set = (local_vac_avg1 * local_vbus_comp2) >> 12; // >> 12 = / 4096
   int32_t local_iac_err_0 = local_iac_set - local_iac;               // err = set - meas
 
-  // print1 = local_iac_err_0;
-  // print2 = local_iac_set;
-
   // 2. 2P2Z 運算 (Fixed-point Q14)
 #if 1
   struct bode_plot_param_t *bplot_p = &bode_plot_param;
@@ -468,17 +510,19 @@ __attribute__((always_inline)) static inline void Cur_Loop_PFC_2P2Z(void) // 優
   iac_comp_2 = iac_comp_1;
   iac_comp_1 = y_n;
 
-  // 4. 硬體 Duty 限幅與輸出
-#if 0
-  uint16_t local_duty = (uint16_t)(y_n >> 14);
-
-#else
   uint16_t local_duty = 0;
-  int32_t ff_term;
-  if (vac_avg1 > 0) ff_term = ((uint32_t)(vbus_avg - vac_avg1) * PFC_DUTY_MAX) / vbus_avg;
-  local_duty = (uint16_t)((y_n >> 14) + ff_term);
-#endif
 
+  int32_t ff_term;
+  ff_term = (2800 - vac_avg1) * PFC_DUTY_MAX / 2800 - 200;
+
+  if (ff_term < 0) ff_term = 0;
+  if (vbus_comp2 >= 1000)
+    local_duty = (uint16_t)((y_n >> 14) + ff_term);
+  else
+    local_duty = (uint16_t)(y_n >> 14);
+
+  // local_duty = (uint16_t)(y_n >> 14);
+  //  4. 硬體 Duty 限幅與輸出
   if (local_duty > PFC_DUTY_MAX)
     local_duty = PFC_DUTY_MAX; // MAX = 540
   else if (local_duty < PFC_DUTY_MIN)
@@ -590,7 +634,7 @@ __INTERRUPT void isr_adc_handle(void)
   vbus = ADC0->DAT4_b.DATA; // PA10, AIN4
   vcr = ADC0->DAT5_b.DATA;  // PA11, AIN5
 
-  Cur_Loop_PFC_2P2Z(); // current loop
+  if (cur_loop_fun_en) Cur_Loop_PFC_2P2Z(); // current loop
 
   // GPIO_ResetBits(GPIOA, GPIO_Pin_06);
 
@@ -615,11 +659,13 @@ void reset_pid_parameters(void)
 //==============================================================================
 void Handle_UART_Monitor(void)
 {
+  static uint32_t msg_timer = 0;
   if (sys_get_tick() - msg_timer >= 1000) // msg_out = 1, print
   {
-    // printf("%d %d %d\r\n", vac_pk1, vac_pk2, is_brown_in);
+    printf("%d\r\n", vac);
     // printf("%d %d %d %d %d %d", power_on_cmd, sys_state, vbus_comp2, print1, print2, print3);
-    printf("%d %d %d", power_on_cmd, sys_state, vbus_comp2);
+    //msg("%d %d %d", power_on_cmd, sys_state, vac_pk2);
+    //msg("%d %d %d", iac, vac, vbus);
     // 電壓環輸出最大 COMP，但是電流環輸出最小 DUTY
     msg_timer = sys_get_tick();
   }
@@ -704,18 +750,256 @@ static void uart_rx_task(void)
 int main(void)
 {
   struct bode_plot_param_t *bplot_p = &bode_plot_param;
+  struct bode_plot_param_t *vloop_p = &pfc_vloop_bode_plot_param;
 
   // 基礎硬體底層設定 (HIRC 60MHz, GPIO, ADC 採樣率 1Msps) [cite: 55, 127, 184]
   SYS_Config();
 
+  //pfc_set_duty(15);
+  //pfc_pwm_enable();
+  //while(1);
+
+  //llc_set_period(600);
+  //llc_pwm_enable();
+  //while(1);
+
+  /*
+  while(1)
+  {
+	  Handle_UART_Monitor();
+  }
+   */
+
+  // PFC 電流環參數
   bode_plot_param_read_from_flash(bplot_p, FLASH_PROG_ADDR_USER_CALI);
 
-  vbus_comp2 = 3000;
-  sys_state = STATE_RUN_NORMAL;
-  pfc_pwm_enable();
-  pfc_running = 1;
+  /*********************************************************************/
+  /* PFC 電壓環參數*/
+  //  vloop_p->a2 = 0;
+  //  vloop_p->b2 = 0;
+
+  //  // 120HZ, 0.1Hz, 100G
+  //  vloop_p->b0 = 139;
+  //  vloop_p->b1 = -129;
+  //  vloop_p->a1 = -16383;
+  /*********************************************************************/
+  /* PFC 電流環參數*/
+  //bplot_p->b0 = 3353681;
+  //bplot_p->b1 = -1577632;
+  //bplot_p->b2 = -1712512;
+  //bplot_p->a1 = -20921;
+  //bplot_p->a2 = 4545;
+  /*********************************************************************/
+
+#if 0 // 單測 PFC 電壓環 (OK)
+      /* PFC 電壓環參數*/
+  {
+    vloop_p->a2 = 0;
+    vloop_p->b2 = 0;
+
+    // 120HZ, 0.1Hz, 100G
+    vloop_p->b0 = 139;
+    vloop_p->b1 = -129;
+    vloop_p->a1 = -16383;
+  }
+
+  cur_loop_fun_en = 0; // 關閉電流環，專測電壓環
+  sys_state = STATE_PFC_SOFT_START;
+
+  while (1)
+  {
+    //uart_rx_task();
+
+    if (tim0_trigger == 1) // 100KHZ
+    {
+      tim0_trigger = 0;
+      // --- 1. 高速信號濾波 (簡易位移算法減少算力消耗) ---
+      vac_avg1 = (vac_avg1 - (vac_avg1 >> 3)) + (vac >> 3);  // for current loop
+      vbus_avg = (vbus_avg - (vbus_avg >> 4)) + (vbus >> 4); // for voltage loop
+      vcr_avg = (vcr_avg - (vcr_avg >> 3)) + (vcr >> 3);
+      if (vbus_avg > vbus_ovp) Power_Off(); // ovp
+
+      Vac_Peak_Detector();
+
+      if (power_on_cmd == 1)
+      {
+        if (pfc_running == 0)
+        {
+          pfc_pwm_enable();
+          pfc_running = 1;
+        }
+
+        if (++v_loop_cnt >= 10) // 10KHZ
+        {
+          //Vol_Loop_PFC_1P1Z_UI();
+          Vol_Loop_PFC_1P1Z(); // 800W 板子會低 13V
+          v_loop_cnt = 0;
+        }
+      }
+    }
+
+    Key1_Scan();
+
+    //Handle_UART_Monitor();
+
+  }
+#endif
+
+#if 0 // 單測 PFC 電流環 (OK)
+      /* PFC 電流環參數*/
+      // Z1=200, Z2=1000000, P1=10, P2=20000, G=10000
+  bplot_p->b0 = 3353681;
+  bplot_p->b1 = -1577632;
+  bplot_p->b2 = -1712512;
+  bplot_p->a1 = -20114;
+  bplot_p->a2 = 3737;
+
+  cur_loop_fun_en = 1; // 開啟電流環，專測電流環
+  while (1)
+  {
+    //uart_rx_task();
+    if (tim0_trigger == 1) // 100KHZ
+    {
+      tim0_trigger = 0;
+      // --- 1. 高速信號濾波 (簡易位移算法減少算力消耗) ---
+      vac_avg1 = (vac_avg1 - (vac_avg1 >> 3)) + (vac >> 3);  // for current loop
+      vbus_avg = (vbus_avg - (vbus_avg >> 4)) + (vbus >> 4); // for voltage loop
+      // vcr_avg = (vcr_avg - (vcr_avg >> 3)) + (vcr >> 3);
+      if (vbus > vbus_ovp) Power_Off(); // ovp
+
+      Vac_Peak_Detector();
+
+      if (power_on_cmd == 1)
+      {
+        if (is_zero_crossing == 1)
+        {
+          sys_state = STATE_RUN_NORMAL;
+          // --- 關鍵修正：重新初始化電壓環內部狀態 ---
+          // 給予一個極小的初始 COMP 值，讓它從輕載慢慢往上爬
+          // vbus_comp_1 = (10 << 14); // 假設從一個極小的係數開始
+          vbus_err_1 = 0; // 清除誤差歷史
+          // vbus_comp2 = (vbus_comp_1 >> 9); // 讓電流環拿到的初始值是 10
+          vbus_comp2 = 4000; // 2000 不足，2500 過壓
+          // vset / 5700
+          // vbus_comp2: 3000, 275V / 0.25A = 68W
+          // vbus_comp2: 4000, 314V / 0.25A = 78W
+          // vbus_comp2: 5000, 360V / 0.25A = 90W
+          // vset >> 13 ( / 8192)
+          // vbus_comp2: 3000, 256V / 0.25A = 64W
+          // vbus_comp2: 4000, 267V / 0.25A = 66W
+          // vbus_comp2: 5000, 293V / 0.25A = 73W
+
+          // vbus_comp2: 2000, 298V / 0.25A = 75W ?? 波形不對 ff 的問題
+          // vbus_comp2: 1000, 398V / 0.25A = 75W ??
+        }
+        else if (sys_state == STATE_RUN_NORMAL)
+        {
+          if (pfc_running == 0)
+          {
+            pfc_pwm_enable();
+            pfc_running = 1;
+          }
+        }
+      }
+    }
+    Key1_Scan();
+  }
+#endif
+
+#if 0 // 測試 PFC 電壓環 + 電流環 (OK)
+	TIM2->CCR1 = 12; // min duty
+	sys_state = STATE_PFC_SOFT_START;
+
+	cur_loop_fun_en = 0; // 一開始關閉電流環，專測電流環
+	  {
+	    vloop_p->a2 = 0;
+	    vloop_p->b2 = 0;
+
+	    // 120HZ, 0.1Hz, 100G
+	    vloop_p->b0 = 139;
+	    vloop_p->b1 = -129;
+	    vloop_p->a1 = -16383;
+	  }
+      {
+    	  bplot_p->b0 = 3353681;
+    	  bplot_p->b1 = -1577632;
+    	  bplot_p->b2 = -1712512;
+    	  bplot_p->a1 = -20114;
+    	  bplot_p->a2 = 3737;
+      }
+
+	while(1)
+    {
+	    if (tim0_trigger == 1) // 100KHZ
+		{
+			tim0_trigger = 0;
+		    // --- 1. 高速信號濾波 (簡易位移算法減少算力消耗) ---
+			vac_avg1 = (vac_avg1 - (vac_avg1 >> 3)) + (vac >> 3);	// for current loop
+    		vbus_avg = (vbus_avg - (vbus_avg >> 4)) + (vbus >> 4);	// for voltage loop
+    		if (vbus > vbus_ovp) Power_Off(); // ovp
+
+    		Vac_Peak_Detector();
+
+    		if (power_on_cmd == 1)
+    		{
+    			if (sys_state == STATE_PFC_SOFT_START)
+    			{
+    				if (pfc_running == 0) {
+    					pfc_pwm_enable();
+    					pfc_running = 1;
+    				}
+
+    				if (++v_loop_cnt >= 10) // 10KHZ
+    				{
+    					Vol_Loop_PFC_1P1Z_UI();
+    					//Vol_Loop_PFC_1P1Z();
+    					v_loop_cnt = 0;
+    				}
+
+    				if (vbus_avg > vbus_set_l && is_zero_crossing == 1)
+    				{
+    					sys_state = STATE_RUN_NORMAL;
+    					// --- 關鍵修正：重新初始化電壓環內部狀態 ---
+    					// 給予一個極小的初始 COMP 值，讓它從輕載慢慢往上爬
+    					vbus_comp_1 = (10 << 14); // 假設從一個極小的係數開始
+    					vbus_err_1 = 0;           // 清除誤差歷史
+    					vbus_comp2 = (vbus_comp_1 >> 9); // 讓電流環拿到的初始值是 10
+    					cur_loop_fun_en = 1; // 開啟電流環
+    				}
+    			}
+
+    			else if (sys_state == STATE_RUN_NORMAL)
+    			{
+    				if (pfc_running == 0) {
+    					pfc_pwm_enable();
+    					pfc_running = 1;
+    				}
+
+    				if (++v_loop_cnt >= 10) // 10KHZ
+    				{
+    					Vol_Loop_PFC_1P1Z_UI();
+    					//Vol_Loop_PFC_1P1Z();
+    					v_loop_cnt = 0;
+    				}
+    			}
+    		}
+		}
+	    Key1_Scan();
+	    //Handle_UART_Monitor();
+    }
+#endif
 
   // main loop
+
+  /* PFC 電流環參數*/
+  // Z1=200, Z2=100000, P1=10, P2=20000, G=8000
+    bplot_p->b0 = 3353681;
+    bplot_p->b1 = -1577632;
+    bplot_p->b2 = -1712512;
+    bplot_p->a1 = -20114;
+    bplot_p->a2 = 3737;
+
+  cur_loop_fun_en = 1; // 開啟電流環，專測電流環
   while (1)
   {
     uart_rx_task();
@@ -728,144 +1012,153 @@ int main(void)
       // 高速信號濾波 (簡易位移算法減少算力消耗) ---
       vac_avg1 = (vac_avg1 - (vac_avg1 >> 3)) + (vac >> 3);  // for current loop
       vbus_avg = (vbus_avg - (vbus_avg >> 4)) + (vbus >> 4); // for voltage loop
+      vcr_avg = (vcr_avg - (vcr_avg >> 3)) + (vcr >> 3);
       // 系統安全監控 (軟體第二道防護)
-      if (vbus > vbus_ovp)
+      // vbus ovp
+      if (vbus_avg > vbus_ovp)
       {
         sys_state = STATE_FAULT;
         Power_Off();
-      } // vbus ovp
+      }
+#if 0
+      // vac over voltage
       if (vac_pk2 > 2600)
       {
         sys_state = STATE_FAULT;
         Power_Off();
-      } // vac over voltage
-      if (power_on_cmd == 0 && pfc_running == 1) Power_Off();
-
+      }
+#endif
+#if 0
+      // vac brown out
+      if (vac_pk2 < VOLT_BROWN_OUT && pfc_running == 1)
+      {
+        sys_state = STATE_FAULT;
+        Power_Off();
+      }
+#endif
       Vac_Peak_Detector(); // VAC 峰值偵測
 
-      if (sys_get_tick() > 100 && power_on_cmd == 1 && is_zero_crossing == 1)
+#if 1
+      // --- 2. 核心狀態機邏輯 -----------------------------------------------------------------------
+      switch (sys_state)
       {
-        sys_state = STATE_RUN_NORMAL;
-        if (pfc_running == 0)
-        {
-          pfc_pwm_enable();
-          pfc_running = 1;
-        }
-      }
+        case STATE_INIT: // 0
+          // 等待約 100ms，並按下按鍵
+          if (sys_get_tick() > 100 && power_on_cmd == 1)
+          {
+            sys_state = STATE_STANDBY;
+          }
+          break;
 
-#if 0
-		    // --- 2. 核心狀態機邏輯 -----------------------------------------------------------------------
-		    switch (sys_state)
-		    {
-		    	case STATE_INIT: // 0
-		    		// 等待約 100ms，並按下按鍵
-		    		if (sys_get_tick() > 100 && power_on_cmd == 1) {
-		    			sys_state = STATE_STANDBY;
-		    		}
-		        break;
+        case STATE_STANDBY: // 1
+          // Brown-in 判斷
+          if (is_brown_in == 1)
+          {
+            sys_state = STATE_PFC_SOFT_START; // 先進 PFC SS
+            TIM2->CCR1 = PFC_DUTY_MIN;
+          }
+          break;
 
-		        case STATE_STANDBY: // 1
-		        	// Brown-in 判斷
-		        	if (is_brown_in == 1) {
-		                sys_state = STATE_PFC_SOFT_START; // 先進 PFC SS
-		                TIM2->CCR1 = PFC_DUTY_MIN;
-		            }
-		            break;
+        case STATE_PFC_SOFT_START: // 2
+                                   // 若 vbus < 320 做 pre-charge
+          if (pfc_running == 0)
+          {
+            pfc_pwm_enable();
+            pfc_running = 1;
+          }
 
-		        case STATE_PFC_SOFT_START: // 2
-		        	// 若 vbus < 320 做 pre-charge
-		        	if (vbus_avg < vbus_set_l)
-		        	{
-			        	if (pfc_running == 0) {
-			        		pfc_pwm_enable();
-			        		pfc_running = 1;
-			        	}
-				        if (++v_loop_cnt >= 10) {
-				        	Vol_Loop_PFC_1P1Z();
-				            v_loop_cnt = 0;
-				        }
-		        	}
-		        	else
-		        	{
-		        		//pfc_pwm_disable(); // 測試 OK
-		        		//pfc_running = 0;
-		        		// PFC 不關閉，在 LLC SS 期間進閉環
-		        		// sys_state = STATE_PAUSE; // 先暫停，測試用
-		        		// sys_state = STATE_LLC_SOFT_START;
-		        		// 準備 LLC 軟啟動參數 (起點頻率 2倍諧振頻率)
-		                //llc_period_ss = LLC_SS_MIN; // 已經放大 4 倍
-		        		sys_state = STATE_RUN_NORMAL; // 直接接電流環
-		                // 重要動作
-    					vbus_comp_1 = (10 << 14); // 假設從一個極小的係數開始
-    					vbus_err_1 = 0;           // 清除誤差歷史
-		        	}
-		        	break;
+          if (++v_loop_cnt >= 10) // 10KHZ
+          {
+            Vol_Loop_PFC_1P1Z();
+            //Vol_Loop_PFC_1P1Z();
+            v_loop_cnt = 0;
+          }
 
-		        case STATE_RUN_NORMAL: // 4
-		        	//if (pfc_running == 0) {
-		        	//	pfc_pwm_enable();
-		        	//	pfc_running = 1;
-		        	//}
+          if (vbus_avg > vbus_set_h)
+          {
+            sys_state = STATE_LLC_SOFT_START;
+            llc_period_ss = LLC_SS_MIN;
+            pfc_pwm_disable();
+            pfc_running = 0;
+            TIM2->CCR1 = PFC_DUTY_MIN;
+            // --- 關鍵修正：重新初始化電壓環內部狀態 ---
+            // 給予一個極小的初始 COMP 值，讓它從輕載慢慢往上爬
+            // vbus_comp_1 = (10 << 14); // 假設從一個極小的係數開始
+            // vbus_err_1 = 0;           // 清除誤差歷史
+            // vbus_comp2 = (vbus_comp_1 >> 9); // 讓電流環拿到的初始值是 10
+          }
+          break;
 
-			        if (++v_loop_cnt >= 10) {
-			        	// 先算前饋，再算主環，最後疊加
-			        	//Load_Loop_1P1Z(); // Cr 前饋
-			        	Vol_Loop_PFC_1P1Z(); // PFC 電壓環
-			        	//Vol_Loop_PFC();
-			        	//Vol_Loop_LLC(); // LLC 電壓環
-			            v_loop_cnt = 0;
-			        }
+        case STATE_LLC_SOFT_START: // 3
+          // LLC 軟啟動：頻率由高往低掃描 (掃向 1倍諧振頻率)
+          llc_period_ss++;
+          llc_ss_cnt++;
+          llc_set_period(llc_period_ss >> 2); // 放大 4 倍，要除 4 回來
 
-		        break;
+          if (llc_running == 0)
+          {
+            llc_pwm_enable();
+            llc_running = 1;
+          }
 
-		        case STATE_RUN_SKIP: // 5
-		        // 電壓外環計算 (10kHz)
-		        if (++v_loop_cnt >= 10) {
-		        	//Vol_Loop_PFC(); // KP / KI 要快
-		            //Vol_Loop_LLC();
-		            v_loop_cnt = 0;
-		        }
-		        /* 有問題
-		        // Brown-out 判斷
-		        if (vac_pk2 < VAC_BROWN_OUT) {
-		        	brownout_cnt++;
-		        	if (brownout_cnt > BROWNOUT_DELAY) {
-		        		Power_Off();
-		        		sys_state = STATE_STANDBY;
-		        	}
-		        }
-		        else {
-		        	brownout_cnt = 0;
-		        }
-		        */
-		        /* 先不做
-		        // --- BURST / SKIP 邏輯 (帶滯後區間) ---
-		        // 只在過零點判斷
-		        if (is_zero_crossing == 1) {
-		        	if (vbus_avg > vbus_set_h) { // 上限觸發停機
-			        	pfc_pwm_disable();
-			            burst_mode_active = 1;
-		        	}
-		        	else if (vbus_avg < vbus_set_l && burst_mode_active == 1) { // 下限觸發回復
-		        		reset_pid_parameters();
-		                pfc_pwm_enable();
-		                burst_mode_active = 0;
-		        	}
-		        }
-		        */
-		        break;
+          if (llc_ss_cnt >= LLC_SS_COUNT && is_zero_crossing == 1)
+          {
+            sys_state = STATE_RUN_NORMAL;
+            // sys_state = STATE_PAUSE;	// 測試用
+            //  重要動作 =====================================
+            vbus_comp_1 = YN_MIN; // 假設從一個極小的係數開始
+            vbus_comp2 = (vbus_comp_1 >> 9);
+            vbus_err_1 = 0; // 清除誤差歷史
+            iac_err_2 = 0;
+            iac_err_1 = 0;
+            iac_comp_2 = YN_MIN;
+            iac_comp_1 = YN_MIN;
+            // msg("%d %d %d %d \r\n", power_on_cmd, sys_state, vbus_comp_1, vbus_comp2);
+            //  1 4 196608, = 12 << 14
+            //  E LOAD 抽太慢，導致 OVP ?? (是的)
+          }
+          break;
 
-		        case STATE_FAULT: // 5
-		        // 立即封鎖所有輸出
-		        pfc_pwm_disable();
-		        llc_pwm_disable();
-		        // 記錄故障代碼，等待手動重置
-		        break;
+        case STATE_RUN_NORMAL: // 4
+          if (pfc_running == 0)
+          {
+            pfc_pwm_enable();
+            pfc_running = 1;
+          }
 
-		        case STATE_PAUSE: // 6
-		        break;
+          if (++v_loop_cnt >= 10)
+          {
+            // 先算前饋，再算主環，最後疊加
+            Load_Loop_1P1Z(); // Cr 前饋
+            Vol_Loop_PFC_1P1Z(); // PFC 電壓環
+            //Vol_Loop_LLC(); // LLC 電壓環
+            v_loop_cnt = 0;
+          }
 
-		    } // switch case
+
+          if (++v_loop_cnt2 >= 5) // 好一點
+          {
+            Vol_Loop_LLC(); // LLC 電壓環
+            v_loop_cnt2 = 0;
+          }
+
+
+          break;
+
+        case STATE_RUN_SKIP: // 5
+          break;
+
+        case STATE_FAULT: // 6
+          // 立即封鎖所有輸出
+          pfc_pwm_disable();
+          llc_pwm_disable();
+          // 記錄故障代碼，等待手動重置
+          break;
+
+        case STATE_PAUSE: // 7
+          break;
+
+      } // switch case
 #endif
 
     } // if tim0_trigger

pec930_sdk-v1.0.1/Tools/openocd/scripts/target/pec930.cfg

@@ -1,5 +1,5 @@
 
-adapter speed 5000
+adapter speed 1000
 reset_config srst_only
 adapter srst pulse_width 100