IOIO: tidy up error messages

Author: chrisws

ioio/main.cpp

@@ -51,24 +51,23 @@ struct IOTask {
     _array = nullptr;
   }
 
-  bool create(const char *path) {
+  bool create(const char *path, var_s *retval) {
     bool result;
     if (_instance != nullptr) {
-      // error when already constructed
+      error(retval, "Internal error - already constructed");
       result = false;
     } else {
       _clazz = env->FindClass(path);
-      if (_clazz == nullptr) {
-        env->ExceptionDescribe();
-      } else {
+      if (_clazz != nullptr) {
         jmethodID constructor = env->GetMethodID(_clazz, "<init>", "()V");
-        if (constructor == nullptr) {
-          env->ExceptionDescribe();
-        } else {
+        if (constructor != nullptr) {
           _instance = env->NewObject(_clazz, constructor);
         }
       }
       result = _instance != nullptr;
+      if (!result) {
+        checkException(retval);
+      }
     }
     return result;
   }
@@ -431,7 +430,7 @@ int sblib_init(const char *sourceFile) {
   }
 
   ioioTask = new IOTask();
-  if (!ioioTask || !ioioTask->create(CLASS_IOIO)) {
+  if (!ioioTask || !ioioTask->create(CLASS_IOIO, nullptr)) {
     fprintf(stderr, "Failed to IOIOTask\n");
     result = 0;
   }

ioio/mkapi.bas

@@ -116,14 +116,13 @@ sub generate_open_function(byref obj)
   endif
   print "  int id = ++nextId;"
   print "  IOTask &instance = _ioTaskMap[id];"
-  print "  if (instance.create(CLASS_" + upper(obj.name) + ") &&"
+  print "  if (instance.create(CLASS_" + upper(obj.name) + ", retval) &&"
   print "      instance." + openFunc + "retval)) {"
   print "    map_init_id(retval, id, CLASS_IOTASK_ID);"
   print "    create_" + lower(obj.name) + "(retval);"
   print "    result = 1;"
   print "  } else {"
   print "    _ioTaskMap.erase(id);"
-  print "    error(retval, \"open" + obj.name + "() failed\");"
   print "    result = 0;"
   print "  }"
   print "  return result;"

ioio/samples/bme280.bas

@@ -80,7 +80,7 @@ func bme280_init(t_mode, p_mode, h_mode, iir)
   result.H4 = (read8(0xE4) lshift 4) + (a mod 16)
   result.H5 = (read8(0xE6) lshift 4) + (a rshift 4)
   result.H6 = read8(0xE7)
-  if H6 > 127 then result.H6 -= 256
+  if result.H6 > 127 then result.H6 -= 256
 
   write8(0xF2, h_mode)
   sleep_ms(10)

ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOService.java

@@ -59,10 +59,10 @@ public void start() {
   private void registerPin(int pin) throws IOException {
     if (pin != -1) {
       if (pin < 0 || pin > MAX_PINS) {
-        throw new IOException("invalid pin: " + pin);
+        throw new IOException("Invalid pin: " + pin);
       }
       if (usedPins[pin] != null && usedPins[pin]) {
-        throw new IOException("pin already used: " + pin);
+        throw new IOException("Pin already used: " + pin);
       }
       usedPins[pin] = true;
     }