Skip to content

Commit

Permalink
Spell permission correctly, but leave old enum for compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielO committed Oct 15, 2019
1 parent 1c2bc37 commit d08a646
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 71 deletions.
6 changes: 3 additions & 3 deletions examples/BH1750LightSensor/BH1750LightSensorAccessory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ void BH1750LightSensorAccessory::initAccessorySet() {
Service *lightSensorService = new Service(serviceType_lightSensor);
BH1750LightSensorAccessory->addService(lightSensorService);

stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, permission_read, 0);
nameCharacteristic->characteristics::setValue("Light sensor");
BH1750LightSensorAccessory->addCharacteristics(lightSensorService, nameCharacteristic);

boolCharacteristics *statusActive = new boolCharacteristics(charType_sensorActive, premission_read|premission_notify);
boolCharacteristics *statusActive = new boolCharacteristics(charType_sensorActive, permission_read|permission_notify);
statusActive->characteristics::setValue("true");
BH1750LightSensorAccessory->addCharacteristics(lightSensorService, statusActive);

currentAmbilightChar = new floatCharacteristics(charType_currentAmbientLightLevel, premission_read|premission_notify, 0.0001, 100000.0, 0, unit_lux);
currentAmbilightChar = new floatCharacteristics(charType_currentAmbientLightLevel, permission_read|permission_notify, 0.0001, 100000.0, 0, unit_lux);
currentAmbilightChar->perUserQuery = std::bind(&BH1750LightSensorAccessory::getCurrentAmbilightLevel, this, std::placeholders::_1);
BH1750LightSensorAccessory->addCharacteristics(lightSensorService, currentAmbilightChar);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,22 @@ void BME280TemperatureHumiditySensorAccessory::initAccessorySet() {
Service *temperatureSensorService = new Service(serviceType_temperatureSensor);
sensorAccessory->addService(temperatureSensorService);

stringCharacteristics *temperatureNameCharacteristic = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *temperatureNameCharacteristic = new stringCharacteristics(charType_serviceName, permission_read, 0);
temperatureNameCharacteristic->characteristics::setValue("Temperature sensor");
sensorAccessory->addCharacteristics(temperatureSensorService, temperatureNameCharacteristic);

currentTemperatureChar = new floatCharacteristics(charType_currentTemperature, premission_read|premission_notify,-50, 50, 0.1, unit_celsius);
currentTemperatureChar = new floatCharacteristics(charType_currentTemperature, permission_read|permission_notify,-50, 50, 0.1, unit_celsius);
currentTemperatureChar->perUserQuery = std::bind(&BME280TemperatureHumiditySensorAccessory::getCurrentTemperature, this, std::placeholders::_1);
sensorAccessory->addCharacteristics(temperatureSensorService, currentTemperatureChar);

Service *humiditySensorService = new Service(serviceType_humiditySensor);
sensorAccessory->addService(humiditySensorService);

stringCharacteristics *humidityNameCharacteristic = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *humidityNameCharacteristic = new stringCharacteristics(charType_serviceName, permission_read, 0);
humidityNameCharacteristic->characteristics::setValue("Humidity sensor");
sensorAccessory->addCharacteristics(humiditySensorService, humidityNameCharacteristic);

currentHumidityChar = new floatCharacteristics(charType_currentHumidity, premission_read|premission_notify, 0, 100, 1, unit_percentage);
currentHumidityChar = new floatCharacteristics(charType_currentHumidity, permission_read|permission_notify, 0, 100, 1, unit_percentage);
currentHumidityChar->perUserQuery = std::bind(&BME280TemperatureHumiditySensorAccessory::getCurrentHumidity, this, std::placeholders::_1);
sensorAccessory->addCharacteristics(humiditySensorService, currentHumidityChar);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ class AdapticaDoorOpenerAccessory: public HAPCompositeAccessory {
}
};

