remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-07-13 16:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for too many arguments to a function call on some devices

Browse Source
This commit is contained in:
Philip Abbey
2025-07-11 01:06:15 +01:00
parent 906cdf7371
commit ee9da24592
4 changed files with 111 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/HomeAssistantMenuItemFactory.mc
View File

@ -70,6 +70,7 @@ class HomeAssistantMenuItemFactory {
//! @param label Menu item label. //! @param label Menu item label.
//! @param entity_id Home Assistant Entity ID (optional) //! @param entity_id Home Assistant Entity ID (optional)
//! @param template Template for Home Assistant to render (optional) //! @param template Template for Home Assistant to render (optional)
//! @param options A list of Boolean options
//! @param exit Should the service call complete and then exit? //! @param exit Should the service call complete and then exit?
//! @param confirm Should this menu item selection be confirmed? //! @param confirm Should this menu item selection be confirmed?
//! @param pin Should this menu item selection request the security PIN? //! @param pin Should this menu item selection request the security PIN?
@ -78,18 +79,21 @@ class HomeAssistantMenuItemFactory {
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
entity_id as Lang.String or Null, entity_id as Lang.String or Null,
template as Lang.String or Null, template as Lang.String or Null,
exit as Lang.Boolean, options as {
confirm as Lang.Boolean, :exit as Lang.Boolean,
pin as Lang.Boolean :confirm as Lang.Boolean,
:pin as Lang.Boolean
}
) as WatchUi.MenuItem { ) as WatchUi.MenuItem {
var keys = mMenuItemOptions.keys();
for (var i = 0; i < keys.size(); i++) {
options.put(keys[i], mMenuItemOptions.get(keys[i]));
}
return new HomeAssistantToggleMenuItem( return new HomeAssistantToggleMenuItem(
label, label,
template, template,
{ "entity_id" => entity_id }, { "entity_id" => entity_id },
exit, options
confirm,
pin,
mMenuItemOptions
); );
} }
@ -100,9 +104,7 @@ class HomeAssistantMenuItemFactory {
//! @param template Template for Home Assistant to render (optional) //! @param template Template for Home Assistant to render (optional)
//! @param service Template for Home Assistant to render (optional) //! @param service Template for Home Assistant to render (optional)
//! @param data Sourced from the menu JSON, this is the `data` field from the `tap_action` field. //! @param data Sourced from the menu JSON, this is the `data` field from the `tap_action` field.
//! @param exit Should the service call complete and then exit? //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
//! @param confirm Should this menu item selection be confirmed?
//! @param pin Should this menu item selection request the security PIN?
// //
function tap( function tap(
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
@ -110,9 +112,11 @@ class HomeAssistantMenuItemFactory {
template as Lang.String or Null, template as Lang.String or Null,
service as Lang.String or Null, service as Lang.String or Null,
data as Lang.Dictionary or Null, data as Lang.Dictionary or Null,
exit as Lang.Boolean, options as {
confirm as Lang.Boolean, :exit as Lang.Boolean,
pin as Lang.Boolean :confirm as Lang.Boolean,
:pin as Lang.Boolean
}
) as WatchUi.MenuItem { ) as WatchUi.MenuItem {
if (entity_id != null) { if (entity_id != null) {
if (data == null) { if (data == null) {
@ -121,30 +125,28 @@ class HomeAssistantMenuItemFactory {
data.put("entity_id", entity_id); data.put("entity_id", entity_id);
} }
} }
var keys = mMenuItemOptions.keys();
for (var i = 0; i < keys.size(); i++) {
options.put(keys[i], mMenuItemOptions.get(keys[i]));
}
if (service != null) { if (service != null) {
options.put(:icon, mTapTypeIcon);
return new HomeAssistantTapMenuItem( return new HomeAssistantTapMenuItem(
label, label,
template, template,
service, service,
data, data,
exit, options,
confirm,
pin,
mTapTypeIcon,
mMenuItemOptions,
mHomeAssistantService mHomeAssistantService
); );
} else { } else {
options.put(:icon, mInfoTypeIcon);
return new HomeAssistantTapMenuItem( return new HomeAssistantTapMenuItem(
label, label,
template, template,
service, null,
data, data,
exit, options,
confirm,
pin,
mInfoTypeIcon,
mMenuItemOptions,
mHomeAssistantService mHomeAssistantService
); );
} }

34
source/HomeAssistantTapMenuItem.mc
View File

@ -21,7 +21,7 @@ using Toybox.Graphics;
// //
class HomeAssistantTapMenuItem extends HomeAssistantMenuItem { class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
private var mHomeAssistantService as HomeAssistantService; private var mHomeAssistantService as HomeAssistantService;
private var mService as Lang.String or Null; private var mService as Lang.String or Null;
private var mConfirm as Lang.Boolean; private var mConfirm as Lang.Boolean;
private var mExit as Lang.Boolean; private var mExit as Lang.Boolean;
private var mPin as Lang.Boolean; private var mPin as Lang.Boolean;
@ -37,43 +37,39 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
//! @param confirm Should the service call be confirmed to avoid accidental invocation? //! @param confirm Should the service call be confirmed to avoid accidental invocation?
//! @param pin Should the service call be protected with a PIN for some low level of security? //! @param pin Should the service call be protected with a PIN for some low level of security?
//! @param icon Icon to use for the menu item. //! @param icon Icon to use for the menu item.
//! @param options Menu item options to be passed on. //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
//! @param haService Shared Home Assistant service object that will perform the required call. Only //! @param haService Shared Home Assistant service object that will perform the required call. Only
//! one of these objects is created for all menu items to re-use. //! one of these objects is created for all menu items to re-use.
// //
function initialize( function initialize(
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
template as Lang.String, template as Lang.String,
service as Lang.String or Null, service as Lang.String or Null,
data as Lang.Dictionary or Null, data as Lang.Dictionary or Null,
exit as Lang.Boolean,
confirm as Lang.Boolean,
pin as Lang.Boolean,
icon as Graphics.BitmapType or WatchUi.Drawable,
options as { options as {
:alignment as WatchUi.MenuItem.Alignment, :alignment as WatchUi.MenuItem.Alignment,
:icon as Graphics.BitmapType or WatchUi.Drawable or Lang.Symbol :icon as Graphics.BitmapType or WatchUi.Drawable or Lang.Symbol,
:exit as Lang.Boolean,
:confirm as Lang.Boolean,
:pin as Lang.Boolean
} or Null, } or Null,
haService as HomeAssistantService haService as HomeAssistantService
) { ) {
if (options != null) {
options.put(:icon, icon);
} else {
options = { :icon => icon };
}
HomeAssistantMenuItem.initialize( HomeAssistantMenuItem.initialize(
label, label,
template, template,
options {
:alignment => options.get(:alignment),
:icon => options.get(:icon)
}
); );
mHomeAssistantService = haService; mHomeAssistantService = haService;
mService = service; mService = service;
mData = data; mData = data;
mExit = exit; mExit = options.get(:exit);
mConfirm = confirm; mConfirm = options.get(:confirm);
mPin = pin; mPin = options.get(:acospin);
} }
//! Call a Home Assistant service only after checks have been done for confirmation or PIN entry. //! Call a Home Assistant service only after checks have been done for confirmation or PIN entry.

24
source/HomeAssistantToggleMenuItem.mc
View File

@ -34,21 +34,18 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
//! @param label Menu item label. //! @param label Menu item label.
//! @param template Menu item template. //! @param template Menu item template.
//! @param data Data to supply to the service call. //! @param data Data to supply to the service call.
//! @param exit Should the service call complete and then exit? //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
//! @param confirm Should the service call be confirmed to avoid accidental invocation?
//! @param pin Should the service call be protected with a PIN for some low level of security?
//! @param options Menu item options to be passed on.
// //
function initialize( function initialize(
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
template as Lang.String, template as Lang.String,
data as Lang.Dictionary or Null, data as Lang.Dictionary or Null,
exit as Lang.Boolean,
confirm as Lang.Boolean,
pin as Lang.Boolean,
options as { options as {
:alignment as WatchUi.MenuItem.Alignment, :alignment as WatchUi.MenuItem.Alignment,
:icon as Graphics.BitmapType or WatchUi.Drawable or Lang.Symbol :icon as Graphics.BitmapType or WatchUi.Drawable or Lang.Symbol,
:exit as Lang.Boolean,
:confirm as Lang.Boolean,
:pin as Lang.Boolean
} or Null } or Null
) { ) {
WatchUi.ToggleMenuItem.initialize( WatchUi.ToggleMenuItem.initialize(
@ -56,16 +53,19 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
null, null,
null, null,
false, false,
options {
:alignment => options.get(:alignment),
:icon => options.get(:icon)
}
); );
if (Attention has :vibrate) { if (Attention has :vibrate) {
mHasVibrate = true; mHasVibrate = true;
} }
mData = data; mData = data;
mTemplate = template; mTemplate = template;
mExit = exit; mExit = options.get(:exit);
mConfirm = confirm; mConfirm = options.get(:confirm);
mPin = pin; mPin = options.get(:pin);
} }
//! Set the state of a toggle menu item. //! Set the state of a toggle menu item.

63
source/HomeAssistantView.mc
View File

@ -71,22 +71,75 @@ class HomeAssistantView extends WatchUi.Menu2 {
} }
if (type != null && name != null && enabled) { if (type != null && name != null && enabled) {
if (type.equals("toggle") && entity != null) { if (type.equals("toggle") && entity != null) {
addItem(HomeAssistantMenuItemFactory.create().toggle(name, entity, content, exit, confirm, pin)); addItem(HomeAssistantMenuItemFactory.create().toggle(
name,
entity,
content,
{
:exit => exit,
:confirm => confirm,
:pin => pin
}
));
} else if (type.equals("tap") && service != null) { } else if (type.equals("tap") && service != null) {
addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, content, service, data, exit, confirm, pin)); addItem(HomeAssistantMenuItemFactory.create().tap(
name,
entity,
content,
service,
data,
{
:exit => exit,
:confirm => confirm,
:pin => pin
}
));
} else if (type.equals("template") && content != null) { } else if (type.equals("template") && content != null) {
// NB. "template" is deprecated in the schema and remains only for backward compatibility. All menu items can now use templates, so the replacement is "info". // NB. "template" is deprecated in the schema and remains only for backward compatibility. All menu items can now use templates, so the replacement is "info".
// The exit option is dependent on the type of template. // The exit option is dependent on the type of template.
if (tap_action == null) { if (tap_action == null) {
// No exit from an information only item // No exit from an information only item
addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, content, service, data, false, confirm, pin)); addItem(HomeAssistantMenuItemFactory.create().tap(
name,
entity,
content,
service,
data,
{
:exit => false,
:confirm => confirm,
:pin => pin
}
));
} else { } else {
// You may exit from template item with a 'tap_action'. // You may exit from template item with a 'tap_action'.
addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, content, service, data, exit, confirm, pin)); addItem(HomeAssistantMenuItemFactory.create().tap(
name,
entity,
content,
service,
data,
{
:exit => exit,
:confirm => confirm,
:pin => pin
}
));
} }
} else if (type.equals("info") && content != null) { } else if (type.equals("info") && content != null) {
// Cannot exit from a non-actionable information only menu item. // Cannot exit from a non-actionable information only menu item.
addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, content, service, data, false, confirm, pin)); addItem(HomeAssistantMenuItemFactory.create().tap(
name,
entity,
content,
service,
data,
{
:exit => false,
:confirm => confirm,
:pin => pin
}
));
} else if (type.equals("group")) { } else if (type.equals("group")) {
addItem(HomeAssistantMenuItemFactory.create().group(items[i], content)); addItem(HomeAssistantMenuItemFactory.create().group(items[i], content));
} }