Skip to content

Commit

Permalink
Merge pull request #459 from Pho3niX90/bugfix/450
Browse files Browse the repository at this point in the history 
fix: editor restructure
  • Loading branch information
@slipx06
slipx06 authored May 31, 2024
2 parents 042421a + 57aad39 commit 6752b22
Show file tree
Hide file tree
Showing 8 changed files with 438 additions and 271 deletions.
111 changes: 46 additions & 65 deletions dist/sunsynk-power-flow-card.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sunsynk-power-flow-card",
"version": "4.40.0",
"version": "4.40.1",
"description": "A customizable Home Assistant card to emulate the Sunsynk System flow that's displayed on the Inverter screen.",
"main": "sunsynk-power-flow-card.js",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion rollup.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ export default {
input: ['./src/index.ts'],
output: {
file: 'dist/sunsynk-power-flow-card.js',
format: 'umd',
format: 'esm',
name: 'SunsynkPowerFlowCard',
inlineDynamicImports: true,
},
watch: {
clearScreen: false,
Expand Down
1 change: 1 addition & 0 deletions src/cards/full-card.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {Utils} from '../helpers/utils';
import {UnitOfElectricalCurrent, UnitOfElectricPotential, UnitOfEnergy, UnitOfPower, validGridConnected, validGridDisconnected} from '../const';
import {icons} from '../helpers/icons';


export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string, data: DataDto) => {
return html`
<ha-card>
Expand Down
3 changes: 3 additions & 0 deletions src/const.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export const validauxLoads = [0, 1, 2]
export const validGridDisconnected = ['off', '0', 'off-grid', 'off grid', 'offgrid']
export const validGridConnected = ['on', '1', 'on-grid', 'on grid', 'ongrid']

export const EDITOR_NAME = 'sunsynk-content-card-editor';
export const MAIN_NAME = 'sunsynk-power-flow-card';

export const enum SensorDeviceClass {
DATE = "date",
ENUM = "enum",
Expand Down
490 changes: 332 additions & 158 deletions src/editor.ts
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/helpers/utils.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {UnitOfEnergy, UnitOfPower, UnitOfEnergyOrPower, unitOfEnergyConversionRules} from '../const';
import {unitOfEnergyConversionRules, UnitOfEnergyOrPower, UnitOfPower} from '../const';

export class Utils {
static toNum(val: string | number, decimals: number = -1, invert: boolean = false): number {
Expand Down Expand Up @@ -64,14 +64,14 @@ export class Utils {
event.preventDefault();
this._handleClick(event, { action: 'more-info' }, entityId);
}

private static _handleClick(event, actionConfig, entityId) {
if (!event || !entityId) {
return;
}

event.stopPropagation();

// Handle different actions based on actionConfig
switch (actionConfig.action) {
case 'more-info':
Expand All @@ -81,7 +81,7 @@ export class Utils {
console.warn(`Action '${actionConfig.action}' is not supported.`);
}
}

private static _dispatchMoreInfoEvent(event, entityId) {

if (Utils.isPopupOpen) {
Expand Down
91 changes: 49 additions & 42 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import {CSSResultGroup, LitElement} from 'lit';
import {customElement, property, query} from 'lit/decorators.js';
import {HomeAssistant} from 'custom-card-helpers';
import {HomeAssistant, LovelaceCardEditor} from 'custom-card-helpers';
import {styles} from './style';
import {CardStyle, DataDto, InverterModel, InverterSettings, sunsynkPowerFlowCardConfig,} from './types';
import defaultConfig from './defaults';
import {CARD_VERSION, valid3phase, validaux, validLoadValues, validnonLoadValues, validGridConnected, validGridDisconnected, validauxLoads} from './const';
import {
CARD_VERSION,
EDITOR_NAME,
MAIN_NAME,
valid3phase,
validaux,
validauxLoads,
validGridConnected,
validGridDisconnected,
validLoadValues,
validnonLoadValues
} from './const';
import {localize} from './localize/localize';
import merge from 'lodash.merge';
import {SunSynkCardEditor} from './editor';
import {Utils} from './helpers/utils';
import {fullCard} from './cards/full-card';
import {compactCard} from './cards/compact-card';
Expand All @@ -25,7 +35,7 @@ console.groupCollapsed(
console.log('Readme:', 'https://github.com/slipx06/sunsynk-power-flow-card');
console.groupEnd();

@customElement('sunsynk-power-flow-card')
@customElement(MAIN_NAME)
export class SunsynkPowerFlowCard extends LitElement {
@property() public hass!: HomeAssistant;
@property() private _config!: sunsynkPowerFlowCardConfig;
Expand All @@ -49,8 +59,9 @@ export class SunsynkPowerFlowCard extends LitElement {
return styles;
}

static getConfigElement() {
return document.createElement("content-card-editor");
public static async getConfigElement() {
await import("./editor");
return document.createElement(EDITOR_NAME) as LovelaceCardEditor;
}

static getStubConfig() {
Expand Down Expand Up @@ -228,7 +239,7 @@ export class SunsynkPowerFlowCard extends LitElement {
let batteryCurrentDirection = !stateBatteryCurrentDirection.isNaN() ? stateBatteryCurrentDirection.toNum(0) : null;
let genericInverterImage = config.inverter?.modern;

let loadColour = this.colourConvert(config.load?.colour);
let loadColour = this.colourConvert(config.load?.colour);
let auxDynamicColour = this.calculateAuxLoadColour(stateAuxPower, Utils.toNum(config.load?.off_threshold, 0)) || loadColour;
let auxOffColour = this.colourConvert(config.load?.aux_off_colour || auxDynamicColour);
let auxDynamicColourLoad1 = this.calculateAuxLoadColour(stateAuxLoad1, Utils.toNum(config.load?.off_threshold, 0)) || loadColour;
Expand Down Expand Up @@ -310,14 +321,14 @@ export class SunsynkPowerFlowCard extends LitElement {
}

let dynamicColourNonEssentialLoad1 = Math.abs(stateNonessentialLoad1.toNum(0)) > Utils.toNum(config.grid?.off_threshold, 0)
? gridColour
: 'grey';
? gridColour
: 'grey';
let dynamicColourNonEssentialLoad2 = Math.abs(stateNonessentialLoad2.toNum(0)) > Utils.toNum(config.grid?.off_threshold, 0)
? gridColour
: 'grey';
? gridColour
: 'grey';
let dynamicColourNonEssentialLoad3 = Math.abs(stateNonessentialLoad3.toNum(0)) > Utils.toNum(config.grid?.off_threshold, 0)
? gridColour
: 'grey';
? gridColour
: 'grey';

const gridOffColour = this.colourConvert(config.grid?.grid_off_colour || gridColour);

Expand Down Expand Up @@ -357,7 +368,7 @@ export class SunsynkPowerFlowCard extends LitElement {
}

let auxType = config.load?.aux_type; //valid options are gen,inverter, default, gen, boiler, pump, aircon

//Icons
const iconEssentialLoad1 = this.getEntity('load.load1_icon', {state: config.load?.load1_icon?.toString() ?? ''}).state;
const iconEssentialLoad2 = this.getEntity('load.load2_icon', {state: config.load?.load2_icon?.toString() ?? ''}).state;
Expand All @@ -369,7 +380,7 @@ export class SunsynkPowerFlowCard extends LitElement {
const iconNonessentialLoad1 = this.getEntity('grid.load1_icon', {state: config.grid?.load1_icon?.toString() ?? ''}).state;
const iconNonessentialLoad2 = this.getEntity('grid.load2_icon', {state: config.grid?.load2_icon?.toString() ?? ''}).state;
const iconNonessentialLoad3 = this.getEntity('grid.load3_icon', {state: config.grid?.load3_icon?.toString() ?? ''}).state;

let decimalPlaces = config.decimal_places;
let decimalPlacesEnergy = config.decimal_places_energy;
let remainingSolar = config.entities.remaining_solar ? Utils.convertValueNew(stateRemainingSolar.state, stateRemainingSolar.attributes?.unit_of_measurement, decimalPlaces) : false;
Expand Down Expand Up @@ -515,20 +526,20 @@ export class SunsynkPowerFlowCard extends LitElement {
break;
default:
inverterProg.show = true;

const timer_now = new Date(); // Create a new Date object representing the current time

const progTimes: Date[] = [];

[prog1, prog2, prog3, prog4, prog5, prog6].forEach((prog, index) => {
const [hours, minutes] = prog.time.state.split(':').map(item => parseInt(item, 10));
progTimes[index] = new Date(timer_now.getTime());
progTimes[index].setHours(hours);
progTimes[index].setMinutes(minutes);
});

const [prog_time1, prog_time2, prog_time3, prog_time4, prog_time5, prog_time6] = progTimes;

if (timer_now >= prog_time6 || timer_now < prog_time1) {
assignInverterProgValues(prog6, config.entities.prog6_charge);
} else if (timer_now >= prog_time1 && timer_now < prog_time2) {
Expand All @@ -542,16 +553,17 @@ export class SunsynkPowerFlowCard extends LitElement {
} else if (timer_now >= prog_time5 && timer_now < prog_time6) {
assignInverterProgValues(prog5, config.entities.prog5_charge);
}

function assignInverterProgValues(prog, entityID) {
if (prog.charge.state === 'No Grid or Gen' || prog.charge.state === '0' || prog.charge.state === 'off') {
inverterProg.charge = 'none';
} else {
inverterProg.charge = 'both';
}
inverterProg.capacity = parseInt(prog.capacity.state);
inverterProg.entityID = entityID;
}

function assignInverterProgValues(prog, entityID) {
if (prog.charge.state === 'No Grid or Gen' || prog.charge.state === '0' || prog.charge.state === 'off') {
inverterProg.charge = 'none';
} else {
inverterProg.charge = 'both';
}
inverterProg.capacity = parseInt(prog.capacity.state);
inverterProg.entityID = entityID;
}

break;
}

Expand Down Expand Up @@ -867,7 +879,7 @@ export class SunsynkPowerFlowCard extends LitElement {
const totalPercentage = pvPercentageRaw + batteryPercentageRaw;
const normalizedPvPercentage = totalPercentage === 0 ? 0 : (pvPercentageRaw / totalPercentage) * 100;
const normalizedBatteryPercentage = totalPercentage === 0 ? 0 : (batteryPercentageRaw / totalPercentage) * 100;

//console.log(`${normalizedPvPercentage} % normalizedPVPercentage to load, ${normalizedBatteryPercentage} % normalizedBatteryPercentage to load`);

let pvPercentage = 0;
Expand Down Expand Up @@ -949,7 +961,7 @@ export class SunsynkPowerFlowCard extends LitElement {

let essIcon: string;
let essIconSize: number;

switch (true) {
case pvPercentageRaw >= 100 && batteryPercentageRaw <= 5 && (totalGridPower - nonessentialPower) < 50 && config.load.dynamic_icon:
essIcon = icons.essPv;
Expand Down Expand Up @@ -977,11 +989,11 @@ export class SunsynkPowerFlowCard extends LitElement {
const pv3MaxPower = this.getEntity('solar.pv3_max_power', {state: config.solar.pv3_max_power?.toString() ?? ''});
const pv4MaxPower = this.getEntity('solar.pv4_max_power', {state: config.solar.pv4_max_power?.toString() ?? ''});

const totalPVEfficiency = (!config.solar.max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((totalPV / solarMaxPower.toNum()) * 100, 200) ,0);
const PV1Efficiency = (!config.solar.pv1_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv1PowerWatts / pv1MaxPower.toNum()) * 100, 200) ,0);
const PV2Efficiency = (!config.solar.pv2_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv2PowerWatts / pv2MaxPower.toNum()) * 100, 200) ,0);
const PV3Efficiency = (!config.solar.pv3_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv3PowerWatts / pv3MaxPower.toNum()) * 100, 200) ,0);
const PV4Efficiency = (!config.solar.pv4_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv4PowerWatts / pv4MaxPower.toNum()) * 100, 200) ,0);
const totalPVEfficiency = (!config.solar.max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((totalPV / solarMaxPower.toNum()) * 100, 200), 0);
const PV1Efficiency = (!config.solar.pv1_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv1PowerWatts / pv1MaxPower.toNum()) * 100, 200), 0);
const PV2Efficiency = (!config.solar.pv2_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv2PowerWatts / pv2MaxPower.toNum()) * 100, 200), 0);
const PV3Efficiency = (!config.solar.pv3_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv3PowerWatts / pv3MaxPower.toNum()) * 100, 200), 0);
const PV4Efficiency = (!config.solar.pv4_max_power || config.solar.efficiency === 0) ? 100 : Utils.toNum(Math.min((pv4PowerWatts / pv4MaxPower.toNum()) * 100, 200), 0);
/**
* The current structure of this data object is intentional, but it is considered temporary.
* There is a need to evaluate the data being passed, as there might be duplication.
Expand Down Expand Up @@ -1340,11 +1352,6 @@ export class SunsynkPowerFlowCard extends LitElement {
}
}

try {
customElements.define("content-card-editor", SunSynkCardEditor);
} catch (_e) {
}
(window as any).customCards = (window as any).customCards || [];
(window as any).customCards.push({
type: 'sunsynk-power-flow-card',
name: 'Sunsynk Power Flow Card',
Expand Down

0 comments on commit 6752b22

Please sign in to comment.