Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
261ac17
Add initial version of Travis config
WasabiFan Dec 30, 2015
25583fd
Merge remote-tracking branch 'upstream/master' into add-ci-config
WasabiFan Dec 30, 2015
434dd78
Fix easy issues with HTML compliance
WasabiFan Dec 31, 2015
09b94d0
Replace nonexistant ID links with header ID to make the HTML proofer …
WasabiFan Dec 31, 2015
8d196c2
Merge upstream/master into 'add-ci-config'
WasabiFan Jan 7, 2016
f126c49
Modify CI script to use new modification script
WasabiFan Jan 7, 2016
a2fe0ea
Remove BOMs from JS and CSS files
WasabiFan Jan 7, 2016
c745fab
Add message when BOM checks pass and fix script invocation
WasabiFan Jan 8, 2016
79adb18
Make it look like I know what I'm doing
WasabiFan Jan 8, 2016
cba6d8e
Allow checking external links
WasabiFan Jan 8, 2016
f7f7e2d
Revert "Allow checking external links"
WasabiFan Jan 8, 2016
89f408c
Back to the stone ages. Turns out this works just fine.
WasabiFan Jan 8, 2016
43d1191
Fix more html validation issues
WasabiFan Jan 8, 2016
1d8bcb9
Forgot to use the variable I defined :|
WasabiFan Jan 8, 2016
0f5616c
Update .travis.yml
WasabiFan Jan 8, 2016
6c5d270
Update .travis.yml
WasabiFan Jan 8, 2016
b0f8246
First batch of HTML proofing fixes
WasabiFan Jan 9, 2016
4ec5527
Fix more broken links
WasabiFan Jan 9, 2016
38c44c6
Merge link fixes from @dlech
WasabiFan Jan 9, 2016
f7d9cea
Re-add hash references to 'supported sensors' section
WasabiFan Jan 9, 2016
7e579c7
Merge remote-tracking branch 'upstream/master' into add-ci-config
WasabiFan Jan 9, 2016
7e0b178
I've given up on the merge commit messages. I merged master into a br…
WasabiFan Jan 9, 2016
3f8ba6f
Add second half of publish.rb changes
WasabiFan Jan 9, 2016
64c7862
Allow checking external links
WasabiFan Jan 9, 2016
006f63f
Modify publish script to document new arg and fix my bad logic
WasabiFan Jan 9, 2016
b55d14d
Fix argument verification logic
WasabiFan Jan 9, 2016
1435c28
Ruby is special.
WasabiFan Jan 9, 2016
c7b28df
Fix external links to LEGO products, ev3dev kernel repo, and some oth…
WasabiFan Jan 9, 2016
2062e54
Use slashes instead of quotes for command-line regex
WasabiFan Jan 9, 2016
4544892
Enable HTML structure validation and fix easy issues
WasabiFan Jan 10, 2016
6022369
DIE TABS DIE
WasabiFan Jan 10, 2016
38b3cad
Prevent HTML in project pages from interfering with index page markup
WasabiFan Jan 10, 2016
8ce5635
Merge more link fixes into CI branch
WasabiFan Jan 10, 2016
81f6d9f
Merge more upstream link fixes
WasabiFan Jan 10, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: ruby
rvm:
- 2.1

before_script:
- chmod +x ./cibuild.sh # or do this locally and commit

# Assume bundler is being used, therefore
# the `install` step will run `bundle install` by default.
script: ./cibuild.sh

env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ source 'https://rubygems.org'
gem 'github-pages'

require 'rbconfig'
gem "html-proofer", :platforms => :ruby
gem 'wdm', '~> 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ exclude:
- Gemfile.lock
- repo-metadata.html
- publish.rb
- vendor
- cibuild.sh
- .travis.yml

gems:
- jekyll-mentions
Expand Down
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<title>{{ page.title | xml_escape }}</title>
<link rel="alternate" type="application/atom+xml" href="/news/atom.xml" title="Atom feed">
<link rel="icon" href="favicon.ico" />
<link rel="icon" href="/favicon.ico" />

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="/stylesheets/bootstrap.css">
Expand Down
8 changes: 4 additions & 4 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
<img id="brand-logo" src="/images/ev3dev_logo_white.png" />
<img id="brand-logo" src="/images/ev3dev_logo_white.png" alt="ev3dev logo" />
</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav" id="main-nav">
<li>
<a href="/" title="There's no place like Home...">Home</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" title="Documentation on how to use ev3dev">
<a class="dropdown-toggle" href="#main-nav" data-toggle="dropdown" title="Documentation on using ev3dev">
Docs
<span class="caret"></span>
</a>
Expand Down Expand Up @@ -45,7 +45,7 @@
<a href="/news" title="News about ev3dev">News</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#main-nav">
Community
<span class="caret"></span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion _includes/inline-screenshot.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="screenshot inline-screenshot pull-right">
<a href="{{ include.source }}">
<img src="{{ include.source }}" />
<img src="{{ include.source }}" alt="screenshot"/>
</a>
<p>
<small>
Expand Down
2 changes: 1 addition & 1 deletion _includes/screenshot.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
source: The url of the image
caption: (optional) A caption that is displayed under the image.

