1.0.1 with examples

marchingband · Jul 15, 2021 · 5806571 · 5806571
1 parent 60920e1
commit 5806571
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 35 deletions.
diff --git a/examples/wvr_basic/wvr_basic.ino b/examples/wvr_basic/wvr_basic.ino
@@ -10,40 +10,19 @@
 #include <rpc.h>
 #include <file_system.h>
 #include <wvr_0.3.h>
+#include <gpio.h>
 
 WVR wvr;
-Button btn1(D2, FALLING, 300);
-
-bool serverOn = true;
-
-void on1(void)
-{
-  // wvr.play(0,40,127);
-  if(serverOn)
-  {
-    log_i("server pause");
-    wvr.serverPause();
-    log_i("wifi on %d", get_metadata()->wifi_starts_on);
-  }
-  else
-  {
-    log_i("server resume");
-    wvr.serverResume();
-    log_i("wifi on %d", get_metadata()->wifi_starts_on);
-  }
-  serverOn = !serverOn;
-}
 
 void setup() {
-  // put your setup code here, to run once:
+  wvr.useFTDI = false;
+  wvr.useUsbMidi = false;
   wvr.begin();
-  serverOn = get_metadata()->wifi_starts_on;
-  log_i("wifi on %d", serverOn);
-  pinMode(D2, INPUT_PULLUP);
-  btn1.onPress(on1);
+  wvr.wifiIsOn = get_metadata()->wifi_starts_on;
+  log_i("wifi is %s", wvr.wifiIsOn ? "on" : "off");
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
-  vTaskDelay(portMAX_DELAY);
+  // vTaskDelay(portMAX_DELAY);
+  vTaskDelete(NULL);
 }
diff --git a/examples/wvr_usb/wvr_usb.ino b/examples/wvr_usb/wvr_usb.ino
@@ -0,0 +1,28 @@
+#include <wvr_pins.h>
+#include <button_struct.h>
+#include <ws_log.h>
+#include <wvr_ui.h>
+#include <WVR.h>
+#include <midiXparser.h>
+#include <midi_in.h>
+#include <wav_player.h>
+#include <button.h>
+#include <rpc.h>
+#include <file_system.h>
+#include <wvr_0.3.h>
+#include <gpio.h>
+
+WVR wvr;
+
+void setup() {
+  wvr.useFTDI = false;
+  wvr.useUsbMidi = true;
+  wvr.begin();
+  wvr.wifiIsOn = get_metadata()->wifi_starts_on;
+  log_i("wifi is %s", wvr.wifiIsOn ? "on" : "off");
+}
+
+void loop() {
+  // vTaskDelay(portMAX_DELAY);
+  vTaskDelete(NULL);
+}
diff --git a/src/gpio.cpp b/src/gpio.cpp
@@ -108,10 +108,17 @@ void on_press_per_config(int pin_num)
 void wvr_gpio_init(bool useFTDI, bool useUsbMidi)
 {
     log_i("useFTDI is %d",useFTDI);
-    int start = useFTDI ? useUsbMidi ? 3 : 2 : 0;
-    log_i("gpio start is %d",start);
-    for(int i=start;i<14;i++)
+    log_i("useUsbMidi is %d",useUsbMidi);
+    for(int i=0;i<14;i++)
     {
+        if(
+            ((i == 0) && useFTDI) ||
+            ((i == 1) && useFTDI) ||
+            ((i == 2) && useUsbMidi)
+        )
+        {
+            continue;
+        }
         gpio_num_t gpio_num = gpio_pins[i];
         int pin_num = wvr_pins[i];
         pin_config_t pin = pin_config_lut[i];
@@ -126,18 +133,18 @@ void wvr_gpio_init(bool useFTDI, bool useUsbMidi)
             else if(pin.edge == EDGE_FALLING)
             {
                 pinMode(pin_num, INPUT_PULLUP);
-                buttons[i] = new Button(pin_num, FALLING, pin.debounce);
+                buttons[i] = new Button(pin_num, FALLING, pin.debounce); // digital constructor
             }
             else if(pin.edge == EDGE_RISING)
             {
                 pinMode(pin_num, INPUT_PULLUP);
-                buttons[i] = new Button(pin_num, RISING, pin.debounce);
+                buttons[i] = new Button(pin_num, RISING, pin.debounce); // digital constructor
             }
         }
         else
         {
             // touch mode
-            buttons[i] = new Button(pin_num, FALLING, pin.debounce, true);
+            buttons[i] = new Button(pin_num, FALLING, pin.debounce, true); // touch constructor
         }
     }
     if(buttons[0] != NULL) buttons[0]->onPress([](){on_press_per_config(0);});

diff --git a/src/wvr_0.3.h b/src/wvr_0.3.h
@@ -3,7 +3,7 @@
 
 // #include "WVR.h"
 
-#define VERSION_CODE "1.0.0"
+#define VERSION_CODE "1.0.1"
 
 void wvr_init(bool useFTDI, bool useUsbMidi);