Add initialsupport to change baudrate

lostbard · lostbard · commit c19c477a4153 · 2023-10-11T13:27:36.000-04:00
* inst/+arduinoio/+config/config_due.m, inst/+arduinoio/+config/config_esp32_dev.m,
  inst/+arduinoio/+config/config_leonardo.m, inst/+arduinoio/+config/config_lilypad.m,
  inst/+arduinoio/+config/config_mega2560.m, inst/+arduinoio/+config/config_micro.m,
  inst/+arduinoio/+config/config_mkr1000.m, inst/+arduinoio/+config/config_mkrzero.m,
  inst/+arduinoio/+config/config_nano.m, inst/+arduinoio/+config/config_nano_33_ble.m,
  inst/+arduinoio/+config/config_nano_esp32.m, inst/+arduinoio/+config/config_nano_every.m,
  inst/+arduinoio/+config/config_nano_rp2040_connect.m, inst/+arduinoio/+config/config_promicro.m,
  inst/+arduinoio/+config/config_promini.m, inst/+arduinoio/+config/config_raspi_pico.m,
  inst/+arduinoio/+config/config_sparkfunsamd21.m, inst/+arduinoio/+config/config_uno.m,
  inst/+arduinoio/+config/config_uno_minima_r4.m, inst/+arduinoio/+config/config_uno_wifi_r2.m,
  inst/+arduinoio/+config/config_uno_wifi_r4.m: add defauilt baudrate

* inst/+arduinoio/lib/LibraryBase.cpp: add use of arduino baudrate if
  provided

* inst/@arduino/arduino.m, inst/arduinosetup.m, inst/@arduino/__initArduino__.m: allow use of baudrate

* test/make_conf.m: add default baudrate
diff --git a/inst/+arduinoio/+config/config_due.m b/inst/+arduinoio/+config/config_due.m
@@ -25,7 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
-  retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'cortex-m3';
   retval.voltref = 3.3;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_esp32_dev.m b/inst/+arduinoio/+config/config_esp32_dev.m
@@ -26,6 +26,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'eps32';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_leonardo.m b/inst/+arduinoio/+config/config_leonardo.m
@@ -25,6 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = 'leonardo';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_lilypad.m b/inst/+arduinoio/+config/config_lilypad.m
@@ -5,6 +5,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_mega2560.m b/inst/+arduinoio/+config/config_mega2560.m
@@ -25,6 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_micro.m b/inst/+arduinoio/+config/config_micro.m
@@ -25,6 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = 'micro';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_mkr1000.m b/inst/+arduinoio/+config/config_mkr1000.m
@@ -5,6 +5,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'cortex-m0plus';
   retval.voltref = 3.3;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_mkrzero.m b/inst/+arduinoio/+config/config_mkrzero.m
@@ -26,6 +26,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'cortex-m0plus';
   retval.voltref = 3.3;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_nano.m b/inst/+arduinoio/+config/config_nano.m
@@ -25,6 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "nano";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 50;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_nano_33_ble.m b/inst/+arduinoio/+config/config_nano_33_ble.m
@@ -5,6 +5,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = 'nano_33_ble';
+  retval.baudrate = 9600;
   retval.mcu = 'nRF52840';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_nano_esp32.m b/inst/+arduinoio/+config/config_nano_esp32.m
@@ -24,6 +24,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "nano_esp32";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 33;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_nano_every.m b/inst/+arduinoio/+config/config_nano_every.m
@@ -24,6 +24,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "nano_every";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 50;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_nano_rp2040_connect.m b/inst/+arduinoio/+config/config_nano_rp2040_connect.m
@@ -5,6 +5,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'cortex-m0plus';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_promicro.m b/inst/+arduinoio/+config/config_promicro.m
@@ -25,6 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = 'promicro';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_promini.m b/inst/+arduinoio/+config/config_promini.m
@@ -24,6 +24,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "promini";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_raspi_pico.m b/inst/+arduinoio/+config/config_raspi_pico.m
@@ -6,6 +6,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'cortex-m0plus';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_sparkfunsamd21.m b/inst/+arduinoio/+config/config_sparkfunsamd21.m
@@ -25,7 +25,7 @@
   # default board info - must be provided
   # will be filled in on connection.
   retval.board = '';
