Draft: Add SAM4E 4S support

README.md

@@ -1,4 +1,4 @@
-# Arduino Core for SAM3X CPU
+# Arduino Core for SAM3 and SAM4 CPU
 
 This repository contains the source code and configuration files of the Arduino Core for Atmel's SAM3X processor (used on the [Arduino Due](https://www.arduino.cc/en/Main/ArduinoBoardDue) board).
 
@@ -9,6 +9,31 @@ Just open the "Boards Manager" and install the package called:
 
  * **Arduino SAM Boards (32-bit ARM Cortex-M3)**
 
+## Installation on VSCode
+
+Use Platformio extension with atmelsam framework
+
+```
+[env:due]
+platform = atmelsam
+framework = arduino
+board = due
+
+```
+
+Development SAM4E Version
+
+```
+[env:SAM4]
+platform = atmelsam
+framework = arduino
+board = sam4e8e
+platform_packages =
+    framework-arduino-sam@https://github.com/chepo92/ArduinoCore-sam.git#dev-SAM4E
+    toolchain-gccarmnoneeabi @ 1.40804.0
+
+```
+
 ## Support
 
 There is a dedicated section of the Arduino Forum for general discussion and project assistance:
@@ -27,3 +52,4 @@ Before posting a new issue, please check if the same problem has been already re
 
 Contributions are always welcome.
 The preferred way to receive code contribution is by submitting a Pull Request on github.
+

boards.txt

@@ -1,49 +1,43 @@
+motionbow.name=Motionbow
+motionbow.vid.0=0x2341
+motionbow.pid.0=0x003e
+motionbow.upload.tool=bossac
+motionbow.upload.protocol=sam-ba
+motionbow.upload.maximum_size=262144
+motionbow.upload.use_1200bps_touch=true
+motionbow.upload.wait_for_upload_port=true
+motionbow.upload.native_usb=true
+motionbow.build.mcu=cortex-m4
+motionbow.build.f_cpu=120000000ul
+motionbow.build.usb_manufacturer="LaserX"
+motionbow.build.usb_product="laserX bow"
+motionbow.build.board=MOTIONBOW
+motionbow.build.core=arduino
+motionbow.build.extra_flags=-D__SAM4S4A__ -mthumb {build.usb_flags}
+motionbow.build.ldscript=linker_scripts/gcc/flash.ld
+motionbow.build.variant=motionbow
+motionbow.build.variant_system_lib=libsam_sam4s4a_gcc_rel.a
+motionbow.build.vid=0x2341
+motionbow.build.pid=0x003e
 
