corrects SAML CHIPID information in Devices.h and merge in changes from 1.6.1-arduino

mattairtech · mattairtech · commit f2d57f5ce2e1 · 2017-05-28T05:17:56.000Z
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 #
 # Version
 #
-VERSION=1.6.1-arduino-mattairtech-1
+VERSION=1.7.0-mattairtech-1
 WXVERSION=3.0
 
 #
@@ -133,6 +133,14 @@ WXVERSION=2.8
 
 endif
 
+ifeq (${OS},FreeBSD)
+
+# This is only needed for bossash, but we can't add it to BOSSASH_LIBS here
+# because that one is redefined later.
+COMMON_SRCS+=PosixSerialPort.cpp BSDPortFactory.cpp
+
+endif
+
 #
 # Object files
 #
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
-BOSSA 1.6.1-arduino-mattairtech-1
+BOSSA 1.6.1-arduino-mattairtech-2
 -------------------------------
 
+1.6.1-arduino-mattairtech-2 corrects SAML CHIPID information in Devices.h.
+
 This version of BOSSA is a fork of BOSSA 1.6.1-arduino.
 It adds support for more M0+ chips, the SAML and SAMC:
 
@@ -14,7 +16,6 @@ It adds support for more M0+ chips, the SAML and SAMC:
   * ATSAML21J18B
   * ATSAML21J17B
   * ATSAML21J16B
-  
   * ATSAMC21E18A
   * ATSAMC21E17A
   * ATSAMC21E16A
diff --git a/src/Devices.h b/src/Devices.h
@@ -176,7 +176,7 @@
 
 /* SAML21 */
 #define ATSAML21J18B_NAME                    "ATSAML21J18B"
-#define ATSAML21J18B_CHIPID                  (0x10810000ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21J18B_CHIPID                  (0x1081000Ful)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21J18B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21J18B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21J18B_FLASH_PAGES             (4096ul)
@@ -187,7 +187,7 @@
 #define ATSAML21J18B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21J17B_NAME                    "ATSAML21J17B"
-#define ATSAML21J17B_CHIPID                  (0x10810001ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21J17B_CHIPID                  (0x10810010ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21J17B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21J17B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21J17B_FLASH_PAGES             (2048ul)
@@ -198,7 +198,7 @@
 #define ATSAML21J17B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21J16B_NAME                    "ATSAML21J16B"
-#define ATSAML21J16B_CHIPID                  (0x10810002ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21J16B_CHIPID                  (0x10810011ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21J16B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21J16B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21J16B_FLASH_PAGES             (1024ul)
@@ -209,7 +209,7 @@
 #define ATSAML21J16B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21G18B_NAME                    "ATSAML21G18B"
-#define ATSAML21G18B_CHIPID                  (0x10810005ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21G18B_CHIPID                  (0x10810014ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21G18B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21G18B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21G18B_FLASH_PAGES             (4096ul)
@@ -220,7 +220,7 @@
 #define ATSAML21G18B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21G17B_NAME                    "ATSAML21G17B"
-#define ATSAML21G17B_CHIPID                  (0x10810006ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21G17B_CHIPID                  (0x10810015ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21G17B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21G17B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21G17B_FLASH_PAGES             (2048ul)
@@ -231,7 +231,7 @@
 #define ATSAML21G17B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21G16B_NAME                    "ATSAML21G16B"
-#define ATSAML21G16B_CHIPID                  (0x10810007ul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21G16B_CHIPID                  (0x10810016ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21G16B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21G16B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21G16B_FLASH_PAGES             (1024ul)
@@ -242,7 +242,7 @@
 #define ATSAML21G16B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21E18B_NAME                    "ATSAML21E18B"
-#define ATSAML21E18B_CHIPID                  (0x1081000aul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21E18B_CHIPID                  (0x10810019ul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21E18B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21E18B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21E18B_FLASH_PAGES             (4096ul)
@@ -253,7 +253,7 @@
 #define ATSAML21E18B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21E17B_NAME                    "ATSAML21E17B"
-#define ATSAML21E17B_CHIPID                  (0x1081000bul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21E17B_CHIPID                  (0x1081001Aul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21E17B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21E17B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21E17B_FLASH_PAGES             (2048ul)
@@ -264,7 +264,7 @@
 #define ATSAML21E17B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21E16B_NAME                    "ATSAML21E16B"
-#define ATSAML21E16B_CHIPID                  (0x1081000cul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21E16B_CHIPID                  (0x1081001Bul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21E16B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21E16B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21E16B_FLASH_PAGES             (1024ul)
@@ -275,7 +275,7 @@
 #define ATSAML21E16B_NVMCTRL_BASE            (0x41004000ul)
 
 #define ATSAML21E15B_NAME                    "ATSAML21E15B"
