Merge pull request #240 from chrisws/12_28

12 28

Author: chrisws

ChangeLog

@@ -1,3 +1,24 @@
+2025-02-18 (12.28)
+	ANDROID: added experimental usb communication support
+
+2025-02-02 (12.28)
+	TEENSY: added experimental runtime platform for teensy mcu
+
+2025-01-27 (12.28)
+	ANDROID: Updated app icon, thanks to bplus, j7m, round157, qube, baggey
+	Final design by j7m
+
+2024-10-09 (12.28)
+	COMMON: Fix #232: TICKS stops working after 50 days
+	ANDROID: Fix delay accuracy
+	ANDROID: Fix location regression
+
+2024-10-06 (12.28)
+	ANDROID: Fix web UI regression
+
+2024-09-27 (12.28)
+	ANDROID: Fix issue with playing an audio file on android #231
+
 2024-04-14 (12.27)
 	COMMON: Fix bug #149: Problem with big hex numbers in windows
 	COMMON: Add new function TRANSPOSE()

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.27])
+AC_INIT([smallbasic], [12.28])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -53,6 +53,11 @@ AC_ARG_ENABLE(dist,
   [ac_build_dist="yes"],
   [ac_build_dist="no"])
 
+AC_ARG_ENABLE(teensy,
+  AS_HELP_STRING([--enable-teensy],[build teensy version(default=no)]),
+  [ac_build_teensy="yes"],
+  [ac_build_teensy="no"])
+
 function checkForWindows() {
    win32=no
    case "${host_os}" in
@@ -126,6 +131,10 @@ function checkPCRE() {
      have_pcre="no"
    fi
 
+   if test x$ac_build_teensy = xyes; then
+     have_pcre="no"
+   fi
+
    if test "${have_pcre}" = "yes" ; then
      AC_DEFINE(USE_PCRE, 1, [match.c used with libpcre.])
      PACKAGE_LIBS="${PACKAGE_LIBS} `pcre-config --libs`"
@@ -144,6 +153,10 @@ function checkTermios() {
      have_termios_h="no"
    fi
 
+   if test x$ac_build_teensy = xyes; then
+     have_termios_h="no"
+   fi
+
    if test "${have_termios_h}" = "yes" ; then
      AC_DEFINE(USE_TERM_IO, 1, [use the termios library.])
    fi
@@ -373,6 +386,24 @@ function buildEmscripten() {
    (cd src/platform/android/app/src/main/assets && xxd -i main.bas > ../../../../../../../src/platform/emcc/main_bas.h)
 }
 
+function buildTEENSY() {
+   TARGET="Building teensy version."
+   BUILD_SUBDIRS="src/platform/teensy"
+   AC_CHECK_PROG(have_xxd, xxd, [yes], [no])
+   if test "${have_xxd}" = "no" ; then
+     AC_MSG_ERROR([xxd command not installed: configure failed.])
+   fi
+   AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
+   AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
+   AC_DEFINE(_MCU, 1, [Micro controller based builds])
+   AC_DEFINE(_TEENSY, 1, [Teensy Micro controller based build])
+   AC_DEFINE(USE_TERM_IO, 0, [dont use the termios library.])
+   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
+   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
+   AC_SUBST(BUILD_SUBDIRS)
+   (cd src/platform/teensy && xxd -i main.bas > src/main_bas.h)
+}
+
 function buildFLTK() {
    TARGET="Building FLTK version."
 
@@ -444,6 +475,8 @@ elif test x$ac_build_fltk = xyes; then
    buildFLTK
 elif test x$ac_build_emcc = xyes; then
    buildEmscripten
+elif test x$ac_build_teensy = xyes; then
+   buildTEENSY
 else
    buildConsole
 fi
@@ -484,6 +517,7 @@ src/platform/emcc/Makefile
 src/platform/sdl/Makefile
 src/platform/web/Makefile
 src/platform/fltk/Makefile
+src/platform/teensy/Makefile
 ])
 AC_OUTPUT
 

images/sb-logo.blend

@@ -0,0 +1,9 @@
+import android
+
+'
+' request usage: endpoint [, data, apiKey]
+' data, apikey: uses POST to send data, apiKey applied as bearer authorisation
+'
+const endPoint = "http://ip-api.com/json"
+print android.request(endPoint)
+

images/sb-logo.png

@@ -0,0 +1,10 @@
+import android
+
+usb = android.openUsbSerial(0x16C0)
+
+while 1
+  usb.send("hello");
+  print usb.receive()
+  delay 1000
+wend
+

samples/distro-examples/devio/android_http.bas

@@ -0,0 +1,37 @@
+'
+' provided by rpnielsen
+' https://www.syntaxbomb.com/smallbasic/the-play-string-command-and-the-latest-beta/
+'
+nrtests=5
+tempo=240 '1/4 notes pr min
+length=4  'play 1/x notes
+
+expDur=(240000/tempo)/length
+
+play "V10O3T"+tempo+"L"+length
+
+? nrtests;" tests of 10 1/";length;" notes"
+? "at tempo = ";tempo;" 1/4 notes pr minute"
+? "Expected note duration = ";expDur;" ms."
+? "--------------------------"
+?
+
+for a=1 to nrtests
+  delay 50 'because otherwise nothing is printed to screen until after PLAY is done
+  t=ticks
+  play "CDEFGGFEDC"
+  actDur=(ticks-t)/10
+  dev=actDur-expDur
+  ? "Test ";a
+  ? "Average note duration = ";actDur;" ms."
+  ? "Deviaton = ";dev;" ms = ";((actDur/expDur)-1)*100;" %"
+  totalDur=totalDur+actDur
+  totalDev=totalDev+dev
+  ?
+next a
+
+? "Overall average:"
+? "Duration  = ";totalDur/nrtests;" ms"
+? "Deviation = ";totalDev/nrtests;" ms = ";(((totalDur/nrtests)/expDur)-1)*100;" %"
+
+end

samples/distro-examples/devio/android_usb.bas

@@ -1922,7 +1922,7 @@ void cmd_intN(long funcCode, var_t *r) {
           if (l >= 0 && l < v_maxdim(var_p)) {
             r->v.i = v_ubound(var_p, l);
           } else {
-            rt_raise(ERR_BOUND_DIM, v_maxdim(var_p));
+            rt_raise(ERR_BOUND_DIM, l, v_maxdim(var_p));
           }
         }
       } else {

samples/distro-examples/sound/sound_test.bas

@@ -351,7 +351,7 @@ void cmd_chain(void) {
       if (h != -1) {
         struct stat st;
         if (fstat(h, &st) == 0) {
-          int len = st.st_size;
+          size_t len = st.st_size;
           code = (char *)malloc(len + 1);
           len = read(h, code, len);
           code[len] = '\0';
@@ -1185,18 +1185,16 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
     } else {
       find_unit(filename, fname);
     }
-    if (access(fname, R_OK)) {
+    // open & load
+    int h = open(fname, O_RDWR | O_BINARY);
+    if (h == -1) {
       panic("File '%s' not found", fname);
     }
     // look if it is already loaded
     if (search_task(fname) != -1) {
+      close(h);
       return search_task(fname);
     }
-    // open & load
-    int h = open(fname, O_RDWR | O_BINARY);
-    if (h == -1) {
-      panic("File '%s' not found", fname);
-    }
     // load it
     if (libf) {
       read(h, &uft, sizeof(unit_file_t));

src/common/blib_func.c

@@ -969,7 +969,7 @@ void dev_chdir(const char *dir);
  *
  * @return the current directory
  */
-char *dev_getcwd(void);
+const char *dev_getcwd(void);
 
 /**
  * @ingroup dev

src/common/brun.c

@@ -73,7 +73,7 @@ var_num_t *mat_toc(var_t *v, int32_t *rows, int32_t *cols) {
 //
 // matrix: conv. double[nr][nc] to var_t
 //
-void mat_tov(var_t *v, var_num_t *m, int rows, int cols, int protect_col1) {
+void mat_tov(var_t *v, var_num_t *m, int32_t rows, int32_t cols, int protect_col1) {
   if (cols > 1 || protect_col1) {
     v_tomatrix(v, rows, cols);
   } else {
@@ -93,7 +93,7 @@ void mat_tov(var_t *v, var_num_t *m, int rows, int cols, int protect_col1) {
 // matrix: 1op
 //
 void mat_op1(var_t *l, int op, var_num_t n) {
-  int lr, lc;
+  int32_t lr, lc;
 
   var_num_t *m1 = mat_toc(l, &lr, &lc);
   if (m1) {
@@ -142,7 +142,7 @@ void mat_mulN(var_t *v, var_num_t N) {
 // matrix - add/sub
 //
 void mat_op2(var_t *l, var_t *r, int op) {
-  int lr, lc, rr, rc;
+  int32_t lr, lc, rr, rc;
 
   var_num_t *m1 = mat_toc(l, &lr, &lc);
   if (m1) {
@@ -221,7 +221,7 @@ void mat_dot(var_t *l, var_t *r) {
 // matrix: multiply
 //
 void mat_mul(var_t *l, var_t *r) {
-  int lr, lc, rr, rc;
+  int32_t lr, lc, rr, rc;
 
   var_num_t *m1 = mat_toc(l, &lr, &lc);
   if (m1) {

src/common/device.h

@@ -30,6 +30,90 @@
 // FILE TABLE
 static dev_file_t file_table[OS_FILEHANDLES];
 
+/*
+ * returns the last-modified time of the file
+ *
+ * on error returns 0L
+ */
+time_t sys_filetime(const char *file) {
+  struct stat st;
+
+  if (stat(file, &st) == 0) {
+    return st.st_mtime;
+  }
+  return 0L;
+}
+
+/*
+ * search a set of directories for the given file
+ * directories on path must be separated with symbol ':' (unix) or ';' (dos/win)
+ *
+ * @param path the path
+ * @param file the file
+ * @param retbuf a buffer to store the full-path-name file (can be NULL)
+ * @return non-zero if found
+ */
+int sys_search_path(const char *path, const char *file, char *retbuf) {
+  char cur_path[OS_PATHNAME_SIZE + 1];
+  int found = 0;
+
+  if (path == NULL || strlen(path) == 0) {
+    return 0;
+  }
+  const char *ps = path;
+  const char *p;
+  do {
+    // next element, build cur_path
+    p = strchr(ps, ':');
+    if (!p) {
+      strlcpy(cur_path, ps, sizeof(cur_path));
+    } else {
+      strncpy(cur_path, ps, p - ps);
+      cur_path[p - ps] = '\0';
+      ps = p + 1;
+    }
+
+    // fix home directory
+    if (cur_path[0] == '~') {
+      char *old_path = malloc(strlen(cur_path) + 1);
+      strcpy(old_path, cur_path + 1);
+      if (getenv("HOME")) {
+        strlcpy(cur_path, getenv("HOME"), sizeof(cur_path));
+      } else {
+        strlcpy(cur_path, getenv("HOMEDRIVE"), sizeof(cur_path));
+        strlcat(cur_path, getenv("HOMEPATH"), sizeof(cur_path));
+      }
+      if (old_path[0] != '/') {
+        strlcat(cur_path, "/", sizeof(cur_path));
+      }
+      strlcat(cur_path, old_path, sizeof(cur_path));
+      free(old_path);
+    }
+
+    DIR *dp = opendir(cur_path);
+    if (dp != NULL) {
+      struct dirent *entry;
+      while (!found && (entry = readdir(dp)) != NULL) {
+        if (strcasecmp(entry->d_name, file) == 0) {
+          int end = strlen(cur_path);
+          strcat(cur_path, "/");
+          strcat(cur_path, entry->d_name);
+          if (access(cur_path, R_OK) == 0) {
+            if (retbuf) {
+              strcpy(retbuf, cur_path);
+            }
+            found = 1;
+          } else {
+            cur_path[end] = '\0';
+          }
+        }
+      }
+      closedir(dp);
+    }
+  } while (p && !found);
+  return found;
+}
+
 /**
  * Basic wild-cards
  */
@@ -659,7 +743,7 @@ void dev_destroy_file_list(char_p_t *list, int count) {
  * returns the current directory
  * BUG: no drivers supported
  */
-char *dev_getcwd() {
+const char *dev_getcwd() {
   static char retbuf[OS_PATHNAME_SIZE + 1];
   getcwd(retbuf, OS_PATHNAME_SIZE);
   int l = strlen(retbuf);

src/common/eval.c

@@ -178,9 +178,9 @@ int dev_kbhit() {
  * returns the next key in keyboard buffer (and removes it)
  */
 long int dev_getch() {
-  while ((dev_kbhit() == 0) && (prog_error == 0)) {
+  while ((dev_kbhit() == 0) && (ctask && prog_error == 0)) {
     int evc = dev_events(2);
-    if (evc < 0 || prog_error) {
+    if (evc < 0 || (ctask && prog_error)) {
       return 0xFFFF;
     }
   }