Small improvements to peripheral manager and SigmaDelta

Author: me-no-dev

cores/esp32/esp32-hal-periman.c

@@ -6,7 +6,7 @@
 
 #include "esp32-hal-log.h"
 #include "esp32-hal-periman.h"
-#include "soc/soc_caps.h"
+#include "esp_bit_defs.h"
 
 typedef struct {
 	peripheral_bus_type_t type;
@@ -16,10 +16,12 @@ typedef struct {
 static peripheral_bus_deinit_cb_t deinit_functions[ESP32_BUS_TYPE_MAX];
 static peripheral_pin_item_t pins[SOC_GPIO_PIN_COUNT];
 
+#define GPIO_NOT_VALID(p) ((p >= SOC_GPIO_PIN_COUNT) || ((SOC_GPIO_VALID_GPIO_MASK & (1ULL << p)) == 0))
+
 bool perimanSetPinBus(uint8_t pin, peripheral_bus_type_t type, void * bus){
 	peripheral_bus_type_t otype = ESP32_BUS_TYPE_INIT;
 	void * obus = NULL;
-	if(pin >= SOC_GPIO_PIN_COUNT){
+	if(GPIO_NOT_VALID(pin)){
 		log_e("Invalid pin: %u", pin);
 		return false;
 	}
@@ -53,7 +55,7 @@ bool perimanSetPinBus(uint8_t pin, peripheral_bus_type_t type, void * bus){
 }
 
 void * perimanGetPinBus(uint8_t pin, peripheral_bus_type_t type){
-	if(pin >= SOC_GPIO_PIN_COUNT){
+	if(GPIO_NOT_VALID(pin)){
 		log_e("Invalid pin: %u", pin);
 		return NULL;
 	}
@@ -68,7 +70,7 @@ void * perimanGetPinBus(uint8_t pin, peripheral_bus_type_t type){
 }
 
 peripheral_bus_type_t perimanGetPinBusType(uint8_t pin){
-	if(pin >= SOC_GPIO_PIN_COUNT){
+	if(GPIO_NOT_VALID(pin)){
 		log_e("Invalid pin: %u", pin);
 		return ESP32_BUS_TYPE_MAX;
 	}

cores/esp32/esp32-hal-periman.h

@@ -9,28 +9,49 @@ extern "C"
 {
 #endif
 
+#include "soc/soc_caps.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
 
 typedef enum {
 	ESP32_BUS_TYPE_INIT, 		// IO has not been attached to a bus yet
 	ESP32_BUS_TYPE_GPIO, 		// IO is used as GPIO
+	ESP32_BUS_TYPE_UART, 		// IO is used as UART pin
+#if SOC_SDM_SUPPORTED
 	ESP32_BUS_TYPE_SIGMADELTA, 	// IO is used as SigmeDelta output
+#endif
+#if SOC_ADC_SUPPORTED
 	ESP32_BUS_TYPE_ADC_ONESHOT, // IO is used as ADC OneShot input
 	ESP32_BUS_TYPE_ADC_CONT, 	// IO is used as ADC continuous input
+#endif
+#if SOC_DAC_SUPPORTED
 	ESP32_BUS_TYPE_DAC_ONESHOT, // IO is used as DAC OneShot output
 	ESP32_BUS_TYPE_DAC_CONT, 	// IO is used as DAC continuous output
 	ESP32_BUS_TYPE_DAC_COSINE, 	// IO is used as DAC cosine output
+#endif
+#if SOC_LEDC_SUPPORTED
+	ESP32_BUS_TYPE_LEDC, 		// IO is used as LEDC output
+#endif
+#if SOC_RMT_SUPPORTED
 	ESP32_BUS_TYPE_RMT_TX, 		// IO is used as RMT output
 	ESP32_BUS_TYPE_RMT_RX, 		// IO is used as RMT input
+#endif
+#if SOC_I2S_SUPPORTED
 	ESP32_BUS_TYPE_I2S_STD, 	// IO is used as I2S STD pin
 	ESP32_BUS_TYPE_I2S_PDM, 	// IO is used as I2S PDM pin
 	ESP32_BUS_TYPE_I2S_TDM, 	// IO is used as I2S TDM pin
-	ESP32_BUS_TYPE_UART, 		// IO is used as UART pin
+#endif
+#if SOC_I2C_SUPPORTED
 	ESP32_BUS_TYPE_I2C_MASTER, 	// IO is used as I2C master pin
 	ESP32_BUS_TYPE_I2C_SLAVE, 	// IO is used as I2C slave pin
+#endif
+#if SOC_GPSPI_SUPPORTED
 	ESP32_BUS_TYPE_SPI_MASTER, 	// IO is used as SPI master pin
+#endif
+#if SOC_SDMMC_HOST_SUPPORTED
+	ESP32_BUS_TYPE_SDMMC, 		// IO is used as SDMMC pin
+#endif
 	ESP32_BUS_TYPE_MAX
 } peripheral_bus_type_t;
 

cores/esp32/esp32-hal-sigmadelta.c

@@ -6,7 +6,8 @@
 
 #include "esp32-hal.h"
 #include "esp32-hal-periman.h"
-#include "soc/soc_caps.h"
+
+#if SOC_SDM_SUPPORTED
 #include "driver/sdm.h"
 
 static bool sigmaDeltaDetachBus(void * bus){
@@ -69,7 +70,7 @@ bool sigmaDeltaWrite(uint8_t pin, uint8_t duty) //chan 0-x according to SOC duty
         }
         return true;
     } else {
-        log_e("pin %u is not attached to SigmaDelta");
+        log_e("pin %u is not attached to SigmaDelta", pin);
     }
     return false;
 }
@@ -84,4 +85,5 @@ bool sigmaDeltaDetach(uint8_t pin)
         log_e("pin %u is not attached to SigmaDelta");
     }
     return false;
-}
+}
+#endif

cores/esp32/esp32-hal-sigmadelta.h

@@ -10,6 +10,9 @@
 extern "C" {
 #endif
 
+#include "soc/soc_caps.h"
+#if SOC_SDM_SUPPORTED
+
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -19,7 +22,7 @@ bool    sigmaDeltaWrite(uint8_t pin, uint8_t duty);
 uint8_t sigmaDeltaRead(uint8_t pin);
 bool    sigmaDeltaDetach(uint8_t pin);
 
-
+#endif
 #ifdef __cplusplus
 }
 #endif