Merge pull request #109 from MCUdude/324pb_support

Merge 324pb-support branch into master

.travis.yml

@@ -61,7 +61,7 @@ env:
     # clock=1MHz_internal
     - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:644:pinout=standard,variant=modelP,BOD=2v7,LTO=Os,clock=1MHz_internal" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
 
-    # ATmega324
+    # ATmega324 - Since the variant files will be compiled significantly differently for ATmega324PB, test each pinout for variant=modelPB
     # pinout=standard, variant=modelP, BOD=2v7, LTO=Os, clock=16MHz_external
     - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=standard,variant=modelP,BOD=2v7,LTO=Os,clock=16MHz_external" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
     # LTO=Os_flto, clock=20MHz_external
@@ -70,13 +70,12 @@ env:
     - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=bobuino,variant=modelA,BOD=4v3,LTO=Os,clock=18_432MHz_external" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
     # pinout=sanguino, BOD=1v8, clock=12MHz_external
     - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=sanguino,variant=modelP,BOD=1v8,LTO=Os,clock=12MHz_external" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
-    # BOD=disabled, clock=8MHz_external
-    - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=standard,variant=modelP,BOD=disabled,LTO=Os,clock=8MHz_external" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
-    # F_CPU of 8 MHz has already been fully tested and the BOD and internal clock configuration will have no effect on code so it's only necessary to do a single verification per IDE version for the 8 MHz internal clock setting
-    # clock=8MHz_internal
-    - SKETCH_PATH="${APPLICATION_FOLDER}/arduino/examples/01.Basics/BareMinimum/BareMinimum.ino" BOARD_ID="MightyCore:avr:324:pinout=standard,variant=modelP,BOD=2v7,LTO=Os,clock=8MHz_internal" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
-    # clock=1MHz_internal
-    - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=standard,variant=modelP,BOD=2v7,LTO=Os,clock=1MHz_internal" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
+    # pinout=standard, variant=modelPB, BOD=disabled, clock=8MHz_external
+    - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=standard,variant=modelPB,BOD=disabled,LTO=Os,clock=8MHz_external" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
+    # pinout=standard, variant=modelPB, clock=8MHz_internal
+    - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=bobuino,variant=modelPB,BOD=2v7,LTO=Os,clock=8MHz_internal" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
+    # pinout=standard, variant=modelPB, clock=1MHz_internal
+    - SKETCH_PATH="${SKETCHBOOK_FOLDER}/hardware/MightyCore/avr/libraries" BOARD_ID="MightyCore:avr:324:pinout=sanguino,variant=modelPB,BOD=2v7,LTO=Os,clock=1MHz_internal" ALLOW_FAILURE="false" IDE_VERSIONS="$IDE_VERSION_LIST_FULL"
 
     # ATmega164
     # Some library examples use more memory than this microcontroller provides so each library or sketch must be be done in a separate job
@@ -285,6 +284,12 @@ env:
 
 
 before_install:
+  # Check for tabs (excluding subtrees and keywords.txt files)
+  - find . -path './.git' -prune -or -path './avr/bootloaders/optiboot_flash' -prune -or -path './avr/cores/MCUdude_corefiles' -prune -or -path './avr/travis-ci/arduino-ci-script' -prune -or \( -not -name 'keywords.txt' -and -type f \) -exec grep --with-filename --line-number --binary-files=without-match --regexp=$'\t' '{}' \; -exec echo 'Tab found.' \; -exec false '{}' +
+
+  # Check for non-Unix line endings (excluding subtrees)
+  - find . -path './.git' -prune -or -path './avr/bootloaders/optiboot_flash' -prune -or -path './avr/cores/MCUdude_corefiles' -prune -or -path './avr/travis-ci/arduino-ci-script' -prune -or -type f -exec grep --files-with-matches --binary-files=without-match --regexp=$'\r$' '{}' \; -exec echo 'Non-Unix EOL detected.' \; -exec false '{}' +
+
   # Install the script used to simplify use of Travis CI for testing Arduino projects
   - source "${TRAVIS_BUILD_DIR}/avr/travis-ci/arduino-ci-script/arduino-ci-script.sh"
 
@@ -308,6 +313,8 @@ before_install:
 
   # Install MightyCore from the repository
   - install_package
+  # Install beta version of Arduino AVR Boards, required for ATmega324PB
+  - install_package "arduino:avr" "https://downloads.arduino.cc/packages/package_avr_3.6.0_index.json"
 
 
 script:

LICENSE

@@ -294,8 +294,8 @@ POSSIBILITY OF SUCH DAMAGES.
 
 .....................................................................
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -306,7 +306,7 @@ POSSIBILITY OF SUCH DAMAGES.
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -408,7 +408,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -728,7 +728,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

Library_porting.md

@@ -88,18 +88,18 @@ Just remember that the ATmega8535/16/32 doesn't have more than 4 PWM outputs and
 #define TXB80   TXB8
 
 //Interrupt vectors
-#define TIMER2_COMPA_vect			TIMER2_COMP_vect
-#define TIMER2_COMPA_vect_num	TIMER2_COMP_vect_num
-#define TIMER0_COMPA_vect		 	TIMER0_COMP_vect
-#define TIMER0_COMPA_vect_num	TIMER0_COMP_vect_num 
-#define USART0_RX_vect				USART_RXC_vect
-#define USART0_RX_vect_num		USART_RXC_vect_num
-#define USART0_UDRE_vect			USART_UDRE_vect
-#define USART0_UDRE_vect_num	USART_UDRE_vect_num
-#define USART0_TX_vect				USART_TXC_vect
-#define USART0_TX_vect_num		USART_TXC_vect_num
-#define ANALOG_COMP_vect			ANA_COMP_vect
-#define ANALOG_COMP_vect_num	ANA_COMP_vect_num
+#define TIMER2_COMPA_vect     TIMER2_COMP_vect
+#define TIMER2_COMPA_vect_num TIMER2_COMP_vect_num
+#define TIMER0_COMPA_vect     TIMER0_COMP_vect
+#define TIMER0_COMPA_vect_num TIMER0_COMP_vect_num 
+#define USART0_RX_vect        USART_RXC_vect
+#define USART0_RX_vect_num    USART_RXC_vect_num
+#define USART0_UDRE_vect      USART_UDRE_vect
+#define USART0_UDRE_vect_num  USART_UDRE_vect_num
+#define USART0_TX_vect        USART_TXC_vect
+#define USART0_TX_vect_num    USART_TXC_vect_num
+#define ANALOG_COMP_vect      ANA_COMP_vect
+#define ANALOG_COMP_vect_num  ANA_COMP_vect_num
 #endif
 ```