Merge commit '82972f4579e0d4c6e6a06a1b9144364fa7840c72' into dev

Oh-Doo-Yong · Mar 5, 2018 · ccbe532 · ccbe532
2 parents 345d7b1 + 82972f4
commit ccbe532
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/LICENCE.md b/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/LICENCE.md
@@ -0,0 +1,3 @@
+#License#
+
+This library is a fork of the AltSoftSerial library with small modifications by AST. All credit goes to the orignal creator. See headers in source files for license details.
diff --git a/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/README.md b/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/README.md
@@ -4,12 +4,14 @@ Improved software emulated serial, using hardware timers for precise signal
 timing and availability of CPU time for other libraries to respond to interrupts
 during data AltSoftSerial data transmission and reception.
 
-http://www.pjrc.com/teensy/td_libs_AltSoftSerial.html
+[http://www.pjrc.com/teensy/td_libs_AltSoftSerial.html](http://www.pjrc.com/teensy/td_libs_AltSoftSerial.html)
 
 ![AltSoftSerial on Teensy 2.0](http://www.pjrc.com/teensy/td_libs_AltSoftSerial_2.jpg)
 
 ## Modified by AST to support the CAN485 board
 
+[CAN485 Repository](https://github.com/Atlantis-Specialist-Technologies/CAN485) and [product page](https://www.sparkfun.com/products/14483)
+
 Enables software serial on pins 9 (rx) and 5 (tx).
 
 Note! Using software serial will disable pwm on pins 6 and 7.
diff --git a/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/library.json b/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/library.json
@@ -1,9 +1,9 @@
 {
-  "name": "AltSoftSerial",
+  "name": "AST_AltSoftSerial",
   "frameworks": "Arduino",
   "keywords": "serial",
-  "description": "Alternate Software Serial",
-  "url": "http://www.pjrc.com/teensy/td_libs_AltSoftSerial.html",
+  "description": "Alternate Software Serial. AST fork",
+  "url": "http://github.com/Atlantis-Specialist-Technologies/AltSoftSerial",
   "authors":
   {
     "name": "Paul Stoffregen",
@@ -12,7 +12,7 @@
   "repository":
   {
     "type": "git",
-    "url": "https://github.com/PaulStoffregen/AltSoftSerial"
+    "url": "http://github.com/Atlantis-Specialist-Technologies/AltSoftSerial"
   },
-  "version": "1.4"
+  "version": "1.4.1"
 }
diff --git a/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/library.properties b/Libraries/Arduino/AST_AltSoftSerial_Arduino_Library/library.properties
@@ -1,9 +1,9 @@
 name=AST_AltSoftSerial
-version=1.4
-author=Paul Stoffregen
-maintainer=Paul Stoffregen
-sentence=Software emulated serial using hardware timers for improved compatibility 
-paragraph=Improved software emulated serial, using hardware timers for precise signal timing and improved compatibility with other interrupt-based libraries.
+version=1.4.1
+author=Paul Stoffregen, James Blakey-Milner
+maintainer=Paul Stoffregen, James Blakey-Milner
+sentence=Software emulated serial using hardware timers for improved compatibility.
+paragraph=Improved software emulated serial, using hardware timers for precise signal timing and improved compatibility with other interrupt-based libraries. AST fork to add CAN485 support.
 category=Communication
-url=http://www.pjrc.com/teensy/td_libs_AltSoftSerial.html
+url=http://github.com/Atlantis-Specialist-Technologies/AltSoftSerial
 architectures=avr
diff --git a/...tSerial_Arduino_Library/AltSoftSerial.cpp → ...ial_Arduino_Library/src/AltSoftSerial.cpp b/...tSerial_Arduino_Library/AltSoftSerial.cpp → ...ial_Arduino_Library/src/AltSoftSerial.cpp
diff --git a/...oftSerial_Arduino_Library/AltSoftSerial.h → ...erial_Arduino_Library/src/AltSoftSerial.h b/...oftSerial_Arduino_Library/AltSoftSerial.h → ...erial_Arduino_Library/src/AltSoftSerial.h
diff --git a/...ino_Library/config/AltSoftSerial_Boards.h → ...Library/src/config/AltSoftSerial_Boards.h b/...ino_Library/config/AltSoftSerial_Boards.h → ...Library/src/config/AltSoftSerial_Boards.h
diff --git a/...ino_Library/config/AltSoftSerial_Timers.h → ...Library/src/config/AltSoftSerial_Timers.h b/...ino_Library/config/AltSoftSerial_Timers.h → ...Library/src/config/AltSoftSerial_Timers.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#License#

		This library is a fork of the AltSoftSerial library with small modifications by AST. All credit goes to the orignal creator. See headers in source files for license details.