-#define ATSAML21E15B_CHIPID                  (0x1081000dul)  // DIE & REV bitfields masked in Samba::chipId()
+#define ATSAML21E15B_CHIPID                  (0x1081001Cul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAML21E15B_FLASH_BASE              (0x00000000ul + ATSAML_BOOTLOADER_SIZE)
 #define ATSAML21E15B_FLASH_PAGE_SIZE         (64ul)
 #define ATSAML21E15B_FLASH_PAGES             (512ul)
@@ -452,8 +452,8 @@
 #define ATSAMD11C14A_STACK_ADDR              (0x20001000ul)
 #define ATSAMD11C14A_NVMCTRL_BASE            (0x41004000ul)
 
-/* SAMDR1 */
-#define ATSAMR21E18A_NAME                    "ATSAMDR1E18A"
+/* SAMR21 */
+#define ATSAMR21E18A_NAME                    "ATSAMR21E18A"
 #define ATSAMR21E18A_CHIPID                  (0x1001001cul)  // DIE & REV bitfields masked in Samba::chipId()
 #define ATSAMR21E18A_FLASH_BASE              (0x00000000ul + ATSAMR_BOOTLOADER_SIZE)
 #define ATSAMR21E18A_FLASH_PAGE_SIZE         (64ul)
diff --git a/src/Flasher.cpp b/src/Flasher.cpp
@@ -120,10 +120,10 @@ Flasher::write(const char* filename)
             // ...otherwise go with the legacy slow method
 
             uint8_t buffer[pageSize];
+	    const uint32_t divisor = (numPages / 10) ? (numPages / 10) : 1;
             while ((fbytes = fread(buffer, 1, pageSize, infile)) > 0)
             {
-                // print once every 10%
-                if ((pageNum % (numPages/10)) == 0)
+                if ((pageNum % divisor) == 0)
                     progressBar(pageNum, numPages);
 
                 _flash->loadBuffer(buffer, fbytes);
@@ -221,11 +221,11 @@ Flasher::verify(const char* filename)
             throw FileSizeError();
 
         printf("Verify %ld bytes of flash\n", fsize);
-
+	
+	const uint32_t divisor = (numPages / 10) ? (numPages / 10) : 1;
         while ((fbytes = fread(bufferA, 1, pageSize, infile)) > 0)
         {
-            // print once every 10%
-            if ((pageNum % (numPages/10)) == 0)
+            if ((pageNum % divisor) == 0)
                 progressBar(pageNum, numPages);
 
             _flash->readPage(pageNum, bufferB);
diff --git a/src/PortFactory.h b/src/PortFactory.h
@@ -56,7 +56,7 @@ typedef LinuxPortFactory PortFactory;
 #elif defined(__APPLE__)
 #include "OSXPortFactory.h"
 typedef OSXPortFactory PortFactory;
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
 // This is likely to work (but not tested) for the other BSDs as well
 #include "BSDPortFactory.h"
 typedef BSDPortFactory PortFactory;
diff --git a/src/PosixSerialPort.cpp b/src/PosixSerialPort.cpp
@@ -65,12 +65,17 @@ PosixSerialPort::open(int baud,
 {
     struct termios options;
     speed_t speed;
-    std::string dev("/dev/");
-
-    dev += _name;
-    _devfd = ::open(dev.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
+    // Try opening port assuming _name is full path. If it fails
+    // try "/dev/" + _name
+    _devfd = ::open(_name.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
     if (_devfd == -1)
-        return false;
+    {
+        std::string dev("/dev/");
+        dev += _name;
+        _devfd = ::open(dev.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
+        if (_devfd == -1)
+            return false;
+    }
 
     if (tcgetattr(_devfd, &options) == -1)
     {
diff --git a/src/Samba.cpp b/src/Samba.cpp
@@ -72,7 +72,7 @@ Samba::init()
     uint8_t cmd[3];
     uint32_t cid;
 
-    _port->timeout(TIMEOUT_QUICK);
+    _port->timeout(TIMEOUT_NORMAL);
 
     // Allows Arduino auto-reset
     usleep(500000);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Version`
`5`	`5`	`#`
`6`		`-VERSION=1.6.1-arduino-mattairtech-1`
	`6`	`+VERSION=1.7.0-mattairtech-1`
`7`	`7`	`WXVERSION=3.0`
`8`	`8`
`9`	`9`	`#`
`@@ -133,6 +133,14 @@ WXVERSION=2.8`
`133`	`133`
`134`	`134`	`endif`
`135`	`135`
	`136`	`+ifeq (${OS},FreeBSD)`
	`137`	`+`
	`138`	`+# This is only needed for bossash, but we can't add it to BOSSASH_LIBS here`
	`139`	`+# because that one is redefined later.`
	`140`	`+COMMON_SRCS+=PosixSerialPort.cpp BSDPortFactory.cpp`
	`141`	`+`
	`142`	`+endif`
	`143`	`+`
`136`	`144`	`#`
`137`	`145`	`# Object files`
`138`	`146`	`#`