-arduino_due_x_dbg.name=Arduino Due (Programming Port)
-arduino_due_x_dbg.vid.0=0x2341
-arduino_due_x_dbg.pid.0=0x003d
-arduino_due_x_dbg.vid.1=0x2A03
-arduino_due_x_dbg.pid.1=0x003d
-arduino_due_x_dbg.upload.tool=bossac
-arduino_due_x_dbg.upload.protocol=sam-ba
-arduino_due_x_dbg.upload.maximum_size=524288
-arduino_due_x_dbg.upload.use_1200bps_touch=true
-arduino_due_x_dbg.upload.wait_for_upload_port=false
-arduino_due_x_dbg.upload.native_usb=false
-arduino_due_x_dbg.build.mcu=cortex-m3
-arduino_due_x_dbg.build.f_cpu=84000000L
-arduino_due_x_dbg.build.usb_manufacturer="Arduino LLC"
-arduino_due_x_dbg.build.usb_product="Arduino Due"
-arduino_due_x_dbg.build.board=SAM_DUE
-arduino_due_x_dbg.build.core=arduino
-arduino_due_x_dbg.build.extra_flags=-D__SAM3X8E__ -mthumb {build.usb_flags}
-arduino_due_x_dbg.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_due_x_dbg.build.variant=arduino_due_x
-arduino_due_x_dbg.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
-arduino_due_x_dbg.build.vid=0x2341
-arduino_due_x_dbg.build.pid=0x003e
-
-arduino_due_x.name=Arduino Due (Native USB Port)
-arduino_due_x.vid.0=0x2341
-arduino_due_x.pid.0=0x003e
-arduino_due_x.vid.1=0x2A03
-arduino_due_x.pid.1=0x003e
-arduino_due_x.upload.tool=bossac
-arduino_due_x.upload.protocol=sam-ba
-arduino_due_x.upload.maximum_size=524288
-arduino_due_x.upload.use_1200bps_touch=true
-arduino_due_x.upload.wait_for_upload_port=true
-arduino_due_x.upload.native_usb=true
-arduino_due_x.build.mcu=cortex-m3
-arduino_due_x.build.f_cpu=84000000L
-arduino_due_x.build.usb_manufacturer="Arduino LLC"
-arduino_due_x.build.usb_product="Arduino Due"
-arduino_due_x.build.board=SAM_DUE
-arduino_due_x.build.core=arduino
-arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb {build.usb_flags}
-arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
-arduino_due_x.build.variant=arduino_due_x
-arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
-arduino_due_x.build.vid=0x2341
-arduino_due_x.build.pid=0x003e
-
+sam4e8e.name=SAM4E8E
+sam4e8e.vid.0=0x2341
+sam4e8e.pid.0=0x003e
+sam4e8e.upload.tool=bossac
+sam4e8e.upload.protocol=sam-ba
+sam4e8e.upload.maximum_size=262144
+sam4e8e.upload.use_1200bps_touch=true
+sam4e8e.upload.wait_for_upload_port=true
+sam4e8e.upload.native_usb=true
+sam4e8e.build.mcu=cortex-m4
+sam4e8e.build.f_cpu=120000000ul
+sam4e8e.build.usb_manufacturer="LaserX"
+sam4e8e.build.usb_product="laserX bow"
+sam4e8e.build.board=SAM4E8E
+sam4e8e.build.core=arduino
+sam4e8e.build.extra_flags=-D__SAM4E8E__ -mthumb {build.usb_flags}
+sam4e8e.build.ldscript=linker_scripts/gcc/flash.ld
+sam4e8e.build.variant=sam4e8e
+sam4e8e.build.variant_system_lib=libsam_sam4e8e_gcc_rel.a
+sam4e8e.build.vid=0x2341
+sam4e8e.build.pid=0x003e

cores/arduino/Arduino.h

@@ -53,6 +53,17 @@ void yield(void);
 extern void setup( void ) ;
 extern void loop( void ) ;
 
+
+
+
+
+
+
+
+
+
+
+
 //#define NOT_A_PIN 0  // defined in pio.h/EPioType
 #define NOT_A_PORT           0
 

cores/arduino/HardwareSerial.h

