Fix to allow openPwmOutput to take second frequency argument #8

Author: chrisws

include/proxy.h renamed to include/javaproxy.h

@@ -205,7 +205,7 @@ struct JavaProxy {
     int result = 0;
     if (_instance != nullptr) {
       attachCurrentThread();
-      jmethodID method = g_env->GetMethodID(_clazz, name, "()F");
+      jmethodID method = g_env->GetMethodID(_clazz, name, "(F)V");
       if (method != nullptr) {
         g_env->CallVoidMethod(_instance, method, value);
       }

ioio/api.json

@@ -229,6 +229,7 @@
   {
     "name": "PwmOutput",
     "comment": "A pin used for PWM (Pulse-Width Modulation) output. A PWM pin produces a logic-level PWM signal. These signals are typically used for simulating analog outputs for controlling the intensity of LEDs, the rotation speed of motors, etc. They are also frequently used for controlling hobby servo motors. PwmOutput instances are obtained by calling IOIO#openPwmOutput. When used for motors and LEDs, a frequency of several KHz is typically used, where there is a trade-off between switching power-loses and smoothness of operation. The pulse width is typically set by specifying the duty cycle, with the setDutyCycle method. A duty cycle of 0 is \"off\", a duty cycle of 1 is \"on\", and every intermediate value produces an intermediate intensity. Please note that any devices consuming more than 20mA of current (e.g. motors) should not by directly connected the the IOIO pins, but rather through an amplification circuit suited for the specific load. When used for hobby servos, the PWM signal is rather used for encoding of the desired angle the motor should go to. By standard, a 100Hz signal is used and the pulse width is varied between 1ms and 2ms (corresponding to both extremes of the shaft angle), using setPulseWidth. The instance is alive since its creation. If the connection with the IOIO drops at any point, the instance transitions to a disconnected state, in which every attempt to use the pin (except close()) will throw a ConnectionLostException. Whenever close() is invoked the instance may no longer be used. Any resources associated with it are freed and can be reused. Typical usage (fading LED):",
+    "pins": 2,
     "methods": [
       {
         "name": "setDutyCycle",

ioio/ioio/src/main/java/ioio/smallbasic/pc/SerialPortIOIOConnection.java

@@ -1,15 +1,14 @@
 package ioio.smallbasic.pc;
 
 import com.fazecast.jSerialComm.SerialPort;
+import ioio.lib.api.IOIOConnection;
+import ioio.lib.api.exception.ConnectionLostException;
+import ioio.lib.spi.Log;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import ioio.lib.api.IOIOConnection;
-import ioio.lib.api.exception.ConnectionLostException;
-import ioio.lib.spi.Log;
-
 public class SerialPortIOIOConnection implements IOIOConnection {
   private static final String TAG = "SerialPortIOIOConnection";
   private static final int READ_TIMEOUT_MILLIS = 20000;
@@ -27,14 +26,8 @@ public SerialPortIOIOConnection(String portName) {
   }
 
   @Override
-  public void waitForConnect() throws ConnectionLostException {
-    if (!abort && serialPort.openPort()) {
-      inputStream = serialPort.getInputStream();
-      outputStream = serialPort.getOutputStream();
-      serialPort.setDTR();
-    } else {
-      throw new ConnectionLostException();
-    }
+  public boolean canClose() {
+    return serialPort.isOpen();
   }
 
   @Override
@@ -67,7 +60,13 @@ public OutputStream getOutputStream() throws ConnectionLostException {
   }
 
   @Override
-  public boolean canClose() {
-    return true;
+  public void waitForConnect() throws ConnectionLostException {
+    if (!abort && serialPort.openPort()) {
+      inputStream = serialPort.getInputStream();
+      outputStream = serialPort.getOutputStream();
+      serialPort.setDTR();
+    } else {
+      throw new ConnectionLostException();
+    }
   }
 }

ioio/ioio/src/main/java/ioio/smallbasic/pc/SerialPortIOIOConnectionBootstrap.java

@@ -30,18 +30,17 @@
 package ioio.smallbasic.pc;
 
 import com.fazecast.jSerialComm.SerialPort;
+import ioio.lib.api.IOIOConnection;
+import ioio.lib.spi.IOIOConnectionBootstrap;
+import ioio.lib.spi.IOIOConnectionFactory;
+import ioio.lib.spi.Log;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import ioio.lib.api.IOIOConnection;
-import ioio.lib.spi.IOIOConnectionBootstrap;
-import ioio.lib.spi.IOIOConnectionFactory;
-import ioio.lib.spi.Log;
-
 public class SerialPortIOIOConnectionBootstrap implements IOIOConnectionBootstrap {
   private static final String TAG = "SerialPortIOIOConnectionBootstrap";
 

ioio/main.cpp

@@ -13,7 +13,7 @@
 #include "include/var.h"
 #include "include/module.h"
 #include "include/param.h"
-#include "include/proxy.h"
+#include "include/javaproxy.h"
 
 #define CLASS_ANALOGINPUT "ioio/smallbasic/AnalogInputImpl"
 #define CLASS_DIGITALINPUT "ioio/smallbasic/DigitalInputImpl"
@@ -122,7 +122,7 @@ FUNC_SIG lib_func[] = {
   {1, 1, "OPENDIGITALINPUT", cmd_opendigitalinput},
   {1, 1, "OPENDIGITALOUTPUT", cmd_opendigitaloutput},
   {1, 1, "OPENPULSEINPUT", cmd_openpulseinput},
-  {1, 1, "OPENPWMOUTPUT", cmd_openpwmoutput},
+  {2, 2, "OPENPWMOUTPUT", cmd_openpwmoutput},
   {2, 2, "OPENTWIMASTER", cmd_opentwimaster},
   {4, 4, "OPENSPIMASTER", cmd_openspimaster},
 };

ioio/samples/pwm.bas

@@ -0,0 +1,14 @@
+import ioio
+
+led = ioio.openPwmOutput(46, 99)
+
+print "wait for connect"
+ioio.waitForConnect(10)
+print "ready!!!"
+
+for DutyCycle = 0 to 1 step 0.1
+  led.setDutyCycle(DutyCycle)
+  delay 100
+next
+
+print "Done"