diff options
| author | Simon John <git@the-jedi.co.uk> | 2019-01-11 19:55:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 19:55:14 +0000 |
| commit | 4452f7790ac5f5302eb11393fb9f2af47f0f5831 (patch) | |
| tree | 6452ccf06e4514ecbf2af090c4b3153950fadbd1 /bin | |
| parent | fd24677719fe950c9e233439a40018c4692df138 (diff) | |
| parent | e3a99fdf4e1484f47f7cb3d9cc0da835804ecf90 (diff) | |
Merge pull request #597 from tuna-f1sh/master
Fix #594 and sam flag for ardmk-init
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ardmk-init | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/ardmk-init b/bin/ardmk-init index 1a01cd3..51b12f0 100755 --- a/bin/ardmk-init +++ b/bin/ardmk-init @@ -22,7 +22,7 @@ import os import argparse ## Global Vars -VERSION = "1.1" +VERSION = "1.2" ARD_TEMPLATE = "\n\ #include <Arduino.h>\n\ #include <Wire.h>\n\ @@ -49,6 +49,7 @@ PARSER.add_argument('-u', '--micro', default='AUTO', help='microcontroller on bo PARSER.add_argument('-f', '--freq', default='AUTO', help='clock frequency') PARSER.add_argument('-p', '--port', default='AUTO', help='monitor port') PARSER.add_argument('-n', '--name', default=os.path.basename(os.getcwd()), help='project name') +PARSER.add_argument('-s', '--sam', action='store_true', help='sam device, will include Sam.mk rather than Arduino.mk') PARSER.add_argument('--cli', action='store_true', help='run with user prompts (requires "Clint" module), rather than args') PARSER.add_argument('-P', '--project', action='store_true', help='create boilerplate project with src, lib and bin folder structure') @@ -182,7 +183,10 @@ def generate_makefile(): validators=[validators.PathValidator()]) ardmk = "ARDMK_DIR := " + ardmk + "\n" - file_content += "\ninclude $(ARDMK_DIR)/Arduino.mk" + if ARGS.sam: + file_content += "\ninclude $(ARDMK_DIR)/Sam.mk" + else: + file_content += "\ninclude $(ARDMK_DIR)/Arduino.mk" # Add forward slash if source directory exists if src_dir: |