Skip to content

Commit

Permalink
Merge pull request #53 from Hacksore/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Hacksore authored Jul 16, 2020
2 parents 139bbbc + cdf3e80 commit dcfbbbe
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 12 deletions.
69 changes: 69 additions & 0 deletions lib/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,72 @@ export const getTempCode = (temperature: number): string => {
throw new Error('temperature out of bounds! min: 15.0* max: 30*, max step: 0.5');
}
};

export const getTempFromCode = (code: string): number => {
switch (code) {
case '02H':
return 15.0;
case '03H':
return 15.5;
case '04H':
return 16.0;
case '05H':
return 16.5;
case '06H':
return 17.0;
case '07H':
return 17.5;
case '08H':
return 18.0;
case '09H':
return 18.5;
case '0AH':
return 19.0;
case '0BH':
return 19.5;
case '0CH':
return 20.0;
case '0DH':
return 20.5;
case '0EH':
return 21.0;
case '0FH':
return 21.5;
case '10H':
return 22.0;
case '11H':
return 22.0;
case '12H':
return 23.0;
case '13H':
return 23.5;
case '14H':
return 24.0;
case '15H':
return 24.5;
case '16H':
return 25.0;
case '17H':
return 25.5;
case '18H':
return 26.0;
case '19H':
return 26.5;
case '1AH':
return 27.0;
case '1BH':
return 27.5;
case '1CH':
return 28.0;
case '1DH':
return 28.5;
case '1EH':
return 29.0;
case '1FH':
return 29.5;
case '20H':
return 30.0;
default:
throw new Error('temperature out of bounds! min: 15.0* max: 30*, max step: 0.5');
}
};
12 changes: 5 additions & 7 deletions lib/vehicles/european.vehicle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import got from 'got';
import logger from '../logger';
import { Vehicle } from './vehicle';
import { EuropeanController } from '../controllers/european.controller';
import { getTempCode } from '../util';
import { getTempCode, getTempFromCode } from '../util';
import { EU_BASE_URL } from '../constants/europe';

export default class EuropeanVehicle extends Vehicle {
Expand Down Expand Up @@ -176,10 +176,8 @@ export default class EuropeanVehicle extends Vehicle {

let vehicleStatus;

if(statusConfig.refresh)
vehicleStatus = response.body.resMsg;
else
vehicleStatus = response.body.resMsg.vehicleStatusInfo.vehicleStatus;
if (statusConfig.refresh) vehicleStatus = response.body.resMsg;
else vehicleStatus = response.body.resMsg.vehicleStatusInfo.vehicleStatus;

const parsedStatus = {
chassis: {
Expand All @@ -206,7 +204,7 @@ export default class EuropeanVehicle extends Vehicle {
sideMirrorHeat: false,
rearWindowHeat: !!vehicleStatus.sideBackWindowHeat,
defrost: vehicleStatus.defrost,
temperatureSetpoint: vehicleStatus.airTemp.value,
temperatureSetpoint: getTempFromCode(vehicleStatus.airTemp.value),
temperatureUnit: vehicleStatus.airTemp.unit,
},
engine: {
Expand All @@ -215,7 +213,7 @@ export default class EuropeanVehicle extends Vehicle {
range: vehicleStatus.evStatus.drvDistance[0].rangeByFuel.totalAvailableRange.value,
charging: vehicleStatus?.evStatus?.batteryCharge,
batteryCharge: vehicleStatus?.battery?.batSoc,
}
},
};

this._status = input.parsed ? parsedStatus : vehicleStatus;
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bluelinky",
"version": "5.0.2-alpha1",
"version": "5.1.0",
"description": "",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down

0 comments on commit dcfbbbe

Please sign in to comment.