Rename OTA library to SDU and adjust align to 0x2000

Author: sandeepmistry

libraries/OTA/extras/OTA_SD/OTA_SD.ino renamed to libraries/SDU/extras/SDUBoot/SDUBoot.ino

@@ -1,10 +1,28 @@
+/*
+  Copyright (c) 2017 Arduino LLC.  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
+*/
+
 #include <SD.h>
 #include <FlashStorage.h>
 
-#define OTA_START    0x2000
-#define OTA_SIZE     0x4000
+#define SDU_START    0x2000
+#define SDU_SIZE     0x4000
 
-#define SKETCH_START (uint32_t*)(OTA_START + OTA_SIZE)
+#define SKETCH_START (uint32_t*)(SDU_START + SDU_SIZE)
 
 #ifndef SDCARD_SS_PIN
 #define SDCARD_SS_PIN 4
@@ -29,10 +47,10 @@ int main() {
     uint32_t updateSize = updateFile.size();
     bool updateFlashed = false;
 
-    if (updateSize > OTA_SIZE) {
-      // skip the OTA section
-      updateFile.seek(OTA_SIZE);
-      updateSize -= OTA_SIZE;
+    if (updateSize > SDU_SIZE) {
+      // skip the SDU section
+      updateFile.seek(SDU_SIZE);
+      updateSize -= SDU_SIZE;
 
       uint32_t flashAddress = (uint32_t)SKETCH_START;
 

libraries/OTA/extras/OTA_SD/build.sh renamed to libraries/SDU/extras/SDUBoot/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 ARDUINO=arduino
-SKETCH_NAME="OTA_SD.ino"
+SKETCH_NAME="SDUBoot.ino"
 SKETCH="$PWD/$SKETCH_NAME"
 BUILD_PATH="$PWD/build"
 OUTPUT_PATH="../../src/boot"
@@ -10,7 +10,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	ARDUINO="/Applications/Arduino.app/Contents/MacOS/Arduino"
 fi
 
-buildOTASketch() {
+buildSDUBootSketch() {
 	BOARD=$1
 	DESTINATION=$2
 
@@ -21,6 +21,6 @@ buildOTASketch() {
 
 mkdir -p "$OUTPUT_PATH"
 
-buildOTASketch "arduino:samd:arduino_zero_edbg" "$OUTPUT_PATH/zero.h"
-buildOTASketch "arduino:samd:mkr1000" "$OUTPUT_PATH/mkr1000.h"
-buildOTASketch "arduino:samd:mkrzero" "$OUTPUT_PATH/mkrzero.h"
+buildSDUBootSketch "arduino:samd:arduino_zero_edbg" "$OUTPUT_PATH/zero.h"
+buildSDUBootSketch "arduino:samd:mkr1000" "$OUTPUT_PATH/mkr1000.h"
+buildSDUBootSketch "arduino:samd:mkrzero" "$OUTPUT_PATH/mkrzero.h"

libraries/OTA/keywords.txt renamed to libraries/SDU/keywords.txt

@@ -1,12 +1,12 @@
 #######################################
-# Syntax Coloring Map For OTA
+# Syntax Coloring Map For SDU
 #######################################
 
 #######################################
 # Datatypes (KEYWORD1)
 #######################################
 
-OTA	KEYWORD1
+SDU	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)

libraries/OTA/library.properties renamed to libraries/SDU/library.properties

@@ -1,9 +1,9 @@
-name=OTA
+name=SDU
 version=1.0.0
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Update sketches on your board without USB
+sentence=Update the sketch on your board from an SD card
 paragraph=Requires an SD card
 category=Other
-url=http://www.arduino.cc/en/Reference/OTA
+url=http://www.arduino.cc/en/Reference/SDU
 architectures=samd

libraries/OTA/src/OTA.cpp renamed to libraries/SDU/src/SDU.cpp

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2016 Arduino LLC.  All right reserved.
+  Copyright (c) 2017 Arduino LLC.  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
@@ -18,10 +18,10 @@
 
 #include <Arduino.h>
 
-#include "OTA.h"
+#include "SDU.h"
 
-__attribute__ ((section(".ota_boot")))
-unsigned char otaBoot[0x4000] = {
+__attribute__ ((section(".sketch_boot")))
+unsigned char sduBoot[0x4000] = {
 #if defined(ARDUINO_SAMD_ZERO)
   #include "boot/zero.h"
 #elif defined(ARDUINO_SAMD_MKR1000)
@@ -33,14 +33,14 @@ unsigned char otaBoot[0x4000] = {
 #endif
 };
 
-OTAClass::OTAClass() {
+SDUClass::SDUClass() {
 }
 
-void OTAClass::reset() {
+void SDUClass::reset() {
   // Reset the device
   NVIC_SystemReset() ;
 
   while (true);
 }
 
-OTAClass OTA;
+SDUClass SDU;

libraries/OTA/src/OTA.h renamed to libraries/SDU/src/SDU.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2016 Arduino LLC.  All right reserved.
+  Copyright (c) 2017 Arduino LLC.  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
@@ -16,16 +16,16 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _OTA_H_INCLUDED
-#define _OTA_H_INCLUDED
+#ifndef _SDU_H_INCLUDED
+#define _SDU_H_INCLUDED
 
-class OTAClass {
+class SDUClass {
 public:
-  OTAClass();
+  SDUClass();
 
   void reset();
 };
 
-extern OTAClass OTA;
+extern SDUClass SDU;
 
 #endif

libraries/OTA/src/boot/mkr1000.h renamed to libraries/SDU/src/boot/mkr1000.h

@@ -67,9 +67,9 @@ SECTIONS
 	{
 		__text_start__ = .;
 
-		KEEP(*(.ota_boot))
+		KEEP(*(.sketch_boot))
 
-		. = ALIGN(256);
+		. = ALIGN(0x2000);
 		KEEP(*(.isr_vector))
 		*(.text*)