Skip to content

Commit

Permalink
added recent models
Browse files Browse the repository at this point in the history
  • Loading branch information
bwp91 committed Dec 8, 2024
1 parent a3431c8 commit 695a9ba
Show file tree
Hide file tree
Showing 6 changed files with 493 additions and 8 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
- `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
- `PATCH` version when backwards-compatible bug fixes are implemented

## BETA
## v10.13.0 (2024-12-08)

### Added

- added models H8072 and H80C4 (#969) (@EricHigdon)
- added recent models

### Changed

- Bump `node` recommended versions to `v18.20.5` or `v20.18.1` or `v22.12.0`

### Fixed

Expand Down
157 changes: 157 additions & 0 deletions lib/device/humidifier-H7147.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
import {
base64ToHex,
getTwoItemPosition,
hexToTwoItems,
parseError,
} from '../utils/functions.js'
import platformLang from '../utils/lang-en.js'

export default class {
constructor(platform, accessory) {
// Set up variables from the platform
this.hapChar = platform.api.hap.Characteristic
this.hapErr = platform.api.hap.HapStatusError
this.hapServ = platform.api.hap.Service
this.platform = platform

// Set up variables from the accessory
this.accessory = accessory

// Rotation speed to value in {1, 2, ..., 8}
this.speed2Value = speed => Math.min(Math.max(Number.parseInt(Math.round(speed / 10), 10), 1), 8)

// Speed codes
this.value2Code = {
1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
2: 'MwUBAgAAAAAAAAAAAAAAAAAAADU=',
3: 'MwUBAwAAAAAAAAAAAAAAAAAAADQ=',
4: 'MwUBBAAAAAAAAAAAAAAAAAAAADM=',
5: 'MwUBBQAAAAAAAAAAAAAAAAAAADI=',
6: 'MwUBBgAAAAAAAAAAAAAAAAAAADE=',
7: 'MwUBBwAAAAAAAAAAAAAAAAAAADA=',
8: 'MwUBCAAAAAAAAAAAAAAAAAAAAD8=',
}

// Add the fan service if it doesn't already exist
this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)

// Add the set handler to the fan on/off characteristic
this.service
.getCharacteristic(this.hapChar.On)
.onSet(async value => this.internalStateUpdate(value))
this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'

// Add the set handler to the fan rotation speed characteristic
this.service
.getCharacteristic(this.hapChar.RotationSpeed)
.setProps({
minStep: 10,
validValues: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
})
.onSet(async value => this.internalSpeedUpdate(value))
this.cacheSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value

// Output the customised options to the log
const opts = JSON.stringify({})
platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
}

async internalStateUpdate(value) {
try {
const newValue = value ? 'on' : 'off'

// Don't continue if the new value is the same as before
if (this.cacheState === newValue) {
return
}

// Send the request to the platform sender function
await this.platform.sendDeviceUpdate(this.accessory, {
cmd: 'stateHumi',
value: value ? 1 : 0,
})

// Cache the new state and log if appropriate
this.cacheState = newValue
this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
} catch (err) {
// Catch any errors during the process
this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)

// Throw a 'no response' error and set a timeout to revert this after 2 seconds
setTimeout(() => {
this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
}, 2000)
throw new this.hapErr(-70402)
}
}

async internalSpeedUpdate(value) {
try {
// Don't continue if the speed is 0
if (value === 0) {
return
}

// Get the single Govee value {1, 2, ..., 8}
const newValue = this.speed2Value(value)

// Don't continue if the speed value won't have effect
if (newValue * 10 === this.cacheSpeed) {
return
}

// Get the scene code for this value
const newCode = this.value2Code[newValue]

// Send the request to the platform sender function
await this.platform.sendDeviceUpdate(this.accessory, {
cmd: 'ptReal',
value: newCode,
})

// Cache the new state and log if appropriate
this.cacheSpeed = newValue * 10
this.accessory.log(`${platformLang.curSpeed} [${newValue}]`)
} catch (err) {
// Catch any errors during the process
this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)

// Throw a 'no response' error and set a timeout to revert this after 2 seconds
setTimeout(() => {
this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
}, 2000)
throw new this.hapErr(-70402)
}
}

externalUpdate(params) {
// Check for an ON/OFF change
if (params.state && params.state !== this.cacheState) {
this.cacheState = params.state
this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')

// Log the change
this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
}

// Check for some other scene/mode change
(params.commands || []).forEach((command) => {
const hexString = base64ToHex(command)
const hexParts = hexToTwoItems(hexString)

// Return now if not a device query update code
if (getTwoItemPosition(hexParts, 1) !== 'aa') {
return
}

const deviceFunction = `${getTwoItemPosition(hexParts, 1)}${getTwoItemPosition(hexParts, 2)}`

switch (deviceFunction) {
default:
this.accessory.logDebugWarn(`${platformLang.newScene}: [${command}] [${hexString}]`)
break
}
})
}
}
File renamed without changes.
14 changes: 9 additions & 5 deletions lib/device/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@ import deviceFanH7102 from './fan-H7102.js'
import deviceFanH7105 from './fan-H7105.js'
import deviceFanH7106 from './fan-H7106.js'
import deviceFanH7111 from './fan-H7111.js'
import deviceHeaterSingle from './heater-single.js'
import deviceHeater1A from './heater1a.js'
import deviceHeater1B from './heater1b.js'
import deviceHeater2 from './heater2.js'
import deviceHeaterSingle from './heater-single.js'
import deviceHumidifierH7140 from './humidifier-H7140.js'
import deviceHumidifierH7141 from './humidifier-H7141.js'
import deviceHumidifierH7142 from './humidifier-H7142.js'
import deviceHumidifierH7143 from './humidifier-H7143.js'
import deviceHumidifierH7147 from './humidifier-H7147.js'
import deviceHumidifierH7148 from './humidifier-H7148.js'
import deviceHumidifierH7160 from './humidifier-H7160.js'
import deviceIceMakerH7162 from './ice-maker-H7162.js'
import deviceIceMakerH7172 from './ice-maker-H7172.js'
import deviceKettle from './kettle.js'
import deviceLight from './light.js'
import deviceLightSwitch from './light-switch.js'
import deviceLight from './light.js'
import deviceOutletDouble from './outlet-double.js'
import deviceOutletSingle from './outlet-single.js'
import deviceOutletTriple from './outlet-triple.js'
Expand All @@ -34,14 +35,15 @@ import devicePurifierH7123 from './purifier-H7123.js'
import devicePurifierH7124 from './purifier-H7124.js'
import devicePurifierH7126 from './purifier-H7126.js'
import devicePurifierH7127 from './purifier-H7127.js'
import devicePurifierH7129 from './purifier-H7129.js'
import devicePurifierSingle from './purifier-single.js'
import deviceSensorButton from './sensor-button.js'
import deviceSensorContact from './sensor-contact.js'
import deviceSensorLeak from './sensor-leak.js'
import deviceSensorMonitor from './sensor-monitor.js'
import deviceSensorPresence from './sensor-presence.js'
import deviceSensorThermo from './sensor-thermo.js'
import deviceSensorThermo4 from './sensor-thermo4.js'
import deviceSensorThermo from './sensor-thermo.js'
import deviceSwitchDouble from './switch-double.js'
import deviceSwitchSingle from './switch-single.js'
import deviceSwitchTriple from './switch-triple.js'
Expand Down Expand Up @@ -70,9 +72,10 @@ export default {
deviceHumidifierH7141,
deviceHumidifierH7142,
deviceHumidifierH7143,
deviceHumidifierH7147,
deviceHumidifierH7148,
deviceHumidifierH7160,
deviceIceMakerH7162,
deviceIceMakerH7172,
deviceKettle,
deviceLight,
deviceLightSwitch,
Expand All @@ -87,6 +90,7 @@ export default {
devicePurifierH7124,
devicePurifierH7126,
devicePurifierH7127,
devicePurifierH7129,
devicePurifierSingle,
deviceSensorButton,
deviceSensorContact,
Expand Down
Loading

0 comments on commit 695a9ba

Please sign in to comment.