|
@@ -20,7 +20,7 @@ void ValveModule::initialize()
|
|
|
int paramsCount = op->params.length;
|
|
|
for (int paramId = 0; paramId < paramsCount; paramId++) {
|
|
|
const char* valveName = SC->getBaseName(op->params.get(paramId), ',');
|
|
|
- IoValve* valveDevice = (IoValve *)DEVICE->getDevice(valveName);
|
|
|
+ IoValve* valveDevice = (IoValve *)DEVICE->getDevice(MODULE_NAME,valveName);
|
|
|
if (valveDevice != NULL) {
|
|
|
//ÊÇvalveÉ豸
|
|
|
char* ptr = strchr(op->params.get(paramId), ',');
|
|
@@ -38,7 +38,7 @@ void ValveModule::initialize()
|
|
|
else {
|
|
|
char triggerName[64];
|
|
|
sprintf(triggerName, "Trig%ssw", valveName);
|
|
|
- IoTrigger* triggerDevice = (IoTrigger*)DEVICE->getDevice(triggerName);
|
|
|
+ IoTrigger* triggerDevice = (IoTrigger*)DEVICE->getDevice(MODULE_NAME,triggerName);
|
|
|
if (triggerDevice != NULL) {
|
|
|
//ÊÇsensorÉ豸
|
|
|
char* ptr = strchr(op->params.get(paramId), ',');
|