{% endcomment %}<span class="screenshot"><a href="{{ include.source }}"><img src="{{ include.source }}" alt="screenshot" class="img-responsive" /></a>{% if include.caption %}<p><small>{{ include.caption }}</small></p>{% endif %}</span>
{% endcomment %}<span class="screenshot"><a href="{{ include.source }}"><img src="{{ include.source }}" class="img-responsive" alt="screenshot"/></a>{% if include.caption %}<p><small>{{ include.caption }}</small></p>{% endif %}</span>
7 changes: 6 additions & 1 deletion _includes/title.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
{% assign edit_path = edit_path | append: '#L' | append: source_line %}
{% endif %}
{% elsif page.path contains 'docs/' %}
{% assign edit_path = site.github.repository_url | append: '/edit/master/' | append: page.path %}
{% if site.github.repository_url %}
{% assign repo_url = site.github.repository_url %}
{% else %}
{% assign repo_url = 'https://github.com/ev3dev/ev3dev.github.io' %}
{% endif %}
{% assign edit_path = repo_url | append: '/edit/master/' | append: page.path %}
{% elsif page.path contains 'news/' %}
{% assign show_news_link = 1 %}
{% endif %}
Expand Down
37 changes: 37 additions & 0 deletions cibuild.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env bash
set -e # halt script on error

echo "Searching for BOMs -------------------------------"

FOUND_BOM=false
for filename in ./**/*.*; do
# Make sure that the file is UTF-8 so we don't search binary files or other encodings
CURRENT_FILE_ENCODING="`file --mime-encoding --brief "$filename"`"
if [ "$CURRENT_FILE_ENCODING" == "utf-8" ] && [ "`head -c 3 -- "$filename"`" == $'\xef\xbb\xbf' ]
then
# Make note of all the files that failed so we can see it in the Travis log
FOUND_BOM=true
echo "Found BOM in file $filename!"
fi
done

if [ $FOUND_BOM == true ]
then
# We still want to run the other validation checks even if we found BOMs
echo "Checks failed! Jekyll can't handle BOMs. See above for list of problematic files."
else
echo "Checks passed! No BOMs found."
fi

echo "Building site ------------------------------------"
bundle exec jekyll build --trace

echo "Validating HTML ----------------------------------"
# We want to use the publish script so that we can implement other transformations in the future
ruby publish.rb --no-fix-links --test 'htmlproof ./ --href-ignore /.*example\.com.*/ --check-html --ignore-script-embeds'

# If the site build succeeded but we found BOMs, we want to fail the build
if [ $FOUND_BOM == true ]
then
exit 1
fi
2 changes: 1 addition & 1 deletion docs/drivers/brickpi-i2c-sensor.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ the [lego-sensor class] which is where the useful stuff is. Follow the link
for more information.

[brickpi]: /docs/drivers/brickpi-ld
[brickpi-in-port]: /docs/ports/brickpi-port
[brickpi-in-port]: /docs/ports/brickpi-in-port
[list of supported sensors]: /docs/sensors#supported-sensors
[lego-sensor class]: ../lego-sensor-class

4 changes: 2 additions & 2 deletions docs/drivers/ev3-analog-sensor.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ You can find all of the the devices bound to this driver in the directory
[lego-sensor class] device, which is where all the really useful attributes
are.

[lego-sensor class]: ../lego-sensor-class
[supported sensors]: ../#supported-sensors
[lego-sensor class]: /docs/drivers/lego-sensor-class
[supported sensors]: /docs/sensors#supported-sensors

4 changes: 2 additions & 2 deletions docs/drivers/legoev3-ports.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ to control the input port gpios directly.
device and gpios used by the port free to be controlled directly or used
by other drivers.

[legoev3-input-port]: docs/ports/legoev3-input-port
[legoev3-output-port]: docs/ports/legoev3-output-port
[legoev3-input-port]: /docs/ports/legoev3-input-port
[legoev3-output-port]: /docs/ports/legoev3-output-port

4 changes: 2 additions & 2 deletions docs/drivers/nxt-i2c-sensor.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ You can find devices bound to this driver in the directory
`/sys/bus/i2c/drivers/nxt-i2c-sensor/`. However, these drivers provide a
[lego-sensor device], which is where all the really useful attributes are.

