Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Commit

Permalink
Fixes!
Browse files Browse the repository at this point in the history
Font was invalid on OLED - fixed
Windows path not resolved correctly - fixed
Extra logging in setup process - fixed
  • Loading branch information
Cyberlane committed Oct 2, 2017
1 parent c5fdd2a commit 330d46e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kidspeak",
"version": "1.4.4",
"version": "1.4.5",
"description": "KidSpeak block programming app",
"main": "src/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/library/Kidspeak/Kidspeak.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Kidspeak::Kidspeak(void)

void Kidspeak::init(void)
{
myOLED.setFont(SmallFont);
myOLED.begin();
myOLED.setFont(SmallFont);
pinMode(2, OUTPUT);
pinMode(3, OUTPUT);
pinMode(5, OUTPUT);
Expand Down
6 changes: 3 additions & 3 deletions src/server/arduino.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ const resolveFirstValid = (paths, resolve, reject) => {
const [currentPath, ...rest] = paths;
fs.access(currentPath, fs.constants.F_OK, (err) => {
if (err === null) {
command = currentPath;
command = `"${currentPath}"`;
log.info(`Arduino found: ${currentPath}`);
resolve(currentPath);
resolve(command);
} else {
resolveFirstValid(rest, resolve, reject);
}
Expand Down Expand Up @@ -50,7 +50,7 @@ const getCommand = () =>
path.join(programFiles, 'Arduino', 'Arduino.exe'),
path.join(programFiles86, 'Arduino', 'Arduino_debug.exe'),
path.join(programFiles86, 'Arduino', 'Arduino.exe'),
].map(p => `"${p}"`);
];
resolveFirstValid(paths, resolve, reject);
return;
}
Expand Down
3 changes: 2 additions & 1 deletion src/server/setup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ const setup = new Promise((resolve, reject) => {
.then(() => resolve())
.catch(reject);
})
.catch(() => {
.catch(e => {
log.error(e);
reject('Could not find library path');
});
});
Expand Down

0 comments on commit 330d46e

Please sign in to comment.