caliskanbi83990/projektarbeit_duelger_waldhauser_caliskan
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Final status

Browse Source
This commit is contained in:
Kemal Duelger 2023-09-20 18:26:22 +02:00
parent 5e14633f42
commit f6f6421620
5 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
software/Frontend/src/app/Plants/plants.component.ts
View File

@ -19,7 +19,6 @@ export class PlantsComponent {
filteredOptions: Observable<string[]>;
plants$: Observable<Plant[]> = this.storeService.currentPlants;
constructor(public dialog: MatDialog, public storeService: StoreService, private mqttRequestService: MqttRequestService) {
// sobald es eine änderung bei den pflanzenNamen gibt, wird bei der suchleiste ein neuer filter eingesetzt
this.options$.subscribe(response => {
@ -58,12 +57,10 @@ export class PlantsComponent {
this.selectedPlant = value;
}
onOptionDefault() {
this.selectedPlant = 'undefined';
}
private _filter(value: string, options: string[]): string[] {
const filterValue = value.toLowerCase();

38
software/Frontend/src/app/Service/Mqtt/mqtt-request.service.ts
View File

@ -66,19 +66,6 @@ export class MqttRequestService {
console.error('Error:', err);
});
// this.mqttService.subscribeToTopic("BACKEND/DATA/POSITION").subscribe(data => {
// if (typeof data !== "object") {
// const payload = JSON.parse(data) as Position;
// this.mqttSetDataService.setRobotPosition(payload);
// }
// }, err => {
// this.dialog.open(ErrorDialogComponent, {
// data: err,
// width: '400px',
// });
// console.error('Error:', err);
// });
this.mqttService.subscribeToTopic("BACKEND/DATA/BATTERY").subscribe(data => {
if (typeof data !== "object") {
const payload = JSON.parse(data) as RobotBattery;
@ -119,22 +106,6 @@ export class MqttRequestService {
console.error('Error:', err);
});
// this.mqttService.subscribeToTopic("BACKEND/DATA/PICTURE").subscribe(data => {
// if (typeof data !== "object") {
// const payload = JSON.parse(data) as Plant;
// this.mqttSetDataService.setDataPlant(payload);
// }
// }, err => {
// console.error('Error:', err);
// });
//Request to get ALL DATA every 10sec!!
// this.timerSubscription = timer(0, 10000).pipe(
// map(() => {
// this.mqttService.publishToTopic('BACKEND/ACTION/GETALLDATA');
// })
// ).subscribe();
//Publish to the Topic to recieve the first Data
this.publishToPLANTCOUNT();
this.publishToGETBATTERY();
@ -145,18 +116,14 @@ export class MqttRequestService {
publishToGETALLDATA() {
this.mqttService.publishToTopic('BACKEND/ACTION/GETALLDATA', JSON.stringify(this.storeService.getAllPlantNames()));
}
publishToDRIVE() {
this.mqttService.publishToTopic('BACKEND/ACTION/DRIVE');
}
publishToGETBATTERY() {
this.mqttService.publishToTopic('BACKEND/ACTION/GETBATTERY');
}
publishToROBOTREADY() {
this.mqttService.publishToTopic('BACKEND/ACTION/ROBOTREADY');
}
publishToGETPOSITION() {
this.mqttService.publishToTopic('BACKEND/ACTION/GETPOSITION');
}
publishToNEWPLANT(plant: Plant) {
this.mqttService.publishToTopic('BACKEND/ACTION/NEWPLANT', JSON.stringify(plant));
@ -173,6 +140,7 @@ export class MqttRequestService {
publishToPLANTCOUNT() {
this.mqttService.publishToTopic('BACKEND/ACTION/PLANTCOUNT');
}
/**
* publishToINPUT wird die Spracheingabe übermittelt, die dann mit
* mehreren if else anweisungen einen Request an das Backend sendet und

1
software/Frontend/src/app/Service/Mqtt/mqtt-set-data.service.ts
View File

@ -32,5 +32,4 @@ export class MqttSetDataService {
setPlantCount(data: PlantCount): void {
this.storeService.setPlantCount(data);
}
}

4
software/Frontend/src/app/Service/Mqtt/mqtt.service.ts
View File

@ -10,8 +10,8 @@ export class MqttService {
// Connection zu dem MQTT Broker
constructor() {
// this.client = connect('wss://mqtt.eclipseprojects.io:443/mqtt'); //Je nachdem welchen Link der Broker hat
this.client = connect('mqtt://192.168.137.197:1883', { clientId: 'kemal' });
this.client = connect('wss://mqtt.eclipseprojects.io:443/mqtt'); //Online Broker
// this.client = connect('mqtt://192.168.137.197:1883', { clientId: 'kemal' }); //lokaler Broker
}
public subscribeToTopic(topic: string): Observable<any> {

1
software/Frontend/src/app/app.component.html
View File

@ -28,7 +28,6 @@
<img class="img-item" src="assets/images/logo.png" alt="not available">
</header>
<body>
<router-outlet></router-outlet>
</body>