Skip to content

Commit

Permalink
#2 - Solve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
FernandoCZanchetta committed Jul 5, 2024
2 parents 31b6064 + ff3b19d commit d2d3678
Show file tree
Hide file tree
Showing 6 changed files with 25,602 additions and 25,615 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@

`The second part of the project is responsible of collecting the data in the server and displaying it in a website. The data is stored in a MongoDB Database, that receives and sends information to the probe. The data received are all from the sensors, which consists as enviromental information: current date and time, humidity, temperature and probe information: acceleration, angle, geographical coordinates. The website is created on the open-source web application framework Angular, based on Javascript. The website which is accessible in the link down below, collects the information sent to the server and displays it in the frontpage, also it has the button "Requisitar Foto" to send a MQTT message to the probe, via server, that when receives it, takes a photo and sends it back to the website that displays it.`

![fluxogram](https://github.com/FernandoCZanchetta/SEL0373/assets/97488352/42901e1c-1f5a-4795-b519-e7eb4cd1d68c)

---

![Projeto IoT (1)-1](https://github.com/FernandoCZanchetta/SEL0373/assets/97488352/8e2142ff-6f87-4c10-bd34-8ed7d33f6676)
![Projeto IoT (1)-2](https://github.com/FernandoCZanchetta/SEL0373/assets/97488352/364b2dd3-d43d-4e6a-90b2-a6c5d692b747)

<p align="center">
<a href="https://sharpprobe-fernando-zanchettas-projects.vercel.app/">
<img src="https://img.shields.io/badge/Check%20out-Sharp Probe Oficial Website-black?style=for-the-badge" />
Expand Down
Loading

0 comments on commit d2d3678

Please sign in to comment.