Merged latest Arduino SAMB UART and CDC code

CodingWithFusion · CodingWithFusion · commit b7e86026a778 · 2022-10-09T20:03:17.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,29 +1,31 @@
-PwFusion SAMD CORE 0.2.2  2022.05.25
+#PwFusion SAMD CORE 0.2.9  2022.10.09
+* Merged Latest USB and CDC librarys from arduino SAMD library
 
+
+#PwFusion SAMD CORE 0.2.2  2022.05.25
 * Added transmission complete interrupt to SERCOM.cpp
 * Added writeBytesPending() function to Uart.cpp
 
-PwFusion SAMD CORE 0.2.1  2022.06.24
 
+#PwFusion SAMD CORE 0.2.1  2022.06.24
 * Changed Wire SERCOM interrupts to weak linking to allow the user to override the callbacks
 
-PwFusion SAMD CORE 0.2.0  2022.05.25
 
+#PwFusion SAMD CORE 0.2.0  2022.05.25
 * Added support for additional analog inputs and external interrupts to R3actor
 * Fixed defect in analogRead() to allow reading A11 input
 
-PwFusion SAMD CORE 0.1.0  2022.03.07
 
+#PwFusion SAMD CORE 0.1.0  2022.03.07
 * PwFusion R3actor production board support
 * Swapped Pin 1 and 0 (UART Rx and Tx) to match Feather pin assignment
 
-PwFusion SAMD CORE 0.0.8  2022.02.21
 
+#PwFusion SAMD CORE 0.0.8  2022.02.21
 * PwFusion R3actor board support
 * Tested bootloader and IO
 
 
-PwFusion SAMD CORE 0.0.1  2021.03.19
-
+#PwFusion SAMD CORE 0.0.1  2021.03.19
 * First public release.
 