-  retval.board = '';
+  retval.baudrate = 9600;
   retval.mcu = 'samd21';
   retval.voltref = 3.3;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_uno.m b/inst/+arduinoio/+config/config_uno.m
@@ -24,6 +24,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "uno";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_uno_minima_r4.m b/inst/+arduinoio/+config/config_uno_minima_r4.m
@@ -3,6 +3,7 @@
   retval = {};
 
   retval.board = 'uno_minima_r4';
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_uno_wifi_r2.m b/inst/+arduinoio/+config/config_uno_wifi_r2.m
@@ -24,6 +24,7 @@
   # default board info - must be provided
   # will be filled in on connection
   retval.board = "uno_wifi_r2";
+  retval.baudrate = 9600;
   retval.mcu = '';
   retval.voltref = 0;
   retval.libs = {};
diff --git a/inst/+arduinoio/+config/config_uno_wifi_r4.m b/inst/+arduinoio/+config/config_uno_wifi_r4.m
@@ -24,6 +24,7 @@
 
   retval.board = 'uno_wifi_r4';
   retval.mcu = 'Renesis RA4M1';
+  retval.baudrate = 9600;
   retval.voltref = 0;
   retval.libs = {};
   retval.port = '';
diff --git a/inst/+arduinoio/lib/LibraryBase.cpp b/inst/+arduinoio/lib/LibraryBase.cpp
@@ -46,6 +46,10 @@
   WiFiClient wifi_client;
 #endif
 
+#ifndef ARDUINO_BAUDRATE
+ # define ARDUINO_BAUDRATE 9600
+#endif
+
 // some standard(ish) error messages used throughout the addons
 const char ERRORMSG_INVALID_NUMBER_OF_ARGS[] PROGMEM = "Invalid number of args";
 const char ERRORMSG_UNIMPLEMENTED[] PROGMEM = "Unimplemented feature";
