[dss-commits] r8878 - in dss/trunk: core core/sim unix
dss-commits at forum.digitalstrom.org
dss-commits at forum.digitalstrom.org
Fri Oct 30 09:58:40 CET 2009
Author: mtross
Date: 2009-10-30 09:58:40 +0100 (Fri, 30 Oct 2009)
New Revision: 8878
Modified:
dss/trunk/core/ds485const.h
dss/trunk/core/sim/dssim.cpp
dss/trunk/unix/ds485proxy.cpp
Log:
Corrected and added some dSM-API command ids
Modified: dss/trunk/core/ds485const.h
===================================================================
--- dss/trunk/core/ds485const.h 2009-10-30 08:50:35 UTC (rev 8877)
+++ dss/trunk/core/ds485const.h 2009-10-30 08:58:40 UTC (rev 8878)
@@ -95,33 +95,34 @@
const uint8_t FunctionDeviceGetOnOff = 0x61;
const uint8_t FunctionDeviceGetParameterValue = 0x62;
const uint8_t FunctionDeviceGetDSID = 0x65;
+ const uint8_t FunctionDeviceGetFunctionID = 0x66;
const uint8_t FunctionDeviceGetGroups = 0x67;
-
+ const uint8_t FunctionDeviceGetName = 0x68;
+ const uint8_t FunctionDeviceGetVersion = 0x69;
+
+ const uint8_t FunctionGetTypeRequest = 0x90;
const uint8_t FunctionModulatorGetDSID = 0x91;
const uint8_t FunctionModulatorGetPowerConsumption = 0x94;
const uint8_t FunctionModulatorGetEnergyMeterValue = 0x95;
-
+ const uint8_t FunctionModulatorSetEnergyLevel = 0x96;
+ const uint8_t FunctionModulatorGetEnergyLevel = 0x97;
+
const uint8_t FunctionDeviceGetTransmissionQuality = 0x9f;
- const uint8_t FunctionDeviceGetFunctionID = 0x66;
- const uint8_t FunctionDeviceGetName = 0x68;
-
- const uint8_t FunctionGetTypeRequest = 0x90;
-
- const uint8_t FunctionModulatorGetEnergyBorder = 0x97;
-
- const uint8_t FunctionDSLinkConfigWrite = 0xa0;
- const uint8_t FunctionDSLinkConfigRead = 0xa1;
+ const uint8_t FunctionMeterSynchronisation = 0xa0;
+
+ const uint8_t FunctionDSLinkConfigWrite = 0xc0;
+ const uint8_t FunctionDSLinkConfigRead = 0xc1;
const uint8_t FunctionDSLinkSendDevice = 0xc2;
+ const uint8_t FunctionDSLinkReceive = 0xc3;
const uint8_t FunctionDSLinkSendGroup = 0xc4;
const uint8_t DSLinkSendLastByte = 0x01;
const uint8_t DSLinkSendWriteOnly = 0x02;
- const uint8_t FunctionDSLinkReceive = 0xc3;
- const uint8_t FunctionDSLinkInterrupt = 0x85;
const uint8_t EventNewDS485Device = 0x80;
const uint8_t EventLostDS485Device = 0x81;
const uint8_t EventDeviceReady = 0x82;
+ const uint8_t EventDSLinkInterrupt = 0x85;
// Scene constants for devices
const uint8_t SceneOff = 0x00;
Modified: dss/trunk/core/sim/dssim.cpp
===================================================================
--- dss/trunk/core/sim/dssim.cpp 2009-10-30 08:50:35 UTC (rev 8877)
+++ dss/trunk/core/sim/dssim.cpp 2009-10-30 08:58:40 UTC (rev 8878)
@@ -930,7 +930,7 @@
distributeFrame(response);
}
break;
- case FunctionModulatorGetEnergyBorder:
+ case FunctionModulatorGetEnergyLevel:
{
response = createResponse(cmdFrame, cmdNr);
response->getPayload().add<uint16_t>(m_EnergyLevelOrange);
@@ -979,7 +979,7 @@
result->getHeader().setBroadcast(true);
result->getHeader().setCounter(0);
result->setCommand(CommandEvent);
- result->getPayload().add<uint8_t>(FunctionDSLinkInterrupt);
+ result->getPayload().add<uint8_t>(EventDSLinkInterrupt);
result->getPayload().add<devid_t>(_shortAddress);
distributeFrame(result);
} // dSLinkInterrupt
Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp 2009-10-30 08:50:35 UTC (rev 8877)
+++ dss/trunk/unix/ds485proxy.cpp 2009-10-30 08:58:40 UTC (rev 8878)
@@ -993,9 +993,9 @@
DS485CommandFrame cmdFrame;
cmdFrame.getHeader().setDestination(_modulatorID);
cmdFrame.setCommand(CommandRequest);
- cmdFrame.getPayload().add<uint8_t>(FunctionModulatorGetEnergyBorder);
+ cmdFrame.getPayload().add<uint8_t>(FunctionModulatorGetEnergyLevel);
- boost::shared_ptr<FrameBucketCollector> bucket = sendFrameAndInstallBucket(cmdFrame, FunctionModulatorGetEnergyBorder);
+ boost::shared_ptr<FrameBucketCollector> bucket = sendFrameAndInstallBucket(cmdFrame, FunctionModulatorGetEnergyLevel);
bucket->waitForFrame(1000);
@@ -1243,6 +1243,9 @@
case FunctionGetTypeRequest:
return "Function Get Type";
+ case FunctionMeterSynchronisation:
+ return "Function Meter Synchronization";
+
case FunctionDeviceGetFunctionID:
return "Function Device Get Function ID";
case FunctionDSLinkConfigWrite:
@@ -1255,7 +1258,7 @@
return "Function dSLink Send Group";
case FunctionDSLinkReceive:
return "Function dSLink Receive";
- case FunctionDSLinkInterrupt:
+ case EventDSLinkInterrupt:
return "Function DSLink Interrupt";
case FunctionZoneAddDevice:
@@ -1378,7 +1381,7 @@
pEvent->addParameter(devID);
pEvent->addParameter(sceneID);
getDSS().getApartment().addModelEvent(pEvent);
- } else if(functionID == FunctionDSLinkInterrupt) {
+ } else if(functionID == EventDSLinkInterrupt) {
pd.get<uint8_t>(); // functionID
uint16_t devID = pd.get<uint16_t>();
uint16_t priority = pd.get<uint16_t>();
More information about the dss-commits
mailing list