From 6eedeaedaf347beb12a4957adf95ed04e7592144 Mon Sep 17 00:00:00 2001
From: Chris <52449218+shadow578@users.noreply.github.com>
Date: Wed, 15 May 2024 22:49:40 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20HC32=20temperature=20ADC?=
 =?UTF-8?q?=20(#27085)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/HC32/HAL.h         |  2 +-
 Marlin/src/HAL/HC32/MarlinHAL.cpp |  4 +++-
 Marlin/src/HAL/HC32/sysclock.cpp  | 31 +++++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/HAL/HC32/HAL.h b/Marlin/src/HAL/HC32/HAL.h
index 2f8da95580..cbcedd3537 100644
--- a/Marlin/src/HAL/HC32/HAL.h
+++ b/Marlin/src/HAL/HC32/HAL.h
@@ -142,7 +142,7 @@
 // ADC
 //
 #define HAL_ADC_VREF_MV 3300
-#define HAL_ADC_RESOLUTION 10
+#define HAL_ADC_RESOLUTION 12
 
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
diff --git a/Marlin/src/HAL/HC32/MarlinHAL.cpp b/Marlin/src/HAL/HC32/MarlinHAL.cpp
index acb96dadc6..f1d85f1694 100644
--- a/Marlin/src/HAL/HC32/MarlinHAL.cpp
+++ b/Marlin/src/HAL/HC32/MarlinHAL.cpp
@@ -232,7 +232,9 @@ int MarlinHAL::freeMemory() {
   return &top - _sbrk(0);
 }
 
-void MarlinHAL::adc_init() {}
+void MarlinHAL::adc_init() {
+  analogReadResolution(HAL_ADC_RESOLUTION);
+}
 
 void MarlinHAL::adc_enable(const pin_t pin) {
   #if TEMP_SENSOR_SOC
diff --git a/Marlin/src/HAL/HC32/sysclock.cpp b/Marlin/src/HAL/HC32/sysclock.cpp
index cf40ed2f0d..ad978bf74b 100644
--- a/Marlin/src/HAL/HC32/sysclock.cpp
+++ b/Marlin/src/HAL/HC32/sysclock.cpp
@@ -96,29 +96,44 @@ void core_hook_sysclock_init() {
     #endif
   #endif
 
-  // Setup clock divisors for sysclk = 200 MHz:
+  // sysclk is now configured to 200 MHz PLL output
+  constexpr uint32_t sysclock = 200000000;
+
+  // Setup clock divisors for sysclk = 200 MHz
   // Note: PCLK1 is used for step+temp timers, and need to be kept at 50 MHz (until there is a better solution)
-  stc_clk_sysclk_cfg_t sysClkConf = {
+  constexpr stc_clk_sysclk_cfg_t sysClkConf = {
       .enHclkDiv = ClkSysclkDiv1,  // HCLK  = 200 MHz (CPU)
       .enExclkDiv = ClkSysclkDiv2, // EXCLK = 100 MHz (SDIO)
-      .enPclk0Div = ClkSysclkDiv1, // PCLK0 = 200 MHz (Timer6 (not used))
+      .enPclk0Div = ClkSysclkDiv2, // PCLK0 = 100 MHz (Timer6 (not used))
       .enPclk1Div = ClkSysclkDiv4, // PCLK1 = 50 MHz (USART, SPI, I2S, Timer0 (step+temp), TimerA (Servo))
-      .enPclk2Div = ClkSysclkDiv4, // PCLK2 = 50 MHz (ADC)
+      .enPclk2Div = ClkSysclkDiv8, // PCLK2 = 25 MHz (ADC)
       .enPclk3Div = ClkSysclkDiv8, // PCLK3 = 25 MHz (I2C, WDT)
       .enPclk4Div = ClkSysclkDiv2, // PCLK4 = 100 MHz (ADC ctl)
   };
+
+  #if ARDUINO_CORE_VERSION_INT >= GET_VERSION_INT(1, 2, 0)
+    assert_system_clocks_valid<
+      sysclock,
+      sysClkConf.enHclkDiv,
+      sysClkConf.enPclk0Div,
+      sysClkConf.enPclk1Div,
+      sysClkConf.enPclk2Div,
+      sysClkConf.enPclk3Div,
+      sysClkConf.enPclk4Div,
+      sysClkConf.enExclkDiv
+    >();
+  #endif
+
   sysclock_set_clock_dividers(&sysClkConf);
 
   // Set power mode
-  #define POWER_MODE_SYSTEM_CLOCK 200000000 // 200 MHz
-  power_mode_update_pre(POWER_MODE_SYSTEM_CLOCK);
+  power_mode_update_pre(sysclock);
 
   // Switch to MPLL as sysclk source
   CLK_SetSysClkSource(CLKSysSrcMPLL);
 
   // Set power mode
-  power_mode_update_post(POWER_MODE_SYSTEM_CLOCK);
-  #undef POWER_MODE_SYSTEM_CLOCK
+  power_mode_update_post(sysclock);
 }
 
 #endif // ARDUINO_ARCH_HC32