Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions config/buttons.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"pins": {
"buttonUp": 11,
"buttonDown": 13
"gpios": {
"buttonUp": 17,
"buttonDown": 27
},
"options": {
"pressed": 200,
"clicked": 400
"socketPath": "/var/run/pi-buttons.sock",
"reconnectTimeout": 3000
}
}
29 changes: 15 additions & 14 deletions lib/hid-menu/hid-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,70 +8,71 @@
const Menube = require('menube');

function createHIDMenu(configButtons, configMenus) {
if (!configButtons.pins || !configButtons.pins.buttonUp || !configButtons.pins.buttonDown) {
if (!configButtons.gpios || !configButtons.gpios.buttonUp || !configButtons.gpios.buttonDown) {
throw new Error('Incomplete pins definition in configuration.');
}
var pins = configButtons.pins;
var gpios = configButtons.gpios;
var buttonOptions = configButtons.options || {};
var onChange = configMenus.onChange;
var menu = Menube(configMenus.menuFile, configMenus.menuSettings);
var displayDirty = false;
// var buttons = require('rpi-gpio-buttons')([pins.buttonUp, pins.buttonDown], buttonOptions);
var piButtons = require('../pi-buttons');
var piButtons = require('node-pi-buttons')(configButtons.options);

menu.on('menu_changed', function () {
displayDirty = false; // the parent will redraw the display
});

// buttons
piButtons
.on('clicked', function (pin) {
.on('clicked', function (gpio, data) {
if (displayDirty) {
// fake menu changed to force redraw
menu.emit('menu_changed');
displayDirty = false;
}
else {
switch(pin) {
case pins.buttonUp:
switch(parseInt(gpio, 10)) {
case gpios.buttonUp:
if (!displayDirty) {
menu.menuUp();
}
break;

case pins.buttonDown:
case gpios.buttonDown:
if (!displayDirty) {
menu.menuDown();
}
break;
}
}
})
.on('double_clicked', function (pin) {
.on('double_clicked', function (gpio, data) {
if (displayDirty) {
// fake menu changed to force redraw
menu.emit('menu_changed');
displayDirty = false;
}
else {
switch (pin) {
case pins.buttonUp:
switch (parseInt(gpio, 10)) {
case gpios.buttonUp:
menu.menuBack();
break;

case pins.buttonDown:
case gpios.buttonDown:
displayDirty = true; // activate may write something to the display
menu.activateSelect();
break;
}
}
})
.on('released', function (pin) {
.on('released', function (gpio, data) {
if (displayDirty) {
// fake menu changed to force redraw
menu.emit('menu_changed');
displayDirty = false;
}
})
.on('error', function (data) {
console.log('ERROR: ', data.error);
});

return menu;
Expand Down
Binary file removed lib/pi-buttons/a.out
Binary file not shown.
5 changes: 0 additions & 5 deletions lib/pi-buttons/build.sh

This file was deleted.

Loading