#endif /* AdapticaDoorOpenerAccessory_hpp */
#endif /* AdapticaDoorOpenerAccessory_hpp */
4 changes: 2 additions & 2 deletions examples/adaptica_door_opener/SerialModemSwitchService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ void SerialModemSwitchService::initService(Accessory *accessory) {
Service *switchService = new Service(serviceType_switch);
accessory->addService(switchService);

stringCharacteristics *serviceName = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *serviceName = new stringCharacteristics(charType_serviceName, permission_read, 0);
serviceName->characteristics::setValue("Switch");
accessory->addCharacteristics(switchService, serviceName);

powerState = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
powerState = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState->perUserQuery = std::bind(&SerialModemSwitchService::getPower, this, std::placeholders::_1);
powerState->valueChangeFunctionCall = std::bind(&SerialModemSwitchService::setPower, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
accessory->addCharacteristics(switchService, powerState);
Expand Down
4 changes: 2 additions & 2 deletions examples/homestation/RFRelaySwitchService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ void RFRelaySwitchService::initService(Accessory *accessory) {
Service *switchService = new Service(serviceType_switch);
accessory->addService(switchService);

stringCharacteristics *roombaServiceName = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *roombaServiceName = new stringCharacteristics(charType_serviceName, permission_read, 0);
roombaServiceName->characteristics::setValue("Relay Switch");
accessory->addCharacteristics(switchService, roombaServiceName);

boolCharacteristics *powerState = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
boolCharacteristics *powerState = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState->perUserQuery = std::bind(&RFRelaySwitchService::getPower, this, std::placeholders::_1);
powerState->valueChangeFunctionCall = std::bind(&RFRelaySwitchService::setPower, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
accessory->addCharacteristics(switchService, powerState);
Expand Down
8 changes: 4 additions & 4 deletions examples/homestation/WindowsShutterService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,20 @@ void WindowsShutterService::initService(Accessory *accessory) {
Service *windowsCoverService = new Service(serviceType_windowCover);
accessory->addService(windowsCoverService);

stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, permission_read, 0);
nameCharacteristic->characteristics::setValue("Window name");
accessory->addCharacteristics(windowsCoverService, nameCharacteristic);

intCharacteristics *targetPositionChar = new intCharacteristics(charType_targetPosition, premission_read|premission_write|premission_notify, 0, 100, 1, unit_percentage);
intCharacteristics *targetPositionChar = new intCharacteristics(charType_targetPosition, permission_read|permission_write|permission_notify, 0, 100, 1, unit_percentage);
targetPositionChar->characteristics::setValue(format("%d",targetPosition));
targetPositionChar->valueChangeFunctionCall = std::bind(&WindowsShutterService::setTargetPosition, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
accessory->addCharacteristics(windowsCoverService, targetPositionChar);

currentPositionChar = new intCharacteristics(charType_currentPosition, premission_read|premission_notify, 0, 100, 1, unit_percentage);
currentPositionChar = new intCharacteristics(charType_currentPosition, permission_read|permission_notify, 0, 100, 1, unit_percentage);
currentPositionChar->characteristics::setValue(format("%d",position));
accessory->addCharacteristics(windowsCoverService, currentPositionChar);

positionStateChar = new intCharacteristics(charType_positionState, premission_read|premission_notify, 0, 2, 1, unit_percentage);
positionStateChar = new intCharacteristics(charType_positionState, permission_read|permission_notify, 0, 2, 1, unit_percentage);
positionStateChar->characteristics::setValue(format("%d",state));
accessory->addCharacteristics(windowsCoverService, positionStateChar);

Expand Down
10 changes: 5 additions & 5 deletions examples/lightbulb/LightBulbAccessoryBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,26 @@ void LightBulbAccessoryBase::initAccessorySet() {
Service *lightService1 = new Service(serviceType_lightBulb);
lightAcc1->addService(lightService1);

stringCharacteristics *lightServiceName1 = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *lightServiceName1 = new stringCharacteristics(charType_serviceName, permission_read, 0);
lightServiceName1->characteristics::setValue("Bulb name");
lightAcc1->addCharacteristics(lightService1, lightServiceName1);

boolCharacteristics *powerState1 = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
boolCharacteristics *powerState1 = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState1->perUserQuery = std::bind(&LightBulbAccessoryBase::getPower, this, std::placeholders::_1);
powerState1->valueChangeFunctionCall = std::bind(&LightBulbAccessoryBase::powerTrackable, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
lightAcc1->addCharacteristics(lightService1, powerState1);

brightnessStateChar = new intCharacteristics(charType_brightness, premission_read|premission_write, 0, 100, 1, unit_percentage);
brightnessStateChar = new intCharacteristics(charType_brightness, permission_read|permission_write, 0, 100, 1, unit_percentage);
brightnessStateChar->perUserQuery = std::bind(&LightBulbAccessoryBase::getLedBrightness, this, std::placeholders::_1);
brightnessStateChar->valueChangeFunctionCall = std::bind(&LightBulbAccessoryBase::setLedBrightness, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
lightAcc1->addCharacteristics(lightService1, brightnessStateChar);

intCharacteristics *ledSaturationStateChar = new intCharacteristics(charType_saturation, premission_read|premission_write|premission_notify, 0, 100, 1, unit_percentage);
intCharacteristics *ledSaturationStateChar = new intCharacteristics(charType_saturation, permission_read|permission_write|permission_notify, 0, 100, 1, unit_percentage);
ledSaturationStateChar->perUserQuery = std::bind(&LightBulbAccessoryBase::getLedSaturation, this, std::placeholders::_1);
ledSaturationStateChar->valueChangeFunctionCall = std::bind(&LightBulbAccessoryBase::setLedSaturation, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
lightAcc1->addCharacteristics(lightService1, ledSaturationStateChar);

intCharacteristics *ledHueStateChar = new intCharacteristics(charType_hue, premission_read|premission_write|premission_notify, 0, 360, 1, unit_arcDegree);
intCharacteristics *ledHueStateChar = new intCharacteristics(charType_hue, permission_read|permission_write|permission_notify, 0, 360, 1, unit_arcDegree);
ledHueStateChar->perUserQuery = std::bind(&LightBulbAccessoryBase::getLedHue, this, std::placeholders::_1);
ledHueStateChar->valueChangeFunctionCall = std::bind(&LightBulbAccessoryBase::setLedHue, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
lightAcc1->addCharacteristics(lightService1, ledHueStateChar);
Expand Down
6 changes: 3 additions & 3 deletions examples/lightsensor/LightSensorAccessory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ void LightSensorAccessory::initAccessorySet() {
Service *lightSensorService = new Service(serviceType_lightSensor);
lightSensorAccessory->addService(lightSensorService);

stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *nameCharacteristic = new stringCharacteristics(charType_serviceName, permission_read, 0);
nameCharacteristic->characteristics::setValue("Light sensor");
lightSensorAccessory->addCharacteristics(lightSensorService, nameCharacteristic);

boolCharacteristics *statusActive = new boolCharacteristics(charType_sensorActive, premission_read|premission_notify);
boolCharacteristics *statusActive = new boolCharacteristics(charType_sensorActive, permission_read|permission_notify);
statusActive->characteristics::setValue("true");
lightSensorAccessory->addCharacteristics(lightSensorService, statusActive);

currentAmbilightChar = new floatCharacteristics(charType_currentAmbientLightLevel, premission_read|premission_notify, 0.0001, 100000.0, 0, unit_lux);
currentAmbilightChar = new floatCharacteristics(charType_currentAmbientLightLevel, permission_read|permission_notify, 0.0001, 100000.0, 0, unit_lux);
currentAmbilightChar->perUserQuery = std::bind(&LightSensorAccessory::getCurrentAmbilightLevel, this, std::placeholders::_1);
lightSensorAccessory->addCharacteristics(lightSensorService, currentAmbilightChar);
};
4 changes: 2 additions & 2 deletions examples/relayswitch/RelaySwitchAccessory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ void RelaySwitchAccessory::initAccessorySet() {
Service *switchService = new Service(serviceType_switch);
switchAcc->addService(switchService);

stringCharacteristics *switchServiceName = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *switchServiceName = new stringCharacteristics(charType_serviceName, permission_read, 0);
switchServiceName->characteristics::setValue("Relay Switch");
switchAcc->addCharacteristics(switchService, switchServiceName);

boolCharacteristics *powerState = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
boolCharacteristics *powerState = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState->perUserQuery = std::bind(&RelaySwitchAccessory::getPower, this, std::placeholders::_1);
powerState->valueChangeFunctionCall = std::bind(&RelaySwitchAccessory::setPower, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
switchAcc->addCharacteristics(switchService, powerState);
Expand Down
10 changes: 5 additions & 5 deletions examples/roomba/RoombaAccessory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,27 @@ void RoombaAccessory::initAccessorySet() {
Service *switchService = new Service(serviceType_switch);
roombaAcc->addService(switchService);

stringCharacteristics *roombaServiceName = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *roombaServiceName = new stringCharacteristics(charType_serviceName, permission_read, 0);
roombaServiceName->characteristics::setValue("Roomba");
roombaAcc->addCharacteristics(switchService, roombaServiceName);

boolCharacteristics *powerState = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
boolCharacteristics *powerState = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState->perUserQuery = std::bind(&RoombaAccessory::getPower, this, std::placeholders::_1);
powerState->valueChangeFunctionCall = std::bind(&RoombaAccessory::setPower, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
roombaAcc->addCharacteristics(switchService, powerState);

Service *batteryService = new Service(serviceType_battery);
roombaAcc->addService(batteryService);

intCharacteristics *batteryLevelChar = new intCharacteristics(charType_batteryLevel, premission_read|premission_notify, 0, 100, 1, unit_percentage);
intCharacteristics *batteryLevelChar = new intCharacteristics(charType_batteryLevel, permission_read|permission_notify, 0, 100, 1, unit_percentage);
batteryLevelChar->perUserQuery = std::bind(&RoombaAccessory::getBatteryLevel, this, std::placeholders::_1);
roombaAcc->addCharacteristics(batteryService, batteryLevelChar);

intCharacteristics *chargingStateChar = new intCharacteristics(charType_sensorChargingState, premission_read|premission_notify, 0, 2, 1, unit_percentage);
intCharacteristics *chargingStateChar = new intCharacteristics(charType_sensorChargingState, permission_read|permission_notify, 0, 2, 1, unit_percentage);
chargingStateChar->perUserQuery = std::bind(&RoombaAccessory::getChargingState, this, std::placeholders::_1);
roombaAcc->addCharacteristics(batteryService, chargingStateChar);

intCharacteristics *statusLowBatteryChar = new intCharacteristics(charType_sensorLowBattery, premission_read|premission_notify, 0, 1, 1, unit_percentage);
intCharacteristics *statusLowBatteryChar = new intCharacteristics(charType_sensorLowBattery, permission_read|permission_notify, 0, 1, 1, unit_percentage);
statusLowBatteryChar->perUserQuery = std::bind(&RoombaAccessory::getStatusLowBattery, this, std::placeholders::_1);
roombaAcc->addCharacteristics(batteryService, statusLowBatteryChar);
}
4 changes: 2 additions & 2 deletions examples/singlenixie/NixieClockAccessory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ void NixieClockAccessory::initAccessorySet() {
Service *lightService = new Service(serviceType_lightBulb);
nixieAcc->addService(lightService);

stringCharacteristics *lightServiceName = new stringCharacteristics(charType_serviceName, premission_read, 0);
stringCharacteristics *lightServiceName = new stringCharacteristics(charType_serviceName, permission_read, 0);
lightServiceName->characteristics::setValue("Single Nixie");
nixieAcc->addCharacteristics(lightService, lightServiceName);

boolCharacteristics *powerState = new boolCharacteristics(charType_on, premission_read|premission_write|premission_notify);
boolCharacteristics *powerState = new boolCharacteristics(charType_on, permission_read|permission_write|permission_notify);
powerState->perUserQuery = std::bind(&NixieClockAccessory::getPower, this, std::placeholders::_1);
powerState->valueChangeFunctionCall = std::bind(&NixieClockAccessory::setPower, this, std::placeholders::_1, std::placeholders::_2,std::placeholders::_3);
nixieAcc->addCharacteristics(lightService, powerState);
Expand Down
Loading

0 comments on commit d08a646

Please sign in to comment.