@@ -281,7 +285,7 @@ static IPAddress make_gateway_address(const char *str)
 void
 OctaveArduinoClass::init () 
 {
-  OCTAVE_COMMS_PORT.begin (9600);
+  OCTAVE_COMMS_PORT.begin (ARDUINO_BAUDRATE);
 #if defined(OCTAVE_USE_WIFI_COMMS)
 
 #ifdef ARDUINO_ARCH_ESP32
diff --git a/inst/@arduino/__initArduino__.m b/inst/@arduino/__initArduino__.m
@@ -29,7 +29,7 @@
      if !isempty(regexp(port, "^[0-9]+.[0-9]+.[0-9]+.[0-9]+$"))
        obj.connected = tcp (port, 9500, 10);
      else
-       obj.connected = serial (port, 9600, 2);
+       obj.connected = serial (port, obj.BaudRate, 2);
      endif
      # need wait for aduino to potentially startup
      pause(2);
@@ -91,6 +91,7 @@ case hex2dec("1E9651")
      obj.config = arduinoio.getBoardConfig(boardtype);
      # update values that could change
      obj.config.port = port;
+     obj.config.baudrate = obj.BaudRate;
      obj.config.board = boardtype;
      obj.config.voltref = voltref;
      obj.config.flags = flags;
diff --git a/inst/@arduino/arduino.m b/inst/@arduino/arduino.m
@@ -54,6 +54,8 @@
   ## reprogram the arduino
   ## @item port (read only)
   ## the communications port the board is connected to.
+  ## @item baudrate (read only)
+  ## the communications baudrate to the board.
   ## @item board  (read only)
   ## The name of the board type that the arduino connected to
   ## @item libraries (read only)
@@ -84,6 +86,7 @@
     AnalogReference = 5.0;
     Board = "";
     Port = "";
+    BaudRate = 9600;
   endproperties
 
   properties (SetAccess = private, Hidden = true)
@@ -101,6 +104,8 @@
         endif
 
         this.name = "arduino";
+        c = arduinoio.getBoardConfig(arduinos{1}.board);
+        this.BaudRate = c.baudrate;
         this = __initArduino__ (this, arduinos{1}.port, arduinos{1}.board);
       elseif (nargin == 1)
         arg0 = varargin{1};
@@ -129,6 +134,8 @@
           endif
           port = arduinos{1}.port;
           board = arduinos{1}.board;
+          c = arduinoio.getBoardConfig(arduinos{1}.board);
+          this.BaudRate = c.baudrate;
         elseif !ischar (port)
           error ("arduino: port must be a string");         
         endif
@@ -148,6 +155,7 @@
         requiredlibs = {};
         forcebuild = false;
         forcebuildon = false;
+
         for i = 3:2:nargin
           propname = tolower (varargin{i});
           propvalue = varargin{i+1};
@@ -174,6 +182,16 @@
               error ("arduino: expect forcebuildon to be true or false");
             endif
           endif
+          if strcmp (propname,"baudrate")
+            if !isnumeric(propvalue)
+              error ("arduino: expect baudrate to be numeric");
+            else
+              this.BaudRate = int32(propvalue);
+              if this.BaudRate < 1200
+                 error ("arduino: Invalid baudrate");
+              endif
+            endif
+          endif
           # older option that probally should remove
           if strcmp (propname,"forcebuild")
             if islogical (propvalue) || (isnumeric(propvalue) && (propvalue == 1 || propvalue == 0))
@@ -217,7 +235,7 @@
           # free arduino resources, reprom and then reinit
           this = __freeArduino__(this);
 
-          if !arduinosetup ('libraries', requiredlibs);
+          if !arduinosetup ('libraries', requiredlibs, 'baudrate', this.BaudRate)
             error ("arduinosetup returned a failure, so did not reprogram")
           endif
 
diff --git a/inst/arduinosetup.m b/inst/arduinosetup.m
@@ -60,6 +60,8 @@
   libs = {};
   arduinobinary = {};
   debug = false;
+  baudrate = [];
+  def_baudrate = 9600;
   for i = 1:2:nargin
     propname = tolower (varargin{i});
     propvalue = varargin{i+1};
@@ -74,6 +76,8 @@
       endif
     elseif strcmp (propname, "arduinobinary")
       arduinobinary = propvalue;
+    elseif strcmp (propname, "baudrate")
+      baudrate = int32(propvalue);
     elseif strcmp (propname, "debug")
       debug = propvalue;
     elseif
@@ -152,6 +156,13 @@
     fprintf (fd, "\n");
     fprintf (fd, "// override target voltage (x10) by uncommenting and providing a value\n");
     fprintf (fd, "//#define BOARD_VOLTAGE 50\n");
+    fprintf (fd, "\n");
+    fprintf (fd, "// override baudrate by providing a value\n");
+    if !isempty(baudrate)
+      fprintf (fd, "#define ARDUINO_BAUDRATE %d\n", baudrate);
+    else
+      fprintf (fd, "//#define ARDUINO_BAUDRATE %d\n", def_baudrate);
+    endif
 
     fprintf (fd, "\n");
     fprintf (fd, "// builtin library support\n");
diff --git a/test/make_conf.m b/test/make_conf.m
@@ -178,7 +178,7 @@
   printf("  # default board info - must be provided\n");
   printf("  # will be filled in on connection.\n");
   printf("  retval.board = '';\n");
-  printf("  retval.board = '';\n");
+  printf("  retval.baudrate = 9600;\n");
   printf("  retval.mcu = '';\n");
   printf("  retval.voltref = 0;\n");
   printf("  retval.libs = {};\n");
