Skip to content

Commit 89b9872

Browse files
committed
fix: use OZWManagerAssign to handle exceptions
1 parent 3e0ce8a commit 89b9872

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

src/utils.cc

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ void populateNode(
316316
void populateValueId(v8::Local<v8::Object> &nodeobj, OpenZWave::ValueID value)
317317
{
318318
Nan::EscapableHandleScope handle_scope;
319-
OpenZWave::Manager *mgr = OpenZWave::Manager::Get();
320319
::std::string buffer = getValueIdDescriptor(value);
321320
/*
322321
* Common value types.
@@ -340,14 +339,28 @@ void populateValueId(v8::Local<v8::Object> &nodeobj, OpenZWave::ValueID value)
340339
#endif
341340
AddIntegerProp(nodeobj, instance, value.GetInstance());
342341
AddIntegerProp(nodeobj, index, value.GetIndex());
343-
AddStringProp(nodeobj, label, mgr->GetValueLabel(value).c_str());
344-
AddStringProp(nodeobj, units, mgr->GetValueUnits(value).c_str());
345-
AddStringProp(nodeobj, help, mgr->GetValueHelp(value).c_str());
346-
AddBooleanProp(nodeobj, read_only, mgr->IsValueReadOnly(value));
347-
AddBooleanProp(nodeobj, write_only, mgr->IsValueWriteOnly(value));
348-
AddIntegerProp(nodeobj, min, mgr->GetValueMin(value));
349-
AddIntegerProp(nodeobj, max, mgr->GetValueMax(value));
350-
AddBooleanProp(nodeobj, is_polled, mgr->IsValuePolled(value));
342+
343+
::std::string help, label, units;
344+
bool read_only, write_only, is_polled;
345+
int32 min, max
346+
347+
OZWManagerAssign(label, GetValueLabel, value);
348+
OZWManagerAssign(units, GetValueUnits, value);
349+
OZWManagerAssign(help, GetValueHelp, value);
350+
OZWManagerAssign(read_only, IsValueReadOnly, value);
351+
OZWManagerAssign(write_only, IsValueWriteOnly, value);
352+
OZWManagerAssign(min, GetValueMin, value);
353+
OZWManagerAssign(max, GetValueMax, value);
354+
OZWManagerAssign(is_polled, IsValuePolled, value);
355+
356+
AddStringProp(nodeobj, label, label);
357+
AddStringProp(nodeobj, units, units);
358+
AddStringProp(nodeobj, help, help);
359+
AddBooleanProp(nodeobj, read_only, read_only);
360+
AddBooleanProp(nodeobj, write_only, write_only);
361+
AddIntegerProp(nodeobj, min, min);
362+
AddIntegerProp(nodeobj, max, max);
363+
AddBooleanProp(nodeobj, is_polled, is_polled);
351364
}
352365

353366
// create a V8 object from a OpenZWave::ValueID

0 commit comments

Comments
 (0)