@@ -24,7 +24,7 @@ mrb_esp32_gpio_pin_mode(mrb_state *mrb, mrb_value self) {
24
24
return mrb_nil_value ();
25
25
}
26
26
27
- gpio_pad_select_gpio (mrb_fixnum (pin ));
27
+ esp_rom_gpio_pad_select_gpio (mrb_fixnum (pin ));
28
28
gpio_set_direction (mrb_fixnum (pin ), mrb_fixnum (dir ) & ~GPIO_MODE_DEF_PULLUP );
29
29
30
30
if (mrb_fixnum (dir ) & GPIO_MODE_DEF_PULLUP ) {
@@ -89,16 +89,11 @@ mrb_esp32_gpio_analog_read(mrb_state *mrb, mrb_value self) {
89
89
return mrb_nil_value ();
90
90
}
91
91
92
- adc1_config_channel_atten (mrb_fixnum (ch ), ADC_ATTEN_11db );
92
+ adc1_config_channel_atten (mrb_fixnum (ch ), ADC_ATTEN_DB_11 );
93
93
94
94
return mrb_fixnum_value (adc1_get_raw (mrb_fixnum (ch )));
95
95
}
96
96
97
- static mrb_value
98
- mrb_esp32_gpio_hall_read (mrb_state * mrb , mrb_value self ) {
99
- return mrb_fixnum_value (hall_sensor_read ());
100
- }
101
-
102
97
void
103
98
mrb_mruby_esp32_gpio_gem_init (mrb_state * mrb )
104
99
{
@@ -112,9 +107,8 @@ mrb_mruby_esp32_gpio_gem_init(mrb_state* mrb)
112
107
mrb_define_module_function (mrb , gpio , "digitalRead" , mrb_esp32_gpio_digital_read , MRB_ARGS_REQ (1 ));
113
108
mrb_define_module_function (mrb , gpio , "analogWrite" , mrb_esp32_gpio_analog_write , MRB_ARGS_REQ (2 ));
114
109
mrb_define_module_function (mrb , gpio , "analogRead" , mrb_esp32_gpio_analog_read , MRB_ARGS_REQ (1 ));
115
- mrb_define_module_function (mrb , gpio , "hallRead" , mrb_esp32_gpio_hall_read , MRB_ARGS_NONE ());
116
-
117
- adc1_config_width (ADC_WIDTH_12Bit );
110
+
111
+ adc1_config_width (ADC_BITWIDTH_12 );
118
112
119
113
constants = mrb_define_module_under (mrb , gpio , "Constants" );
120
114
@@ -162,9 +156,8 @@ mrb_mruby_esp32_gpio_gem_init(mrb_state* mrb)
162
156
define_const (GPIO_NUM_39 );
163
157
define_const (GPIO_NUM_MAX );
164
158
165
- define_const (DAC_CHANNEL_1 );
166
- define_const (DAC_CHANNEL_2 );
167
- define_const (DAC_CHANNEL_MAX );
159
+ define_const (DAC_CHAN_0 );
160
+ define_const (DAC_CHAN_1 );
168
161
169
162
define_const (ADC1_CHANNEL_0 );
170
163
define_const (ADC1_CHANNEL_1 );
0 commit comments