Skip to content

Commit b07d44a

Browse files
committed
Merge commit '71d94b41a9f0e071b41356c47e3af78f78a7c5cc'
* commit '71d94b41a9f0e071b41356c47e3af78f78a7c5cc': Fix digital write instead of read Define both method styles in C. Alias methods aren't avaialble when top level including Define methods in C as snake case instead of camel case
2 parents 40c000b + 71d94b4 commit b07d44a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

mrblib/gpio.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ module GPIO
88
OUTPUT = ESP32::GPIO_MODE_OUTPUT
99
INPUT_OUTPUT = ESP32::GPIO_MODE_INPUT_OUTPUT
1010

11-
class << self
12-
alias :digital_write :digitalWrite
13-
alias :digital_read :digitalRead
14-
alias :analog_write :analogWrite
15-
alias :analog_read :analogRead
16-
alias :pin_mode :pinMode
17-
end
18-
1911
class Pin
2012
PIN_MODE = {
2113
pullup: ESP32::GPIO_MODE_INPUT_PULLUP,

src/gpio.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ mrb_mruby_esp32_gpio_gem_init(mrb_state* mrb)
128128
esp32 = mrb_define_module(mrb, "ESP32");
129129

130130
gpio = mrb_define_module_under(mrb, esp32, "GPIO");
131+
// Ruby-style snake case methods.
132+
mrb_define_module_function(mrb, gpio, "pin_mode", mrb_esp32_gpio_pin_mode, MRB_ARGS_REQ(2));
133+
mrb_define_module_function(mrb, gpio, "digital_write", mrb_esp32_gpio_digital_write, MRB_ARGS_REQ(2));
134+
mrb_define_module_function(mrb, gpio, "digital_read", mrb_esp32_gpio_digital_read, MRB_ARGS_REQ(1));
135+
mrb_define_module_function(mrb, gpio, "analog_write", mrb_esp32_gpio_analog_write, MRB_ARGS_REQ(2));
136+
mrb_define_module_function(mrb, gpio, "analog_read", mrb_esp32_gpio_analog_read, MRB_ARGS_REQ(1));
137+
138+
// Arduino-style camel case methods.
131139
mrb_define_module_function(mrb, gpio, "pinMode", mrb_esp32_gpio_pin_mode, MRB_ARGS_REQ(2));
132140
mrb_define_module_function(mrb, gpio, "digitalWrite", mrb_esp32_gpio_digital_write, MRB_ARGS_REQ(2));
133141
mrb_define_module_function(mrb, gpio, "digitalRead", mrb_esp32_gpio_digital_read, MRB_ARGS_REQ(1));

0 commit comments

Comments
 (0)