Remove Perl/YAML dependency by implementing ard-parse-boards in the shell.
This commit is contained in:
Christopher Peplin
parent
f437ea63eb
commit
6f3c005f65
2 changed files with 13 additions and 273 deletions
|
|
@ -215,51 +215,52 @@ BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef PARSE_BOARD
|
ifndef PARSE_BOARD
|
||||||
PARSE_BOARD = ard-parse-boards --boards_txt=$(BOARDS_TXT)
|
# result = $(call READ_BOARD_TXT, 'boardname', 'parameter')
|
||||||
|
PARSE_BOARD = $(shell grep $(1).$(2) $(BOARDS_TXT) | cut -d = -f 2 )
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Which variant ? This affects the include path
|
# Which variant ? This affects the include path
|
||||||
ifndef VARIANT
|
ifndef VARIANT
|
||||||
VARIANT = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.variant)
|
VARIANT = $(call PARSE_BOARD,$(BOARD_TAG),build.variant)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# processor stuff
|
# processor stuff
|
||||||
ifndef MCU
|
ifndef MCU
|
||||||
MCU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.mcu)
|
MCU = $(call PARSE_BOARD,$(BOARD_TAG),build.mcu)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef F_CPU
|
ifndef F_CPU
|
||||||
F_CPU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.f_cpu)
|
F_CPU = $(call PARSE_BOARD,$(BOARD_TAG),build.f_cpu)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# normal programming info
|
# normal programming info
|
||||||
ifndef AVRDUDE_ARD_PROGRAMMER
|
ifndef AVRDUDE_ARD_PROGRAMMER
|
||||||
AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD) $(BOARD_TAG) upload.protocol)
|
AVRDUDE_ARD_PROGRAMMER = $(call PARSE_BOARD,$(BOARD_TAG),upload.protocol)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef AVRDUDE_ARD_BAUDRATE
|
ifndef AVRDUDE_ARD_BAUDRATE
|
||||||
AVRDUDE_ARD_BAUDRATE = $(shell $(PARSE_BOARD) $(BOARD_TAG) upload.speed)
|
AVRDUDE_ARD_BAUDRATE = $(call PARSE_BOARD,$(BOARD_TAG),upload.speed)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# fuses if you're using e.g. ISP
|
# fuses if you're using e.g. ISP
|
||||||
ifndef ISP_LOCK_FUSE_PRE
|
ifndef ISP_LOCK_FUSE_PRE
|
||||||
ISP_LOCK_FUSE_PRE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.unlock_bits)
|
ISP_LOCK_FUSE_PRE = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.unlock_bits)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef ISP_LOCK_FUSE_POST
|
ifndef ISP_LOCK_FUSE_POST
|
||||||
ISP_LOCK_FUSE_POST = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.lock_bits)
|
ISP_LOCK_FUSE_POST = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.lock_bits)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef ISP_HIGH_FUSE
|
ifndef ISP_HIGH_FUSE
|
||||||
ISP_HIGH_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.high_fuses)
|
ISP_HIGH_FUSE = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.high_fuses)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef ISP_LOW_FUSE
|
ifndef ISP_LOW_FUSE
|
||||||
ISP_LOW_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.low_fuses)
|
ISP_LOW_FUSE = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.low_fuses)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef ISP_EXT_FUSE
|
ifndef ISP_EXT_FUSE
|
||||||
ISP_EXT_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.extended_fuses)
|
ISP_EXT_FUSE = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.extended_fuses)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Everything gets built in here
|
# Everything gets built in here
|
||||||
|
|
@ -506,7 +507,7 @@ size: $(OBJDIR) $(TARGET_HEX)
|
||||||
$(SIZE) $(TARGET_HEX)
|
$(SIZE) $(TARGET_HEX)
|
||||||
|
|
||||||
show_boards:
|
show_boards:
|
||||||
$(PARSE_BOARD) --boards
|
@cat $(BOARDS_TXT) | grep -E "^[[:alnum:]]" | cut -d . -f 1 | uniq
|
||||||
|
|
||||||
.PHONY: all clean depends upload raw_upload reset size show_boards
|
.PHONY: all clean depends upload raw_upload reset size show_boards
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,261 +0,0 @@
|
||||||
#! /usr/bin/perl
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use warnings;
|
|
||||||
|
|
||||||
use Getopt::Long;
|
|
||||||
use Pod::Usage;
|
|
||||||
use YAML;
|
|
||||||
|
|
||||||
my %Opt =
|
|
||||||
(
|
|
||||||
boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt',
|
|
||||||
);
|
|
||||||
|
|
||||||
GetOptions(\%Opt,
|
|
||||||
"boards_txt=s", # filename of the boards.txt file
|
|
||||||
"find!", # search for data
|
|
||||||
"dump!", # dump the whole database
|
|
||||||
"boards!", # dump a list of boards
|
|
||||||
"help!",
|
|
||||||
"info!",
|
|
||||||
);
|
|
||||||
|
|
||||||
if ($Opt{help} || $Opt{info})
|
|
||||||
{
|
|
||||||
usage();
|
|
||||||
}
|
|
||||||
|
|
||||||
my $db = parse_boards($Opt{boards_txt});
|
|
||||||
|
|
||||||
if ($Opt{dump})
|
|
||||||
{
|
|
||||||
dump_data("$Opt{boards_txt} contains:", $db);
|
|
||||||
}
|
|
||||||
elsif ($Opt{find})
|
|
||||||
{
|
|
||||||
my @terms = @ARGV or usage();
|
|
||||||
find_data($db, \@terms);
|
|
||||||
}
|
|
||||||
elsif ($Opt{boards})
|
|
||||||
{
|
|
||||||
dump_boards($db);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
my $tag = shift @ARGV or usage();
|
|
||||||
|
|
||||||
if (my $key = shift @ARGV)
|
|
||||||
{
|
|
||||||
die "$key isn't defined for the $tag board, "
|
|
||||||
unless $db->{$tag} && exists $db->{$tag}->{$key};
|
|
||||||
|
|
||||||
print $db->{$tag}->{$key}, "\n";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
die "The $tag board isn't defined, "
|
|
||||||
unless $db->{$tag};
|
|
||||||
|
|
||||||
dump_data("The $tag board:", $db->{$tag});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
## here endeth the main
|
|
||||||
|
|
||||||
sub usage
|
|
||||||
{
|
|
||||||
pod2usage(-verbose => 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
# return HoH: {board}->{field} = value
|
|
||||||
sub parse_boards
|
|
||||||
{
|
|
||||||
my $filename = shift;
|
|
||||||
|
|
||||||
my %b;
|
|
||||||
|
|
||||||
open(my $fh, '<', $filename)
|
|
||||||
or die "Can't open $filename, ";
|
|
||||||
|
|
||||||
while(<$fh>)
|
|
||||||
{
|
|
||||||
my ($board, $key, $value) = /^\s*(\S+?)\.(\S+?)\s*=\s*(.+?)\s*$/
|
|
||||||
or next;
|
|
||||||
|
|
||||||
$b{$board}->{$key} = $value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return \%b;
|
|
||||||
}
|
|
||||||
|
|
||||||
# A rudimentary search engine
|
|
||||||
sub find_data
|
|
||||||
{
|
|
||||||
my ($db, $term_list) = @_;
|
|
||||||
|
|
||||||
my @q = map { qr/$_/i } @$term_list;
|
|
||||||
my $q = join(' && ', map { "/$_/i" } @$term_list);
|
|
||||||
|
|
||||||
my %hit;
|
|
||||||
foreach my $b (keys %$db)
|
|
||||||
{
|
|
||||||
foreach my $k (keys %{$db->{$b}})
|
|
||||||
{
|
|
||||||
my $v = $db->{$b}->{$k};
|
|
||||||
$hit{$b}->{$k} = $v if !grep { $v !~ /$_/i } @q;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dump_data("Matches for $q:", \%hit);
|
|
||||||
}
|
|
||||||
|
|
||||||
# The list of boards...
|
|
||||||
sub dump_boards
|
|
||||||
{
|
|
||||||
my $db = shift or return;
|
|
||||||
|
|
||||||
my %name;
|
|
||||||
my $max_l = 0;
|
|
||||||
foreach my $b (keys %$db)
|
|
||||||
{
|
|
||||||
$name{$b} = $db->{$b}->{name} || 'Anonymous';
|
|
||||||
$max_l = length($b) if $max_l < length($b);
|
|
||||||
}
|
|
||||||
|
|
||||||
my $fmt = sprintf("%%-%ds %%s\n", $max_l + 2);
|
|
||||||
|
|
||||||
printf $fmt, "Tag", "Board Name";
|
|
||||||
foreach my $b (sort keys %name)
|
|
||||||
{
|
|
||||||
printf $fmt, $b, $name{$b};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# dump arbitrary data with a title
|
|
||||||
sub dump_data
|
|
||||||
{
|
|
||||||
my ($title, $data) = @_;
|
|
||||||
|
|
||||||
print "# $title\n", Dump($data);
|
|
||||||
}
|
|
||||||
|
|
||||||
__END__
|
|
||||||
|
|
||||||
=head1 NAME
|
|
||||||
|
|
||||||
ard-parse-boards - Read data from the Arduino boards.txt file
|
|
||||||
|
|
||||||
=head1 USAGE
|
|
||||||
|
|
||||||
Dump all the data in the file:
|
|
||||||
$ ard-parse-boards --dump
|
|
||||||
|
|
||||||
See which boards we know about:
|
|
||||||
$ ard-parse-boards --boards
|
|
||||||
|
|
||||||
Look for a particular board...
|
|
||||||
$ ard-parse-boards --find uno
|
|
||||||
|
|
||||||
...multiple terms are implicitly ANDed:
|
|
||||||
$ ard-parse-boards --find duemil 328
|
|
||||||
|
|
||||||
Dump all the data for a particular board:
|
|
||||||
$ ard-parse-boards atmega328
|
|
||||||
|
|
||||||
Extract a particular field:
|
|
||||||
$ ard-parse-boards atmega328 build.f_cpu
|
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
|
||||||
|
|
||||||
The Arduino software package ships with a boards.txt file which tells
|
|
||||||
the Arduino IDE details about particular hardware. So when the user
|
|
||||||
says he's got a shiny new Arduino Uno, boards.txt knows that it has a
|
|
||||||
16MHz ATmega328 on it. It would be nice to access these data from the
|
|
||||||
command line too.
|
|
||||||
|
|
||||||
In normal operation you simply specify the tag given to the board in
|
|
||||||
the boards.txt file, and optionally a field name. This program then
|
|
||||||
extracts the data to STDOUT.
|
|
||||||
|
|
||||||
Most boards have names which are quite unwieldy, so we always refer to
|
|
||||||
a board by a tag, not its name. Strictly the tag is the bit before the
|
|
||||||
first dot in the boards.txt key. You can see a list of board tags and
|
|
||||||
names with the C<--boards> option.
|
|
||||||
|
|
||||||
=head1 OPTIONS
|
|
||||||
|
|
||||||
=over
|
|
||||||
|
|
||||||
=item --boards_txt=[file]
|
|
||||||
|
|
||||||
Specify the full path to the boards.txt file.
|
|
||||||
|
|
||||||
=back
|
|
||||||
|
|
||||||
The following options all disable the normal 'lookup' operation.
|
|
||||||
|
|
||||||
=over
|
|
||||||
|
|
||||||
=item --dump
|
|
||||||
|
|
||||||
Dump the complete database in YAML format.
|
|
||||||
|
|
||||||
=item ---boards
|
|
||||||
|
|
||||||
Print a list of the tag and name of every board in the file.
|
|
||||||
|
|
||||||
=item --find [query] <query> ...
|
|
||||||
|
|
||||||
Find matching data. Strictly, return a list of values which match all
|
|
||||||
of the query terms, treating each term as a case-insensitive regexp.
|
|
||||||
|
|
||||||
For example:
|
|
||||||
|
|
||||||
=over
|
|
||||||
|
|
||||||
=item --find 328
|
|
||||||
|
|
||||||
List data containing 328 (anywhere in the value).
|
|
||||||
|
|
||||||
=item --find due
|
|
||||||
|
|
||||||
List data containing 'due' (e.g. duemilanove).
|
|
||||||
|
|
||||||
=item --find 328 due
|
|
||||||
|
|
||||||
List data containing both 328 and due.
|
|
||||||
|
|
||||||
=back
|
|
||||||
|
|
||||||
=back
|
|
||||||
|
|
||||||
=head1 BUGS AND LIMITATIONS
|
|
||||||
|
|
||||||
There are no known bugs in this application.
|
|
||||||
|
|
||||||
Please report problems to the author.
|
|
||||||
|
|
||||||
Patches are welcome.
|
|
||||||
|
|
||||||
=head1 AUTHOR
|
|
||||||
|
|
||||||
Martin Oldfield, ex-atelier@mjo.tc
|
|
||||||
|
|
||||||
Thanks to Mark Sproul who suggested doing something like this to me ages ago.
|
|
||||||
|
|
||||||
=head1 LICENCE AND COPYRIGHT
|
|
||||||
|
|
||||||
Copyright (c) 2011, Martin Oldfield. All rights reserved.
|
|
||||||
|
|
||||||
This file 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 program 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.
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Add table
Reference in a new issue