fix(GPIO): Alternative Function numbers were inverted + make inscribe return size_t (#543)

* fix(GPIO): Alternative Function numbers were inverted

* fix(GPIO): Revert previous fix, now invert AF mapping only on assignment

* feat(ST-LIB): Make inscribe() return size_t and use it from higher Domains

Author: FoniksFox

Inc/HALAL/Models/GPIO.hpp

@@ -71,6 +71,7 @@ struct GPIODomain {
       return GPIO_SPEED_FREQ_VERY_HIGH;
     }
   }
+  // Note: AF mapping is inverted: AF0 -> 15, AF1 -> 14, ..., AF15 -> 0, it is staticly casted and inverted later
   enum class AlternateFunction : uint8_t {
     NO_AF = 20,
     AF0 = 15,
@@ -189,10 +190,14 @@ struct GPIODomain {
       if (!pin.valid_af(af)) {
         compile_error("Alternate function not valid for this pin");
       }
+
+      if ((mode == OperationMode::ALT_PP || mode == OperationMode::ALT_OD) && af == AlternateFunction::NO_AF) {
+        compile_error("Alternate function must be specified for alternate modes");
+      }
     }
 
-    template <class Ctx> consteval void inscribe(Ctx &ctx) const {
-      ctx.template add<GPIODomain>(e, this);
+    template <class Ctx> consteval std::size_t inscribe(Ctx &ctx) const {
+      return ctx.template add<GPIODomain>(e, this);
     }
   };
 
@@ -221,7 +226,7 @@ struct GPIODomain {
       GPIO_InitStruct.Pull = to_hal_pull(e.pull);
       GPIO_InitStruct.Speed = to_hal_speed(e.speed);
       if (e.mode == OperationMode::ALT_PP || e.mode == OperationMode::ALT_OD) {
-        GPIO_InitStruct.Alternate = static_cast<uint32_t>(e.af);
+        GPIO_InitStruct.Alternate = 15 - static_cast<uint32_t>(e.af); // AF mapping inversion
       }
 
       cfgs[i].init_data = std::make_tuple(e.port, GPIO_InitStruct);

Inc/ST-LIB_LOW/DigitalInput2.hpp

@@ -18,10 +18,10 @@ struct DigitalInputDomain {
                            GPIODomain::Speed speed = GPIODomain::Speed::Low)
         : gpio{pin, GPIODomain::OperationMode::INPUT, pull, speed} {}
 
-    template <class Ctx> consteval void inscribe(Ctx &ctx) const {
-      const auto gpio_idx = ctx.template add<GPIODomain>(gpio.e, &gpio);
+    template <class Ctx> consteval std::size_t inscribe(Ctx &ctx) const {
+      const auto gpio_idx = gpio.inscribe(ctx);
       Entry e{.gpio_idx = gpio_idx};
-      ctx.template add<DigitalInputDomain>(e, this);
+      return ctx.template add<DigitalInputDomain>(e, this);
     }
   };
 

Inc/ST-LIB_LOW/DigitalOutput2.hpp

@@ -26,10 +26,10 @@ struct DigitalOutputDomain {
         : gpio{pin, static_cast<GPIODomain::OperationMode>(mode), pull, speed} {
     }
 
-    template <class Ctx> consteval void inscribe(Ctx &ctx) const {
-      const auto gpio_idx = ctx.template add<GPIODomain>(gpio.e, &gpio);
+    template <class Ctx> consteval std::size_t inscribe(Ctx &ctx) const {
+      const auto gpio_idx = gpio.inscribe(ctx);
       Entry e{.gpio_idx = gpio_idx};
-      ctx.template add<DigitalOutputDomain>(e, this);
+      return ctx.template add<DigitalOutputDomain>(e, this);
     }
   };