dev smartfarming #1

Merged
agrilink merged 53 commits from development into main 2024-12-30 05:53:19 +00:00
2 changed files with 49 additions and 3 deletions
Showing only changes of commit 8e0de242b0 - Show all commits

View File

@ -68,7 +68,30 @@
<h6>Conductivity</h6>
</div>
</div>
<!-- Additional parameters for NPK1... -->
<div class="card-parameter">
<div>
<h3>{{sensorData.npk1.ph}}</h3>
<h6>pH</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk1.nitrogen}} PPM</h3>
<h6>Nitrogen</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk1.phosphorus}} PPM</h3>
<h6>Phosphorus</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk1.potassium}} PPM</h3>
<h6>Kalium</h6>
</div>
</div>
</div>
</div>
</div>
@ -94,7 +117,30 @@
<h6>Conductivity</h6>
</div>
</div>
<!-- Additional parameters for NPK2... -->
<div class="card-parameter">
<div>
<h3>{{sensorData.npk2.ph}}</h3>
<h6>pH</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk2.nitrogen}} PPM</h3>
<h6>Nitrogen</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk2.phosphorus}} PPM</h3>
<h6>Phosphorus</h6>
</div>
</div>
<div class="card-parameter">
<div>
<h3>{{sensorData.npk2.potassium}} PPM</h3>
<h6>Kalium</h6>
</div>
</div>
</div>
</div>
</div>

View File

@ -58,7 +58,7 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy {
soilph: 'pH',
soilnitrogen: 'Nitrogen (mg/l)',
soilphosphorus: 'Phosphorus (mg/l)',
soilpotassium: 'Potassium (mg/l)',
soilpotassium: 'Kalium (mg/l)',
};
charts: { [key: string]: Chart | undefined } = {