Constants under ESP32 instead of GPIO module

vickash · vickash · commit 08293b59b8aa · 2023-03-11T16:36:59.000-04:00
diff --git a/mrblib/gpio.rb b/mrblib/gpio.rb
@@ -1,7 +1,7 @@
 module ESP32
+  include Constants
+  
   module GPIO
-    include Constants
-    
     class << self
       alias :digital_write :digitalWrite   
       alias :digital_read  :digitalRead
@@ -12,11 +12,11 @@ class << self
   
     class Pin
       PIN_MODE = {
-        pullup:   ESP32::GPIO::INPUT_PULLUP,
-        pulldown: ESP32::GPIO::INPUT_PULLDOWN,
-        input:    ESP32::GPIO::INPUT,
-        output:   ESP32::GPIO::OUTPUT,
-        inout:    ESP32::GPIO::INPUT_OUTPUT
+        pullup:   ESP32::GPIO_MODE_INPUT_PULLUP,
+        pulldown: ESP32::GPIO_MODE_INPUT_PULLDOWN,
+        input:    ESP32::GPIO_MODE_INPUT,
+        output:   ESP32::GPIO_MODE_OUTPUT,
+        inout:    ESP32::GPIO_MODE_INPUT_OUTPUT
       }
 
       attr_reader :pin
diff --git a/src/gpio.c b/src/gpio.c
@@ -110,7 +110,7 @@ mrb_mruby_esp32_gpio_gem_init(mrb_state* mrb)
   
   adc1_config_width(ADC_BITWIDTH_12);
 
-  constants = mrb_define_module_under(mrb, gpio, "Constants");
+  constants = mrb_define_module_under(mrb, esp32, "Constants");
 
 #define define_const(SYM) \
   do { \
@@ -172,11 +172,11 @@ mrb_mruby_esp32_gpio_gem_init(mrb_state* mrb)
   mrb_define_const(mrb, constants, "LOW", mrb_fixnum_value(0));
   mrb_define_const(mrb, constants, "HIGH", mrb_fixnum_value(1));
 
-  mrb_define_const(mrb, constants, "INPUT",          mrb_fixnum_value(GPIO_MODE_INPUT));
-  mrb_define_const(mrb, constants, "INPUT_OUTPUT",   mrb_fixnum_value(GPIO_MODE_INPUT_OUTPUT));
-  mrb_define_const(mrb, constants, "OUTPUT",         mrb_fixnum_value(GPIO_MODE_OUTPUT));
-  mrb_define_const(mrb, constants, "INPUT_PULLUP",   mrb_fixnum_value(GPIO_MODE_INPUT_PULLUP));
-  mrb_define_const(mrb, constants, "INPUT_PULLDOWN", mrb_fixnum_value(GPIO_MODE_INPUT_PULLDOWN));
+  mrb_define_const(mrb, constants, "GPIO_MODE_INPUT",          mrb_fixnum_value(GPIO_MODE_INPUT));
+  mrb_define_const(mrb, constants, "GPIO_MODE_INPUT_OUTPUT",   mrb_fixnum_value(GPIO_MODE_INPUT_OUTPUT));
+  mrb_define_const(mrb, constants, "GPIO_MODE_OUTPUT",         mrb_fixnum_value(GPIO_MODE_OUTPUT));
+  mrb_define_const(mrb, constants, "GPIO_MODE_INPUT_PULLUP",   mrb_fixnum_value(GPIO_MODE_INPUT_PULLUP));
+  mrb_define_const(mrb, constants, "GPIO_MODE_INPUT_PULLDOWN", mrb_fixnum_value(GPIO_MODE_INPUT_PULLDOWN));
     
 }
 
