pin_enable_feature rename, and pinMode fix

Author: p3p

cores/arduino/Arduino.h

@@ -120,6 +120,7 @@ uint8_t analogReadResolution();
 
   gpio_set(pin, pin_status);
   // Set pin mode on every write (Arduino version does this)
+  pin_enable_function(pin, LPC176x::Function::GPIO);
   gpio_set_output(pin);
 }
 [[gnu::always_inline, gnu::optimize("O3")]] inline bool digitalRead(const pin_t pin) {

cores/arduino/HardwarePWM.h

@@ -26,7 +26,7 @@
 
 class HardwarePWM {
   // return the bits to attach the PWM hardware depending on port using a lookup table
-  [[nodiscard]] static constexpr int8_t pwm_feature_index(const pin_t pin) noexcept {
+  [[nodiscard]] static constexpr int8_t pwm_function_index(const pin_t pin) noexcept {
     constexpr std::array<int8_t, 5> lookup {-1, 2, 1, 3, -1};
     return lookup[pin_port(pin)];
   }
@@ -65,7 +65,7 @@ class HardwarePWM {
   static inline void set_idle(const pin_t pin) {
     gpio_set_output(pin); // used when at 0 duty cycle
     util::bit_set(idle_pins, get_pin_id(pin));      // mark pin as inactive
-    pin_enable_feature(pin, 0);
+    pin_enable_function(pin, LPC176x::Function::GPIO);
     gpio_clear(pin);
   }
 
@@ -148,7 +148,7 @@ class HardwarePWM {
     if(value == 0) {
       set_idle(pin);
     } else if(util::bit_test(idle_pins, get_pin_id(pin))) {
-      pin_enable_feature(pin, pwm_feature_index(pin));
+      pin_enable_function(pin, pwm_function_index(pin));
       util::bit_clear(idle_pins, get_pin_id(pin));
     }
   }
@@ -162,7 +162,7 @@ class HardwarePWM {
 
   static inline bool detach(const pin_t pin) {
     if (active(pin)) {
-      pin_enable_feature(pin, 0); // reenable gpio
+      pin_enable_function(pin, LPC176x::Function::GPIO); // reenable gpio
       gpio_clear(pin);
       deactivate_channel(pin);
       return true;

cores/arduino/SoftwarePWM.h

@@ -216,7 +216,7 @@ class SoftwarePWM {
     if (data_table.update(pin, value)) {
       gpio_set_output(pin);
       gpio_clear(pin);
-      pin_enable_feature(pin, 0);            // initialise pin for gpio output
+      pin_enable_function(pin, LPC176x::Function::GPIO);            // initialise pin for gpio output
       return true;
     }
     return false;

cores/arduino/Tone.cpp

@@ -26,7 +26,7 @@ void tone(const pin_t _pin, const uint32_t frequency, const uint32_t duration =
   LPC_TIM2->MR0 = (1000000 / (2 * frequency)) - 1;    // Match value (period) to set frequency
   LPC_TIM2->TCR = util::bit_value(0);                 // Counter Enable
 
-  pin_enable_feature(_pin, 0);
+  pin_enable_function(_pin, LPC176x::Function::GPIO);
   gpio_set_output(_pin);
   gpio_clear(_pin);
 

cores/arduino/arduino.cpp

@@ -66,6 +66,7 @@ void delay(const int msec) {
 // As defined by Arduino INPUT(0x0), OUTPUT(0x1), INPUT_PULLUP(0x2)
 void pinMode(const pin_t pin, const uint8_t mode) {
   if (!pin_is_valid(pin)) return;
+  pin_enable_function(pin, LPC176x::Function::GPIO);
   if(mode == OUTPUT) {
     gpio_set_output(pin);
     pin_set_mode(pin, PinMode::TRISTATE);

system/lpc176x/pin_control.h

@@ -14,6 +14,13 @@ namespace LPC176x {
     OPENDRAIN,
   };
 
+  enum Function : uint8_t {
+    GPIO,
+    FUNC1,
+    FUNC2,
+    FUNC3,
+  };
+
   struct pin_type {
     struct gpio_block {
       uint32_t reg_dir;               // 0x00
@@ -347,6 +354,6 @@ using LPC176x::PinMode;
   LPC176x::pin_type{pin}.enable_pwm();
 }
 
-[[gnu::always_inline]] inline void pin_enable_feature(const pin_t pin, uint8_t feature) {
-  LPC176x::pin_type{pin}.function(feature);
+[[gnu::always_inline]] inline void pin_enable_function(const pin_t pin, uint8_t function) {
+  LPC176x::pin_type{pin}.function(function);
 }