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