Merge pull request #649 from lonelycorn/master

Updated MCU HAL to support other chips in the ESP32 family
Paciente8159 · Feb 28, 2024 · d980950 · d980950
2 parents 2b15b78 + ee7b158
commit d980950
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/uCNC/src/hal/mcus/esp32/mcumap_esp32.h b/uCNC/src/hal/mcus/esp32/mcumap_esp32.h
@@ -2493,7 +2493,7 @@ extern "C"
 
 #ifdef PWM0_CHANNEL
 #define PWM0_LEDCCHANNEL (PWM0_CHANNEL & 0x07)
-#if (PWM0_CHANNEL < 8)
+#if (PWM0_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM0_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM0_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2505,7 +2505,7 @@ extern "C"
 #endif
 #ifdef PWM1_CHANNEL
 #define PWM1_LEDCCHANNEL (PWM1_CHANNEL & 0x07)
-#if (PWM1_CHANNEL < 8)
+#if (PWM1_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM1_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM1_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2517,7 +2517,7 @@ extern "C"
 #endif
 #ifdef PWM2_CHANNEL
 #define PWM2_LEDCCHANNEL (PWM2_CHANNEL & 0x07)
-#if (PWM2_CHANNEL < 8)
+#if (PWM2_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM2_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM2_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2529,7 +2529,7 @@ extern "C"
 #endif
 #ifdef PWM3_CHANNEL
 #define PWM3_LEDCCHANNEL (PWM3_CHANNEL & 0x07)
-#if (PWM3_CHANNEL < 8)
+#if (PWM3_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM3_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM3_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2541,7 +2541,7 @@ extern "C"
 #endif
 #ifdef PWM4_CHANNEL
 #define PWM4_LEDCCHANNEL (PWM4_CHANNEL & 0x07)
-#if (PWM4_CHANNEL < 8)
+#if (PWM4_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM4_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM4_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2553,7 +2553,7 @@ extern "C"
 #endif
 #ifdef PWM5_CHANNEL
 #define PWM5_LEDCCHANNEL (PWM5_CHANNEL & 0x07)
-#if (PWM5_CHANNEL < 8)
+#if (PWM5_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM5_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM5_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2565,7 +2565,7 @@ extern "C"
 #endif
 #ifdef PWM6_CHANNEL
 #define PWM6_LEDCCHANNEL (PWM6_CHANNEL & 0x07)
-#if (PWM6_CHANNEL < 8)
+#if (PWM6_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM6_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM6_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2577,7 +2577,7 @@ extern "C"
 #endif
 #ifdef PWM7_CHANNEL
 #define PWM7_LEDCCHANNEL (PWM7_CHANNEL & 0x07)
-#if (PWM7_CHANNEL < 8)
+#if (PWM7_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM7_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM7_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2589,7 +2589,7 @@ extern "C"
 #endif
 #ifdef PWM8_CHANNEL
 #define PWM8_LEDCCHANNEL (PWM8_CHANNEL & 0x07)
-#if (PWM8_CHANNEL < 8)
+#if (PWM8_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM8_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM8_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2601,7 +2601,7 @@ extern "C"
 #endif
 #ifdef PWM9_CHANNEL
 #define PWM9_LEDCCHANNEL (PWM9_CHANNEL & 0x07)
-#if (PWM9_CHANNEL < 8)
+#if (PWM9_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM9_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM9_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2613,7 +2613,7 @@ extern "C"
 #endif
 #ifdef PWM10_CHANNEL
 #define PWM10_LEDCCHANNEL (PWM10_CHANNEL & 0x07)
-#if (PWM10_CHANNEL < 8)
+#if (PWM10_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM10_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM10_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2625,7 +2625,7 @@ extern "C"
 #endif
 #ifdef PWM11_CHANNEL
 #define PWM11_LEDCCHANNEL (PWM11_CHANNEL & 0x07)
-#if (PWM11_CHANNEL < 8)
+#if (PWM11_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM11_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM11_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2637,7 +2637,7 @@ extern "C"
 #endif
 #ifdef PWM12_CHANNEL
 #define PWM12_LEDCCHANNEL (PWM12_CHANNEL & 0x07)
-#if (PWM12_CHANNEL < 8)
+#if (PWM12_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM12_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM12_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2649,7 +2649,7 @@ extern "C"
 #endif
 #ifdef PWM13_CHANNEL
 #define PWM13_LEDCCHANNEL (PWM13_CHANNEL & 0x07)
-#if (PWM13_CHANNEL < 8)
+#if (PWM13_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM13_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM13_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2661,7 +2661,7 @@ extern "C"
 #endif
 #ifdef PWM14_CHANNEL
 #define PWM14_LEDCCHANNEL (PWM14_CHANNEL & 0x07)
-#if (PWM14_CHANNEL < 8)
+#if (PWM14_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM14_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM14_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2673,7 +2673,7 @@ extern "C"
 #endif
 #ifdef PWM15_CHANNEL
 #define PWM15_LEDCCHANNEL (PWM15_CHANNEL & 0x07)
-#if (PWM15_CHANNEL < 8)
+#if (PWM15_CHANNEL < 8) && SOC_LEDC_SUPPORT_HS_MODE
 #define PWM15_SPEEDMODE LEDC_HIGH_SPEED_MODE
 #else
 #define PWM15_SPEEDMODE LEDC_LOW_SPEED_MODE
@@ -2812,7 +2812,7 @@ extern "C"
 #define mcu_config_analog(X)                                                      \
 	{                                                                             \
 		mcu_config_input(X);                                                      \
-		adc1_config_width(ADC_WIDTH_BIT_10);                                      \
+		adc1_config_width(ADC_WIDTH_MAX - 1);                                     \
 		adc1_config_channel_atten(__indirect__(X, ADC_CHANNEL), ADC_ATTEN_DB_11); \
 	}
 #define mcu_config_pullup(X)                                       \
@@ -2870,7 +2870,7 @@ extern "C"
 		ledc_update_duty(__indirect__(X, SPEEDMODE), __indirect__(X, LEDCCHANNEL)); \
 	}
 #define mcu_get_pwm(X) ledc_get_duty(__indirect__(X, SPEEDMODE), __indirect__(X, LEDCCHANNEL))
-#define mcu_get_analog(X) adc1_get_raw(__indirect__(X, ADC_CHANNEL))
+#define mcu_get_analog(X) (adc1_get_raw(__indirect__(X, ADC_CHANNEL)) >> (ADC_WIDTH_MAX - 2))
 
 	extern void esp32_delay_us(uint16_t delay);
 #define mcu_delay_us(X) esp32_delay_us(X)