From 7d7f9ba6d205aa4fe92ef1eb44464e10a5a2d37b Mon Sep 17 00:00:00 2001 From: vickash Date: Sat, 22 Jul 2023 15:40:49 -0400 Subject: [PATCH 1/2] Switch gems back to master branches --- components/mruby_component/esp32_build_config.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/mruby_component/esp32_build_config.rb b/components/mruby_component/esp32_build_config.rb index 64627eb..95c917b 100644 --- a/components/mruby_component/esp32_build_config.rb +++ b/components/mruby_component/esp32_build_config.rb @@ -61,14 +61,14 @@ conf.gem :core => "mruby-print" conf.gem :core => "mruby-compiler" - conf.gem :github => "mruby-esp32/mruby-io", :branch => '0.5' - conf.gem :github => "mruby-esp32/mruby-fileio", :branch => '0.5' - conf.gem :github => "mruby-esp32/mruby-socket", :branch => '0.5' + conf.gem :github => "mruby-esp32/mruby-io" + conf.gem :github => "mruby-esp32/mruby-fileio" + conf.gem :github => "mruby-esp32/mruby-socket" - conf.gem :github => "mruby-esp32/mruby-esp32-system", :branch => '0.5' - conf.gem :github => "mruby-esp32/mruby-esp32-wifi", :branch => '0.5' - conf.gem :github => "mruby-esp32/mruby-esp32-mqtt", :branch => '0.5' + conf.gem :github => "mruby-esp32/mruby-esp32-system" + conf.gem :github => "mruby-esp32/mruby-esp32-wifi" + conf.gem :github => "mruby-esp32/mruby-esp32-mqtt" - conf.gem :github => "mruby-esp32/mruby-esp32-gpio", :branch => '0.5' - conf.gem :github => "mruby-esp32/mruby-esp32-ledc", :branch => '0.5' + conf.gem :github => "mruby-esp32/mruby-esp32-gpio" + conf.gem :github => "mruby-esp32/mruby-esp32-ledc" end From 9e68603bf21e7d0c33be37f40987c985304c6498 Mon Sep 17 00:00:00 2001 From: vickash Date: Sat, 22 Jul 2023 16:13:45 -0400 Subject: [PATCH 2/2] Fix GPIO_NUM_ constants in examples --- main/examples/gpio.rb | 3 ++- main/examples/ledc_breathe.rb | 2 +- main/examples/ledc_buzzer.rb | 2 +- main/examples/ledc_servo.rb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/examples/gpio.rb b/main/examples/gpio.rb index bbfa039..56b0722 100644 --- a/main/examples/gpio.rb +++ b/main/examples/gpio.rb @@ -1,4 +1,5 @@ -led = ESP32::GPIO::GPIO_NUM_25 +# Blink built-in LED. Change pin number as needed. +led = ESP32::GPIO_NUM_2 ESP32::GPIO::pinMode(led, ESP32::GPIO::OUTPUT) loop { diff --git a/main/examples/ledc_breathe.rb b/main/examples/ledc_breathe.rb index b82ef57..829da94 100644 --- a/main/examples/ledc_breathe.rb +++ b/main/examples/ledc_breathe.rb @@ -3,7 +3,7 @@ timer = ESP32::LEDC_TIMER_0 resolution = ESP32::LEDC_TIMER_8_BIT frequency = 1000 -pin = ESP32::GPIO::GPIO_NUM_2 # Built in LED on original ESP32 devkit. +pin = ESP32::GPIO_NUM_2 # Built in LED on original ESP32 devkit. ESP32::LEDC.timer_config(group, timer, resolution, frequency) ESP32::LEDC.channel_config(pin, group, timer, channel) diff --git a/main/examples/ledc_buzzer.rb b/main/examples/ledc_buzzer.rb index f709beb..53d6656 100644 --- a/main/examples/ledc_buzzer.rb +++ b/main/examples/ledc_buzzer.rb @@ -2,7 +2,7 @@ channel = ESP32::LEDC_CHANNEL_0 timer = ESP32::LEDC_TIMER_0 resolution = ESP32::LEDC_TIMER_8_BIT -pin = ESP32::GPIO::GPIO_NUM_4 +pin = ESP32::GPIO_NUM_4 # Configure the channel once. ESP32::LEDC.channel_config(pin, group, timer, channel) diff --git a/main/examples/ledc_servo.rb b/main/examples/ledc_servo.rb index fe339ba..db5030f 100644 --- a/main/examples/ledc_servo.rb +++ b/main/examples/ledc_servo.rb @@ -2,7 +2,7 @@ channel = ESP32::LEDC_CHANNEL_0 timer = ESP32::LEDC_TIMER_0 resolution = ESP32::LEDC_TIMER_14_BIT -pin = ESP32::GPIO::GPIO_NUM_4 +pin = ESP32::GPIO_NUM_4 frequency = 50 # Configure the channel and timer.