[supported sensors]: ../#supported-sensors
[lego-sensor device]: ../lego-sensor-class
[supported sensors]: /docs/sensors#supported-sensors
[lego-sensor device]: /docs/drivers/lego-sensor-class

2 changes: 1 addition & 1 deletion docs/drivers/rcx-motor.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ This device is loaded when an [legoev3-output-port] is set to `rcx-motor`
mode. It is not automatically detected.

[dc-motor]: ../dc-motor-class
[legoev3-output-port]: docs/ports/legoev3-output-port
[legoev3-output-port]: /docs/ports/legoev3-output-port

32 changes: 16 additions & 16 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ <h2>Writing some software</h2>
<a href="libraries">available libraries</a> that have been developed to simplify developing
with ev3dev. If you need to directly program against the ev3dev driver APIs, you can read our
info pages on the following topics:

<ul>
<li>
<a href="ports">Input and output ports</a>
</li>
<li>
<a href="sensors">Supported Sensors and Other Input Devices</a>
</li>
<li>
<a href="motors">Supported Motors and Other Output Devices</a>
</li>
<li>
<a href="drivers">ev3dev kernel drivers</a>
</li>
</ul>
</p>

<ul>
<li>
<a href="ports">Input and output ports</a>
</li>
<li>
<a href="sensors">Supported Sensors and Other Input Devices</a>
</li>
<li>
<a href="motors">Supported Motors and Other Output Devices</a>
</li>
<li>
<a href="drivers">ev3dev kernel drivers</a>
</li>
</ul>

<h2>Developing the ev3dev kernel</h2>
<p>
In an effort to make it as easy as possible for community members to help out with core software
development, we have assembled a <a href="kernel-hackers-notebook">kernel hacker's notebook</a>
that contains information about the EV3 hardware, important devices, and the operating system itself.
If you are interested in working with the ev3dev source code, you'll also need to know how to
use our set of <a href="devtools">ev3dev Developer Tools</a>.
</p>
</p>
4 changes: 2 additions & 2 deletions docs/kernel-hackers-notebook/ev3-adc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ subtitle: Analog to Digital Converter
---

The EV3 uses a Texas Instruments ADS7957 chip. It is connected to the CPU via an
[SPI](ev3-spi).
[SPI](../ev3-spi).

## Essentials

Expand Down Expand Up @@ -102,7 +102,7 @@ The EV3 uses a Texas Instruments ADS7957 chip. It is connected to the CPU via an
</tr>
<tr>
<td>15</td>
<td>N/C<td>
<td>N/C</td>
<td>Was motor current on pre-release hardware</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion docs/kernel-hackers-notebook/ev3-buttons.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ The 6 buttons on the EV3 are connected to GPIOs.

## Device Driver

