Final status

software/Frontend/src/app/Plants/plants.component.ts

@@ -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();
 

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

@@ -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

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

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

software/Frontend/src/app/Service/Mqtt/mqtt.service.ts

@@ -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> {

software/Frontend/src/app/app.component.html

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