Updated to make use of the new ioports API functionality.

Author: terjeio

main/driver.c

@@ -1895,13 +1895,12 @@ IRAM_ATTR static void aux_irq_handler (uint8_t port, bool state)
 
 static bool aux_claim_explicit (aux_ctrl_t *aux_ctrl)
 {
-    if(ioport_claim(Port_Digital, Port_Input, &aux_ctrl->aux_port, NULL)) {
-        ioport_assign_function(aux_ctrl, &((input_signal_t *)aux_ctrl->input)->id);
+    xbar_t *pin;
+
+    if((pin = ioport_claim(Port_Digital, Port_Input, &aux_ctrl->aux_port, NULL))) {
+        ioport_set_function(pin, aux_ctrl->function, &aux_ctrl->cap);
 #ifdef PROBE_PIN
         if(aux_ctrl->function == Input_Probe) {
-
-            xbar_t *pin = hal.port.get_pin_info(Port_Digital, Port_Input, aux_ctrl->aux_port);
-
             probe_port = aux_ctrl->aux_port;
             hal.probe.get_state = probeGetState;
             hal.probe.configure = probeConfigure;
@@ -1928,6 +1927,8 @@ static bool aux_claim_explicit (aux_ctrl_t *aux_ctrl)
 
 bool aux_out_claim_explicit (aux_ctrl_out_t *aux_ctrl)
 {
+    xbar_t *pin;
+
 #ifdef USE_EXPANDERS
     if(aux_ctrl->port == (void *)EXPANDER_PORT) {
         if((iox_out[aux_ctrl->pin] = malloc(sizeof(xbar_t))))
@@ -1936,10 +1937,10 @@ bool aux_out_claim_explicit (aux_ctrl_out_t *aux_ctrl)
             aux_ctrl->aux_port = 0xFF;
     } else
 #endif
-    if(ioport_claim(Port_Digital, Port_Output, &aux_ctrl->aux_port, NULL))
-        ioport_assign_out_function(aux_ctrl, &((output_signal_t *)aux_ctrl->output)->id);
-    else
-        aux_ctrl->aux_port = 0xFF;
+        if((pin = ioport_claim(Port_Digital, Port_Output, &aux_ctrl->aux_port, NULL)))
+            ioport_set_function(pin, aux_ctrl->function, NULL);
+        else
+            aux_ctrl->aux_port = 0xFF;
 
     return aux_ctrl->aux_port != 0xFF;
 }
@@ -3430,7 +3431,7 @@ bool driver_init (void)
 #else
     hal.info = "ESP32";
 #endif
-    hal.driver_version = "250404";
+    hal.driver_version = "250412";
     hal.driver_url = GRBL_URL "/ESP32";
 #ifdef BOARD_NAME
     hal.board = BOARD_NAME;

main/ioports.c

@@ -202,12 +202,24 @@ static bool register_interrupt_handler (uint8_t port, uint8_t user_port, pin_irq
     return ok;
 }
 
+static bool set_function (xbar_t *port, pin_function_t function)
+{
+    if(port->mode.input)
+        aux_in[port->id].id = function;
+    else
+        aux_out[port->id].id = function;
+
+    return true;
+}
+
 static xbar_t *get_pin_info (io_port_direction_t dir, uint8_t port)
 {
     static xbar_t pin;
 
     xbar_t *info = NULL;
 
+    pin.set_function = set_function;
+
     if(dir == Port_Input && port < digital.in.n_ports) {
         XBAR_SET_DIN_INFO(pin, port, aux_in[pin.id], digital_in_cfg, digital_in_state);
         info = &pin;

main/ioports_analog.c

@@ -305,11 +305,30 @@ static int32_t wait_on_input (io_port_type_t type, uint8_t port, wait_mode_t wai
 
 #endif
 
+static bool set_function (xbar_t *port, pin_function_t function)
+{
+    if(port->mode.input)
+        aux_in_analog[port->id].id = function;
+#if AUX_ANALOG_OUT
+    else
+        aux_out_analog[port->id].id = function;
+
+    return true;
+#else
+    return !!port->mode.input;
+#endif
+}
+
 static xbar_t *get_pin_info (io_port_direction_t dir, uint8_t port)
 {
     static xbar_t pin;
+
     xbar_t *info = NULL;
 
+    memset(&pin, 0, sizeof(xbar_t));
+
+    pin.set_function = set_function;
+
     switch(dir) {
 
         case Port_Input: