Updated battery config
This commit is contained in:
parent
611ec4c814
commit
0869970839
@ -11,7 +11,7 @@
|
|||||||
[scheme]="scheme"
|
[scheme]="scheme"
|
||||||
[yAxis]="true"
|
[yAxis]="true"
|
||||||
[yScaleMin]="0"
|
[yScaleMin]="0"
|
||||||
[yScaleMax]="100"
|
[yScaleMax]="25"
|
||||||
[yAxisTickFormatting]="percentFormat"
|
[yAxisTickFormatting]="percentFormat"
|
||||||
legendTitle="Charge"
|
legendTitle="Charge"
|
||||||
[legend]="!app.mobile"
|
[legend]="!app.mobile"
|
||||||
|
@ -28,7 +28,7 @@ export class BatteryComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
percentFormat(val) {
|
percentFormat(val) {
|
||||||
return `${val} %`
|
return `${val} V`
|
||||||
}
|
}
|
||||||
|
|
||||||
tempFormat(val) {
|
tempFormat(val) {
|
||||||
|
@ -44,13 +44,15 @@ export class BatteryService {
|
|||||||
constructor() {
|
constructor() {
|
||||||
this.firestore = firebaseApp.firestore();
|
this.firestore = firebaseApp.firestore();
|
||||||
this.firestore.settings({timestampsInSnapshots: true});
|
this.firestore.settings({timestampsInSnapshots: true});
|
||||||
this.firestore.collection('Battery').doc('TEMP').onSnapshot(snap => {
|
this.firestore.collection('Battery').doc('170724D').onSnapshot(snap => {
|
||||||
this.last = new Date();
|
this.last = new Date();
|
||||||
|
|
||||||
let data = snap.data();
|
let data = snap.data();
|
||||||
this.batteries = Object.keys(data).map(key => ({name: key, history: data[key]}));
|
console.log(data);
|
||||||
this.average = this.batteries.reduce((acc, battery) => acc + battery.history[0].percentage, 0) / this.batteries.length;
|
|
||||||
this.percentageData = this.batteries.map(battery => ({name: battery.name, series: battery.history.map((history, i) => ({name: i, value: history.percentage * 100}))}));
|
this.batteries = Object.keys(data.modules).map(key => ({name: key, history: data.modules[key]}));
|
||||||
|
this.average = this.batteries.reduce((acc, battery) => acc + battery.history[0].charge, 0) / this.batteries.length;
|
||||||
|
this.percentageData = this.batteries.map(battery => ({name: battery.name, series: battery.history.map((history, i) => ({name: i, value: history.charge}))}));
|
||||||
this.temperatureData = this.batteries.map(battery => ({name: battery.name, series: battery.history.map((history, i) => ({name: i, value: Math.round(history.temp * 10) / 10}))}));
|
this.temperatureData = this.batteries.map(battery => ({name: battery.name, series: battery.history.map((history, i) => ({name: i, value: Math.round(history.temp * 10) / 10}))}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user