Merge pull request #57 from nishiko-ji/m5display

Make m5stack display faster

Author: sugiymki

example/master.rb.m5display

@@ -1,12 +1,24 @@
+speaker = GPIO.new(25, GPIO::OUT, -1, 0)
 display = ILI934X.new(23, 18, 14, 27, 33, 32)
+display.draw_fillrectangle(20, 20,  300, 170, [0x69, 0xba, 0xf5])
+display.draw_fillrectangle(20, 170, 300, 180, [0x28, 0xad, 0x35])
+display.draw_fillrectangle(20, 180, 300, 220, [0x55, 0x42, 0x3d])
+display.drawString(52, 52, "mruby/cの\n  世界へ\n      ようこそ！", 30, [0, 0, 0])
+display.drawString(50, 50, "mruby/cの\n  世界へ\n      ようこそ！", 30, [255, 255, 255])
 sleep 10
-display.drawRectangle(20, 300, 20, 170, ILI934X.color(0x69, 0xba, 0xf5))
-display.drawRectangle(20, 300, 170, 180, ILI934X.color(0x28, 0xad, 0x35))
-display.drawRectangle(20, 300, 180, 220, ILI934X.color(0x55, 0x42, 0x3d))
-x = [200, 230, 170]
-y = [150, 200, 200]
-3.times do |i|
-  drawLine(display, x[i], x[(i + 1) % 3], y[i], y[(i + 1) % 3], ILI934X.color(0x96, 0x56, 0xa1), 5)
-end
-display.writeString("12345:\n67890.", 50, 50, 20, 35, 30, ILI934X.color(0x27, 0x1c, 0x19), nil)
-display.writeString("12345:\n67890.", 45, 45, 20, 35, 30, ILI934X.color(0xff, 0xf3, 0xec), nil)
+i = 0
+while true do
+  display.fill([i, i, i])
+  5.times do |x|
+    5.times do |y|
+      display.draw_pixel(10 + x, 10 + y, [255, 0, 0])
+    end
+  end
+  display.draw_line(20, 50, 240, 230, [0, 0, 255])
+  display.draw_rectangle(30, 20, 310, 200, [0, 255, 0])
+  display.draw_circle(160, 120, 20, [100, 50, 220])
+  display.draw_fillcircle(160, 120, 10, [100, 50, 220])
+  i += 1
+  p "light: #{i}" if i % 10 == 0
+  i = 0 if i == 256
+end

main/Kconfig.projbuild

@@ -9,8 +9,14 @@ menu "IoTeX ESP32 mrubyc Configuration"
         help
             use GPIO function?
 
-   
-     config USE_ESP32_GPIO_PERIPHERALS_SHT75
+    config USE_ESP32_GPIO_IRQHANDLER
+        bool "USR ESP32 GPIO IRQ Handler"
+	depends on USE_ESP32_GPIO
+        default n
+        help
+            use IRQ handler with GPIO?
+
+    config USE_ESP32_GPIO_PERIPHERALS_SHT75
         bool "PERIPHERAL: Temperature/Humidity Sensor SENSIRION SHT75"
 	depends on USE_ESP32_GPIO
         default n

main/font.h

@@ -65,6 +65,8 @@
 //*********************************************
 #ifdef CONFIG_USE_ESP32_GPIO
 #include "models/gpio.h"
+#endif
+#ifdef CONFIG_USE_ESP32_GPIO_ILQHANDLER
 #include "models/irq_handler.h"
 #endif
 #ifdef CONFIG_USE_ESP32_GPIO_PERIPHERALS_SHT75
@@ -315,8 +317,11 @@ void app_main(void) {
 
 #ifdef CONFIG_USE_ESP32_GPIO
   printf("start GPIO (mruby/c class)\n");
-  mrbc_create_task(gpio, 0);
-  mrbc_create_task(irq_handler, 0);
+  mrbc_create_task( gpio, 0 );
+#endif
+#ifdef CONFIG_USE_ESP32_GPIO_IRQHANDLER
+  printf("start GPIO IRQHandler (mruby/c task)\n");
+  mrbc_create_task( irq_handler, 0 );
 #endif
 #ifdef CONFIG_USE_ESP32_LEDC
   printf("start PWM (mruby/c class)\n");

main/main.c

@@ -30,6 +30,17 @@ mrbc_nop(mrb_vm* vm, mrb_value* v, int argc)
 }
 
 
+/*! メソッド reset_pin(pin) 本体 : wrapper for gpio_reset_pin
+
+  @param pin GPIO ピン番号
+*/
+static void
+mrbc_esp32_gpio_reset_pin(mrb_vm* vm, mrb_value* v, int argc)
+{
+  int pin = GET_INT_ARG(1);
+  gpio_reset_pin(pin);
+}
+
 /*! メソッド set_pullup(pin) 本体 : wrapper for gpio_set_pull_mode
   GPIO_PULLUP_ONLY 専用
 
@@ -208,6 +219,7 @@ void
 mrbc_mruby_esp32_gpio_gem_init(struct VM* vm)
 {
 /*
+GPIO.reset_pin(pin)
 GPIO.set_pullup(pin)
 GPIO.set_pulldown(pin)
 GPIO.wakeup_enable(pin, level)
@@ -230,6 +242,7 @@ GPIO.isr_handler_add(pin, isr_handler, args)
   mrbc_class_esp32_gpio = mrbc_define_class(vm, "GPIO", mrbc_class_object);
 
   // 各メソッド定義（mruby/c ではインスタンスメソッドをクラスメソッドとしても呼び出し可能）
+  mrbc_define_method(vm, mrbc_class_esp32_gpio, "reset_pin",           mrbc_esp32_gpio_reset_pin);
   mrbc_define_method(vm, mrbc_class_esp32_gpio, "set_pullup",          mrbc_esp32_gpio_set_pullup);
   mrbc_define_method(vm, mrbc_class_esp32_gpio, "set_pulldown",        mrbc_esp32_gpio_set_pulldown);
   mrbc_define_method(vm, mrbc_class_esp32_gpio, "wakeup_enable",       mrbc_esp32_gpio_wakeup_enable);