diff --git a/Releases/PwFusion_SAMD_00.02.03.zip b/Releases/PwFusion_SAMD_00.02.03.zip
diff --git a/Source/cores/arduino/SafeRingBuffer.h b/Source/cores/arduino/SafeRingBuffer.h
@@ -0,0 +1,62 @@
+/*
+  Copyright (c) 2020 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifdef __cplusplus
+
+#ifndef _SAFE_RING_BUFFER_
+#define _SAFE_RING_BUFFER_
+
+#include <RingBuffer.h>
+#include "sync.h"
+
+namespace arduino {
+
+template <int N>
+class SafeRingBufferN : public RingBufferN<N>
+{
+  public:
+    int read_char();
+    void store_char( uint8_t c ) ;
+};
+
+typedef SafeRingBufferN<SERIAL_BUFFER_SIZE> SafeRingBuffer;
+
+template <int N>
+int SafeRingBufferN<N>::read_char() {
+  synchronized {
+    return RingBufferN<N>::read_char();
+  }
+
+  // We should never reached this line because the synchronized {} block gets
+  // executed at least once. However the compiler gets confused and prints a
+  // warning about control reaching the end of a non-void function. This
+  // silences that warning.
+  return -1;
+}
+
+template <int N>
+void SafeRingBufferN<N>::store_char(uint8_t c) {
+  synchronized {
+    RingBufferN<N>::store_char(c);
+  }
+}
+
+}
+
+#endif /* _SAFE_RING_BUFFER_ */
+#endif /* __cplusplus */
diff --git a/Source/cores/arduino/USB/SAMD21_USBDevice.h b/Source/cores/arduino/USB/SAMD21_USBDevice.h
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
+#include "sync.h"
+
 typedef uint8_t ep_t;
 
 class USBDevice_SAMD21G18x {
@@ -219,32 +221,6 @@ void USBDevice_SAMD21G18x::calibrate() {
 	usb.PADCAL.bit.TRIM   = pad_trim;
 }
 
-/*
- * Synchronization primitives.
- * TODO: Move into a separate header file and make an API out of it
- */
-
-class __Guard {
-public:
-	__Guard() : primask(__get_PRIMASK()), loops(1) {
-		__disable_irq();
-	}
-	~__Guard() {
-		if (primask == 0) {
-			__enable_irq();
-			// http://infocenter.arm.com/help/topic/com.arm.doc.dai0321a/BIHBFEIB.html
-			__ISB();
-		}
-	}
-	uint32_t enter() { return loops--; }
-private:
-	uint32_t primask;
-	uint32_t loops;
-};
-
-#define synchronized for (__Guard __guard; __guard.enter(); )
-
-
 /*
  * USB EP generic handlers.
  */
diff --git a/Source/cores/arduino/Uart.h b/Source/cores/arduino/Uart.h
@@ -20,7 +20,7 @@
 
 #include "HardwareSerial.h"
 #include "SERCOM.h"
-#include "RingBuffer.h"
+#include "SafeRingBuffer.h"
 
 #include <cstddef>
 
@@ -47,8 +47,9 @@ class Uart : public HardwareSerial
 
   private:
     SERCOM *sercom;
-    RingBuffer rxBuffer;
-    RingBuffer txBuffer;
+
+    arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> rxBuffer;
+    arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> txBuffer;
 
     uint8_t uc_pinRX;
     uint8_t uc_pinTX;
diff --git a/Source/cores/arduino/sync.h b/Source/cores/arduino/sync.h
@@ -0,0 +1,30 @@
+#include <stdint.h>
+
+#ifndef _SYNC_H_
+#define _SYNC_H_
+/*
+ * Synchronization primitives.
+ * TODO: Move into a separate header file and make an API out of it
+ */
+
+class __Guard {
+public:
+	__Guard() : primask(__get_PRIMASK()), loops(1) {
+		__disable_irq();
+	}
+	~__Guard() {
+		if (primask == 0) {
+			__enable_irq();
+			// http://infocenter.arm.com/help/topic/com.arm.doc.dai0321a/BIHBFEIB.html
+			__ISB();
+		}
+	}
+	uint32_t enter() { return loops--; }
+private:
+	uint32_t primask;
+	uint32_t loops;
+};
+
+#define synchronized for (__Guard __guard; __guard.enter(); )
+
+#endif
diff --git a/package_pwfusion_samd_index.json b/package_pwfusion_samd_index.json
@@ -257,6 +257,48 @@
                             "version": "1.2.0"
                         }
                     ]
+                },
+                {
+                    "name": "Playing With Fusion SAMD Boards",
+                    "architecture": "samd",
+                    "version": "0.2.3",
+                    "category": "Contributed",
+                    "url": "https://github.com/PlayingWithFusion/Arduino_SAMD/raw/main/Releases/PwFusion_SAMD_00.02.03.zip",
+                    "archiveFileName": "PwFusion_SAMD_00.02.03.zip",
+                    "checksum": "SHA-256:4FF21C8D6A39B7FF6D3FA712CBF689A97EE16508B9BCA81945B337600CE02F82",
+                    "size": "1647728",
+                    "boards": [
+                        {
+                            "name": "R3aktor M0 Logger"
+                        }
+                    ],
+                    "toolsDependencies": [
+                        {
+                            "packager": "arduino",
+                            "name": "arm-none-eabi-gcc",
+                            "version": "7-2017q4"
+                        },
+                        {
+                            "packager": "arduino",
+                            "name": "bossac",
+                            "version": "1.7.0-arduino3"
+                        },
+                        {
+                            "packager": "arduino",
+                            "name": "openocd",
+                            "version": "0.10.0-arduino9"
+                        },
+                        {
+                            "packager": "arduino",
+                            "name": "CMSIS",
+                            "version": "4.5.0"
+                        },
+                        {
+                            "packager": "arduino",
+                            "name": "CMSIS-Atmel",
+                            "version": "1.2.0"
+                        }
+                    ]
                 }
             ],
             "tools": []
