brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into onewire_detect

Browse source
This commit is contained in:
csawatzky 2025-11-03 10:51:29 -06:00
commit 6b0dd9ff41
9 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pbHelpers/Component.ts
View file

@ -15,7 +15,9 @@ export function sameComponentID(
const sameType: boolean = id1.type === id2.type;
const sameAddressType: boolean = id1.addressType === id2.addressType;
const sameAddress: boolean = (!id1.address && !id2.address) || id1.address === id2.address;
return sameType && sameAddressType && sameAddress;
const sameExpansion: boolean = (!id1.expansionLine && !id2.expansionLine) || id1.expansionLine === id2.expansionLine;
const sameMux: boolean = (!id1.muxLine && !id2.muxLine) || id1.muxLine === id2.muxLine;
return sameType && sameAddressType && sameAddress && sameExpansion && sameMux;
}
export function getComponentIDString(component?: Component): string {

9
src/pbHelpers/ComponentTypes/DragerGasDongle.ts
View file

@ -170,6 +170,7 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension {
let firstTime: Moment | undefined;
let lastTime: Moment | undefined;
let valMap: Map<number, number[]> = new Map<number, number[]>();
if(measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_PPM){
measurement.values.forEach((vals, i) => {
let avgVals: Point[] = [];
let newLineData: LineData = {
@ -205,6 +206,14 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension {
valMap = new Map<number, number[]>();
}
});
} else {
chartData = simpleLineChartData(
quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE,
measurement,
smoothingAverages,
filters
);
}
} else {
chartData = simpleLineChartData(
quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE,

5
src/pbHelpers/ComponentTypes/OnOffOutput.ts
View file

@ -63,6 +63,11 @@ const subtypes = [
key: quack.BooleanOutputSubtype.BOOLEAN_OUTPUT_SUBTYPE_EXHAUST_FAN,
value: "BOOLEAN_OUTPUT_SUBTYPE_FAN",
friendlyName: "Exhaust Fan"
} as Subtype,
{
key: quack.BooleanOutputSubtype.BOOLEAN_OUTPUT_SUBTYPE_ALARM,
value: "BOOLEAN_OUTPUT_SUBTYPE_ALARM",
friendlyName: "Alarm"
} as Subtype
];

1
src/pbHelpers/MeasurementDescriber.ts
View file

@ -176,6 +176,7 @@ export class MeasurementDescriber {
this.details.unit = "mV";
this.details.graph = GraphType.MULTILINE;
this.details.unit = "mV";
this.details.decimals = 0
// this.details.nodeDetails = {
// colours: ["white", "black", "red", "blue"],
// labels: ["millivolt1", "millivolt2", "millivolt3", "millivolt4"]