Merge branch 'master' into gh-pages

Conflicts:
	README.md
This commit is contained in:
javl
2016-11-02 15:10:43 +01:00
2 changed files with 8 additions and 10 deletions
+4 -1
View File
@@ -12,4 +12,7 @@ Or you can use the online version at: http://javl.github.io/image2cpp/
You can find a simple Arduino example sketch [over here](https://github.com/javl/image2cpp/blob/master/oled_example/oled_example.ino) in the repository.
### Screen types ###
I wrote the code with my 128x64 pixel monochrome OLED display in mind, but it should work with most similar displays. You might need to change some export settings; those are explained in the tool.
I wrote the code with my 128x64 pixel monochrome OLED display in mind, but it should work with most similar displays. You might need to change some export settings; those are explained in the tool.
### Credit ###
Initial code by [javl](https://github.com/javl), with aditional code by [wiredolphine](https://github.com/wiredolphin). The example sketch was made by Adafruit.
+4 -9
View File
@@ -1,11 +1,3 @@
<!--
"image2cpp"
Original utility by:
https://jaspervanloenen.com
This is a modified version by:
https://wiredolphine.net
-->
<!DOCTYPE html>
<html lang="en">
<head>
@@ -67,6 +59,9 @@
<body>
<div class="wrapper">
<h1>image2cpp</h1>
<p>
<a href="https://github.com/javl/image2cpp" target="_blank">Click here to visit the Github repo for this tool.</a>
</p>
<p>
<table>
<tr>
@@ -433,7 +428,7 @@
// Get the custom arduino output variable name, if any
function getVariableName() {
var vn = document.getElementById('variableName');
var vn = document.getElementById('variableName');
return vn && vn.value.length ? vn.value : variableName;
}