@@ -26,12 +26,15 @@
 class HardwareSerial : public Stream
 {
   public:
-    virtual void begin(unsigned long);
-    virtual void end();
+    virtual void begin(unsigned long) = 0; // unsigned long
+    virtual void end() = 0;
+
     virtual int available(void) = 0;
+
     virtual int peek(void) = 0;
-    virtual int read(void) = 0;
+	virtual int read(void) = 0;
     virtual void flush(void) = 0;
+
     virtual size_t write(uint8_t) = 0;
     using Print::write; // pull in write(str) and write(buf, size) from Print
     virtual operator bool() = 0;

cores/arduino/IPAddress.cpp

@@ -45,6 +45,8 @@ IPAddress::IPAddress(const uint8_t *address)
 
 bool IPAddress::fromString(const char *address)
 {
+    // TODO: add support for "a", "a.b", "a.b.c" formats
+
     uint16_t acc = 0; // Accumulator
     uint8_t dots = 0;
 

cores/arduino/Print.cpp

@@ -242,7 +242,7 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Print the decimal point, but only if there are digits beyond
   if (digits > 0) {
-    n += print('.'); 
+    n += print("."); 
   }
 
   // Extract digits from the remainder one at a time

cores/arduino/Reset.cpp

@@ -23,23 +23,51 @@
 extern "C" {
 #endif
 
+#ifdef SAM4_SERIES
+
+#define EEFC_FCR_FCMD(value) ((EEFC_FCR_FCMD_Msk & ((value) << EEFC_FCR_FCMD_Pos)))
+#define EEFC_FCR_FKEY(value) ((EEFC_FCR_FKEY_Msk & ((value) << EEFC_FCR_FKEY_Pos)))
+#define RSTC_CR_KEY(value) ((RSTC_CR_KEY_Msk & ((value) << RSTC_CR_KEY_Pos)))
+
+#endif
+
+
 __attribute__ ((long_call, section (".ramfunc")))
 void banzai() {
 	// Disable all interrupts
 	__disable_irq();
 
 	// Set bootflag to run SAM-BA bootloader at restart
-	const int EEFC_FCMD_CGPB = 0x0C;
-	const int EEFC_KEY = 0x5A;
+	const int EEFC_FCMD_CGPB = 0x0C;  // Clear GPNVM bit
+	const int EEFC_KEY = 0x5A;		//  FKEY: Flash Writing Protection Key
+#if SAM4S_SERIES
+
 	while ((EFC0->EEFC_FSR & EEFC_FSR_FRDY) == 0);
 	EFC0->EEFC_FCR =
 		EEFC_FCR_FCMD(EEFC_FCMD_CGPB) |
 		EEFC_FCR_FARG(1) |
 		EEFC_FCR_FKEY(EEFC_KEY);
 	while ((EFC0->EEFC_FSR & EEFC_FSR_FRDY) == 0);
 
+#elif SAM4E_SERIES
+	#warning SAM4E_SERIES Enabled 
+	while ((EFC->EEFC_FSR & EEFC_FSR_FRDY) == 0);
+	EFC->EEFC_FCR =
+		EEFC_FCR_FCMD(EEFC_FCMD_CGPB) |
+		EEFC_FCR_FARG(1) |
+		EEFC_FCR_FKEY(EEFC_KEY);
+	while ((EFC->EEFC_FSR & EEFC_FSR_FRDY) == 0);
+
+#endif
+
+
 	// From here flash memory is no more available.
 
+	// Memory swap needs some time to stabilize
+	for (uint32_t i=0; i<1000000; i++)
+		// force compiler to not optimize this
+		__asm__ __volatile__("");
+
 	// BANZAIIIIIII!!!
 	const int RSTC_KEY = 0xA5;
 	RSTC->RSTC_CR =
@@ -54,6 +82,7 @@ static int ticks = -1;
 
 void initiateReset(int _ticks) {
 	ticks = _ticks;
+	//banzai();
 }
 
 void cancelReset() {

cores/arduino/RingBuffer.h

@@ -22,7 +22,7 @@
 #include <stdint.h>
 
 // Define constants and variables for buffering incoming serial data.  We're
-// using a ring buffer, in which head is the index of the location
+// using a ring buffer (I think), in which head is the index of the location
 // to which to write the next incoming character and tail is the index of the
 // location from which to read.
 #define SERIAL_BUFFER_SIZE 128

cores/arduino/Stream.cpp

@@ -26,8 +26,9 @@
 #include "Stream.h"
 
 #define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait
+#define NO_SKIP_CHAR  1  // a magic char not found in a valid ASCII numeric field
 
-// protected method to read stream with timeout
+// private method to read stream with timeout
 int Stream::timedRead()
 {
   int c;
@@ -39,7 +40,7 @@ int Stream::timedRead()
   return -1;     // -1 indicates timeout
 }
 
-// protected method to peek stream with timeout
+// private method to peek stream with timeout
 int Stream::timedPeek()
 {
   int c;

cores/arduino/Stream.h

@@ -51,8 +51,8 @@ class Stream : public Print
   protected:
     unsigned long _timeout;      // number of milliseconds to wait for the next char before aborting timed read
     unsigned long _startMillis;  // used for timeout measurement
-    int timedRead();    // read stream with timeout
-    int timedPeek();    // peek stream with timeout
+    int timedRead();    // private method to read stream with timeout
+    int timedPeek();    // private method to peek stream with timeout
     int peekNextDigit(LookaheadMode lookahead, bool detectDecimal); // returns the next numeric digit in the stream or -1 if timeout
 
   public: