Skip to content

Generic fixes #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtebbens merged 1 commit into from
Jan 31, 2026
Merged

Generic fixes #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions drivers/energylink/driver.compose.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"large": "drivers/energylink/assets/images/large.jpg",
"small": "drivers/energylink/assets/images/small.jpg"
},
"platforms": [
"local"
],
"class": "sensor",
"capabilities": [
"measure_power",
Expand Down
17 changes: 4 additions & 13 deletions drivers/energylink/pair/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
});

Homey.on('error', function(message){
$('#error').html('Error: '+message);
$('#error').html(Homey.__("settings.error")+message);
$('#save').prop('disabled', false);
});
}
Expand All @@ -56,15 +56,6 @@
width: 150px;
display:inline-block !important;
}
input {
border: 1px solid #ccc;
padding: 3px;
}
button {
padding: 10px;
background-color: #ddd;
border: 1px solid #ccc;
}
#error {
color: red;
}
Expand All @@ -73,12 +64,12 @@
<body>
<p data-i18n="settings.energylink_intro"></p>
<div class="field row">
<select id="homewizard_select">
<option>Select HomeWizard</option>
<select class="homey-form-select" id="homewizard_select">
<option data-i18n="settings.select"></option>
</select>
</div>
<br>
<p id="error"></p>
<button class="right" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
<button class="homey-button-primary-full" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
</body>
</html>
3 changes: 3 additions & 0 deletions drivers/heatlink/driver.compose.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"large": "drivers/heatlink/assets/images/large.jpg",
"small": "drivers/heatlink/assets/images/small.jpg"
},
"platforms": [
"local"
],
"class": "thermostat",
"capabilities": [
"measure_temperature",
Expand Down
19 changes: 0 additions & 19 deletions drivers/heatlink/driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,6 @@ class HomeWizardHeatlink extends Homey.Driver {
}

async onPair(socket) {

// Show a specific view by ID
await socket.showView('start');

// Show the next view
await socket.nextView();

// Show the previous view
await socket.prevView();

// Close the pair session
await socket.done();

// Received when a view has changed
await socket.setHandler('showView', (viewId) => {
this.log(`View: ${viewId}`);
// this.log("data", viewId);
});

// socket.on('get_homewizards', function () {
await socket.setHandler('get_homewizards', () => {

Expand Down
23 changes: 5 additions & 18 deletions drivers/heatlink/pair/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

hw_device_list = hw_devices;
$('#homewizard_select').find('option').remove();
$('#homewizard_select').append('<option>Select HomeWizard</option>');
$('#homewizard_select').append('<option>' + Homey.__("settings.select") + '</option>');
$.each(hw_devices, function( index, value ) {
$('#homewizard_select').append($("<option>").attr('value',index).text(value.settings.homewizard_ip));
});
Expand Down Expand Up @@ -51,7 +51,7 @@
});

Homey.on('error', function(message){
$('#error').html('Error: '+message);
$('#error').html(Homey.__("settings.error")+message);
$('#save').prop('disabled', false);
});
}
Expand All @@ -60,19 +60,6 @@
<html>
<head>
<style>
label {
width: 150px;
display:inline-block !important;
}
input {
border: 1px solid #ccc;
padding: 3px;
}
button {
padding: 10px;
background-color: #ddd;
border: 1px solid #ccc;
}
#error {
color: red;
}
Expand All @@ -81,12 +68,12 @@
<body>
<p data-i18n="settings.heatlink_intro"></p>
<div class="field row">
<select id="homewizard_select">
<option>Select HomeWizard</option>
<select class="homey-form-select" id="homewizard_select">
<option data-i18n="settings.select"></option>
</select>
</div>
<br>
<p id="error"></p>
<button class="right" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
<button class="homey-button-primary-full" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
</body>
</html>
23 changes: 10 additions & 13 deletions drivers/homewizard/pair/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
} else {
var homewizard_ledring = false;
}
if (!$('#homewizard_ip').val()) {
$('#error').html(Homey.__("settings.no_ip"));
$('#save').prop('disabled', false);
return;
}
Homey.emit('manual_add', {
data: { id: 'HW'+Math.floor(Date.now() / 1000) },
settings: {
Expand Down Expand Up @@ -66,14 +71,6 @@
box-sizing: border-box;
}

button {
font-size: 18px;
padding: 12px 20px;
background-color: #ddd;
border: 1px solid #ccc;
cursor: pointer;
}

label {
font-size: 16px;
margin-bottom: 5px;
Expand All @@ -93,12 +90,12 @@
<body>
<p data-i18n="settings.intro"></p>
<div class="field row">
<label for="homewizard_ip">HomeWizard's IP</label>
<input id="homewizard_ip" type="text" value="" />
<label for="homewizard_ip" class="homey-form-label">HomeWizard's IP</label>
<input id="homewizard_ip" class="homey-form-input" type="text" value="" />
</div>
<div class="field row">
<label for="homewizard_pass" data-i18n="settings.password"></label>
<input id="homewizard_pass" type="password" value="" />
<label for="homewizard_pass" class="homey-form-label" data-i18n="settings.password"></label>
<input id="homewizard_pass" class="homey-form-input" type="password" value="" />
</div>
<br>
<div class="field row">
Expand All @@ -107,6 +104,6 @@
</div>
<br>
<p id="error"></p>
<button class="right" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
<button class="homey-button-primary-full" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
</body>
</html>
3 changes: 3 additions & 0 deletions drivers/kakusensors/driver.compose.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"large": "drivers/kakusensors/assets/images/large.jpg",
"small": "drivers/kakusensors/assets/images/small.jpg"
},
"platforms": [
"local"
],
"class": "sensor",
"capabilities": [],
"pair": [
Expand Down
4 changes: 2 additions & 2 deletions drivers/kakusensors/driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class HomeWizardKakusensors extends Homey.Driver {
const sensorId = device.settings.kakusensors_id;

if (!hwId || !sensorId) {
socket.emit('error', 'Invalid selection');
socket.emit('error', this.homey.__("settings.selection_error"));
return;
}

Expand All @@ -54,7 +54,7 @@ class HomeWizardKakusensors extends Homey.Driver {
const selected = sensors[sensorId];

if (!selected) {
socket.emit('error', 'Sensor not found');
socket.emit('error', this.homey.__("settings.notfound_error"));
return;
}

Expand Down
31 changes: 11 additions & 20 deletions drivers/kakusensors/pair/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

hw_device_list = hw_devices;
$('#homewizard_select').find('option').remove();
$('#homewizard_select').append('<option>Select HomeWizard</option>');
$('#homewizard_select').append('<option>' + Homey.__("settings.select") + '</option>');
$.each(hw_devices, function( index, value ) {
$('#homewizard_select').append($("<option>").attr('value',index).text(value.settings.homewizard_ip));
});
Expand All @@ -17,14 +17,14 @@

$('#homewizard_select').on('change', function() {
$('#sensor_select').find('option').remove();
$('#sensor_select').append('<option>Select Sensor</option>');
$('#sensor_select').append('<option>' + Homey.__("settings.select_sensor") + '</option>');
$.each(JSON.parse(hw_device_list[$('#homewizard_select').val()].kakusensors), function( index, value ) {
$('#sensor_select').append($("<option>").attr('value',value.id).text(value.name));
});
});
});

function saveSettings () {
function saveSettings() {
$('#error').html('');
$('#save').prop('disabled', true);
console.log('MA');
Expand Down Expand Up @@ -54,13 +54,13 @@
},
name: device.name
}, function( err, result ){
if( err ) return console.error(err);
if(err) return console.error(err);
Homey.done();
});
});

Homey.on('error', function(message){
$('#error').html('Error: '+message);
Homey.on('error', function(message) {
$('#error').html(Homey.__("settings.error") + message);
$('#save').prop('disabled', false);
});
}
Expand All @@ -73,15 +73,6 @@
width: 150px;
display:inline-block !important;
}
input {
border: 1px solid #ccc;
padding: 3px;
}
button {
padding: 10px;
background-color: #ddd;
border: 1px solid #ccc;
}
#error {
color: red;
}
Expand All @@ -90,16 +81,16 @@
<body>
<p data-i18n="settings.sensor_intro"></p>
<div class="field row">
<select id="homewizard_select">
<option>Select HomeWizard</option>
<select class="homey-form-select" id="homewizard_select">
<option data-i18n="settings.select"></option>
</select>
<br>
<select id="sensor_select">
<option>Select Sensor</option>
<select class="homey-form-select" id="sensor_select">
<option data-i18n="settings.select_sensor"></option>
</select>
</div>
<br>
<p id="error"></p>
<button class="right" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
<button class="homey-button-primary-full" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
</body>
</html>
3 changes: 3 additions & 0 deletions drivers/rainmeter/driver.compose.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"large": "drivers/rainmeter/assets/images/large.jpg",
"small": "drivers/rainmeter/assets/images/small.jpg"
},
"platforms": [
"local"
],
"class": "sensor",
"capabilities": [
"measure_rain.last3h",
Expand Down
19 changes: 0 additions & 19 deletions drivers/rainmeter/driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@ class HomeWizardRainmeter extends Homey.Driver {
}

async onPair(socket) {

// Show a specific view by ID
await socket.showView('start');

// Show the next view
await socket.nextView();

// Show the previous view
await socket.prevView();

// Close the pair session
await socket.done();

// Received when a view has changed
socket.setHandler('showView', (viewId) => {
this.log(`View: ${viewId}`);
// this.log("data", viewId);
});

// socket.on('get_homewizards', function () {
socket.setHandler('get_homewizards', () => {

Expand Down
23 changes: 5 additions & 18 deletions drivers/rainmeter/pair/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Homey.on('hw_devices', function(hw_devices){
hw_device_list = hw_devices;
$('#homewizard_select').find('option').remove();
$('#homewizard_select').append('<option>Select HomeWizard</option>');
$('#homewizard_select').append('<option>' + Homey.__("settings.select") + '</option>');
$.each(hw_devices, function( index, value ) {
$('#homewizard_select').append($("<option>").attr('value',index).text(value.settings.homewizard_ip));
});
Expand Down Expand Up @@ -46,7 +46,7 @@
});

Homey.on('error', function(message){
$('#error').html('Error: '+message);
$('#error').html(Homey.__("settings.error")+message);
$('#save').prop('disabled', false);
});
}
Expand All @@ -55,19 +55,6 @@
<html>
<head>
<style>
label {
width: 150px;
display:inline-block !important;
}
input {
border: 1px solid #ccc;
padding: 3px;
}
button {
padding: 10px;
background-color: #ddd;
border: 1px solid #ccc;
}
#error {
color: red;
}
Expand All @@ -76,12 +63,12 @@
<body>
<p data-i18n="settings.rainmeter_intro"></p>
<div class="field row">
<select id="homewizard_select">
<option>Select HomeWizard</option>
<select class="homey-form-select" id="homewizard_select">
<option data-i18n="settings.select"></option>
</select>
</div>
<br>
<p id="error"></p>
<button class="right" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
<button class="homey-button-primary-full" onclick="saveSettings()" id="save" data-i18n="settings.save"></button>
</body>
</html>
Loading
Loading