We are using the existing [gpio-keys](https://github.com/ev3dev/ev3dev-kernel/blob/master/drivers/input/keyboard/gpio_keys.c) driver. This causes the buttons to function as regular keyboard keys. Key mapping is defined in [board-legoev3.c](https://github.com/ev3dev/ev3dev-kernel/blob/master/arch/arm/mach-davinci/board-legoev3.c).
We are using the existing [gpio-keys](https://github.com/ev3dev/ev3dev-kernel/blob/ev3dev-jessie/drivers/input/keyboard/gpio_keys.c) driver. This causes the buttons to function as regular keyboard keys. Key mapping is defined in [board-legoev3.c](https://github.com/ev3dev/ev3dev-kernel/blob/ev3dev-jessie/arch/arm/mach-davinci/board-legoev3.c).
2 changes: 1 addition & 1 deletion docs/kernel-hackers-notebook/ev3-fiq.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You read the required reading, right? So you understand that the Linux kernel ha

To debug the code in the FIQ service routines, we need to change them to regular interrupts. On the AM1808 processor, interrupt channels 0 an 1 are reserved for the FIQs. The rest of the channels are for regular interrupts.

The first step is to change the channels the interrupts are assigned to. This is done in [arch/arm/mach-davinci/da850.c](https://github.com/ev3dev/ev3dev-kernel/blob/master/arch/arm/mach-davinci/da850.c). Search for `FIQ` to find the relevant interrupts and change the priority to 2 or higher.
The first step is to change the channels the interrupts are assigned to. This is done in [arch/arm/mach-davinci/da850.c](https://github.com/ev3dev/ev3dev-kernel/blob/ev3dev-jessie/arch/arm/mach-davinci/da850.c). Search for `FIQ` to find the relevant interrupts and change the priority to 2 or higher.

Now, when you recompile the kernel, they will operate as regular interrupts. There is code in place so that the `fiq_c_handler` routine is called back from the appropriate interrupts.

Expand Down
4 changes: 2 additions & 2 deletions docs/kernel-hackers-notebook/ev3-i2c.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ The [AM1808 SoC](../ev3-processor) has 2 hardware [Inter-Integrated Circuit][i2c

## Usage

__I2C0__: [Boot EEPROM](../ev3-eeprom) @400kHz
__I2C0__: [Boot EEPROM](../ev3-eeprom) &#64;400kHz

__I2C1__: Not used/connected

__[FIQ](../ev3-fiq) I2C__: Input ports 1-4 @10kHz
__[FIQ](../ev3-fiq) I2C__: Input ports 1-4 &#64;10kHz

## Device Drivers

Expand Down
3 changes: 1 addition & 2 deletions docs/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ that ensures that interface is almost identical for each, and they are being upd
enhanced regularly.

* Unified bindings:
* [C++](https://github.com/ev3dev/ev3dev-lang/tree/develop/cpp)
* [Lua](https://github.com/ev3dev/ev3dev-lang/tree/develop/lua)
* [C++](https://github.com/ddemidov/ev3dev-lang-cpp)
* [Node.js](https://github.com/wasabifan/ev3dev-lang-js)
* [Python](https://github.com/rhempel/ev3dev-lang-python)

Expand Down
6 changes: 3 additions & 3 deletions docs/motors/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ a list? See issue [#424](https://github.com/ev3dev/ev3dev/issues/424).
[sensors]: /docs/sensors
[tachometer]: https://en.wikipedia.org/wiki/Tachometer
[incremental rotary encoder]: https://en.wikipedia.org/wiki/Rotary_encoder#Incremental_rotary_encoder
[LEGO 8528]: http://www.bricklink.com/catalogItem.asp?S=8528-1
[LEGO 8886]: http://www.bricklink.com/catalogItem.asp?S=8886-1
[LEGO 8871]: http://www.bricklink.com/catalogItem.asp?S=8871-1
[LEGO 8528]: http://shop.lego.com/en-US/Converter-Cables-for-LEGO-MINDSTORMS-NXT-8528
[LEGO 8886]: http://shop.lego.com/en-US/LEGO-Power-Functions-Extension-Wire-8886
[LEGO 8871]: http://shop.lego.com/en-US/LEGO-Power-Functions-Extension-Wire-20-8871
[EV3 Output Port Driver]: /docs/ports/legoev3-output-port
4 changes: 2 additions & 2 deletions docs/tutorials/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="row">
{% for group in tutorials %}
{% if group.name != "" %}
<div class="col-lg-6" />
<div class="col-lg-6">
<div class="panel panel-default rounded-panel">
<div class="panel-heading">{{ group.name }}</div>
<div class="panel-body">
Expand All @@ -27,4 +27,4 @@
</div>
{% endif %}
{% endfor %}
</div>
</div>
2 changes: 1 addition & 1 deletion javascripts/cards.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(document).ready(function () {
$(document).ready(function () {
$('div[data-card-user]').each(function (i, element) {
var $cardDiv = $(element);
$.ajax('https://api.github.com/users/' + $cardDiv.data('card-user')).done(function (userData) {
Expand Down
2 changes: 1 addition & 1 deletion javascripts/style-helpers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(document).ready(function () {
$(document).ready(function () {
// Make <dl>s more visually separated
$('dl').addClass('dl-horizontal');
$('#markdown-toc').wrap('<div class="well pull-right" />');
Expand Down
26 changes: 13 additions & 13 deletions projects/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@

<div class="row">
{% for post in site.posts %}
{% if post.categories contains "projects" %}
{% unless post.id == '/projects/2014/03/21/Example-Project' %}
{% assign num_words = 60 %}
<div class="col-sm-6 col-md-4">
{% if post.categories contains "projects" %}
{% unless post.id == '/projects/2014/03/21/Example-Project' %}
{% assign num_words = 60 %}
<div class="col-sm-6 col-md-4">
<div class="thumbnail">
{% if post.youtube_video_id %}
{% assign num_words = 35 %}
<a href="{{ post.url }}">
<img src="http://img.youtube.com/vi/{{post.youtube_video_id}}/mqdefault.jpg" />
</a>
{% assign num_words = 35 %}
<a href="{{ post.url }}">
<img src="http://img.youtube.com/vi/{{post.youtube_video_id}}/mqdefault.jpg" alt="project thumbnail image" />
</a>
{% endif %}
<div class="caption">
<h3>{{ post.title }}</h3>
<p>{{ post.excerpt | truncatewords: num_words }}</p>
<p><a class="btn btn-primary" href="{{ post.url }}">Learn more</a></p>
<p>{{ post.excerpt | strip_html | truncatewords: num_words }}</p>
<p><a class="btn btn-primary" href="{{ post.url }}">Learn more</a></p>
</div>
</div>
</div>
{% endunless %}
{% endif %}
</div>
{% endunless %}
{% endif %}
{% endfor %}
</div>
Loading