Skip to content

Commit 0d6b2ef

Browse files
authored
Merge pull request #139 from Qrome/2.16
Qrome - updated to read news sources from GitHub master repo
2 parents 2e4c243 + 8f46fb5 commit 0d6b2ef

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Double Wide LED version: https://www.thingiverse.com/thing:2989552
3939

4040
## Upgrading from version 2.5 or Higher
4141
Version 2.5 introduced the ability to upgrade pre-compiled firmware from a binary file. In version 2.6 and on you should find binary files that can be uploaded to your marque scrolling clock via the web interface. From the main menu in the web interface select "Firmware Update" and follow the prompts.
42-
* **marquee.ino.d1_mini_2.10.bin** - compiled for Wemos D1 Mini and standard 4x1 LED (default)
43-
* **marquee.ino.d1_mini_wide_2.10.bin** - compiled for Wemos D1 Mini and double wide 8x1 LED display
42+
* **marquee.ino.d1_mini_2.16.bin** - compiled for Wemos D1 Mini and standard 4x1 LED (default)
43+
* **marquee.ino.d1_mini_wide_2.16.bin** - compiled for Wemos D1 Mini and double wide 8x1 LED display
4444

4545
## Compiling and Loading to Wemos D1
4646
It is recommended to use Arduino IDE. You will need to configure Arduino IDE to work with the Wemos board and USB port and installed the required USB drivers etc.

marquee.ino.d1_mini_2.16.bin

452 KB
Binary file not shown.

marquee.ino.d1_mini_wide_2.16.bin

453 KB
Binary file not shown.

marquee/marquee.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "Settings.h"
2929

30-
#define VERSION "2.15"
30+
#define VERSION "2.16"
3131

3232
#define HOSTNAME "CLOCK-"
3333
#define CONFIG "/conf.txt"
@@ -181,7 +181,7 @@ static const char NEWS_FORM1[] PROGMEM = "<form class='w3-container' action='/
181181
"<label>News API Key (get from <a href='https://newsapi.org/' target='_BLANK'>here</a>)</label>"
182182
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='newsApiKey' value='%NEWSKEY%' maxlength='60'>"
183183
"<p>Select News Source <select class='w3-option w3-padding' name='newssource' id='newssource'></select></p>"
184-
"<script>var s='%NEWSSOURCE%';var tt;var xmlhttp=new XMLHttpRequest();xmlhttp.open('GET','https://newsapi.org/v2/sources?apiKey=%NEWSKEY%',!0);"
184+
"<script>var s='%NEWSSOURCE%';var tt;var xmlhttp=new XMLHttpRequest();xmlhttp.open('GET','https://raw.githubusercontent.com/Qrome/marquee-scroller/master/sources.json',!0);"
185185
"xmlhttp.onreadystatechange=function(){if(xmlhttp.readyState==4){if(xmlhttp.status==200){var obj=JSON.parse(xmlhttp.responseText);"
186186
"obj.sources.forEach(t)}}};xmlhttp.send();function t(it){if(it!=null){if(s==it.id){se=' selected'}else{se=''}tt+='<option'+se+'>'+it.id+'</option>';"
187187
"document.getElementById('newssource').innerHTML=tt}}</script>"

0 commit comments

Comments
 (0)