Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added documentation for ultrasonic sensor / fixes issue w other files #205

Merged
merged 2 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import jakarta.inject.Named;


//tag::ex[]
@Controller("/ultraSound")
public class UltraSonicSensorController {

Expand Down Expand Up @@ -55,3 +56,4 @@ public String disableUltrasoundSensor() {
return "Ultra Sonic Sensor Disabled";
}
}
//end::ex[]
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
==== Ultrasonic Sensor
[.text-right]
https://github.com/oss-slu/Pi4Micronaut/edit/develop/micronautpi4j-utils/src/docs/asciidoc/components/inputComponents/ultraSonicSensor.adoc[Improve this doc]

===== Overview
This document provides details of the Ultrasonic Sensor circuit,
including its components, assembly instructions, and functionality.

===== Components
. HC SR04
. T-Extension Board
. Breadboard
. Jumper wires
. Power source

===== Circuit Diagram
Model:

image::https://docs.sunfounder.com/projects/davinci-kit/en/latest/_images/image220.png[]



Circuit Diagram:

image::https://docs.sunfounder.com/projects/davinci-kit/en/latest/_images/image329.png[]

===== Functionality
The Ultrasonic Sensor uses sound waves to calculate the distance from itself to the surface it is pointed at.
The resulting measurement is accurate within 3mm and has a stable signal within 5m of the sensor,
gradually weakening until fully it fully disappears at 7m.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sentence is not clear

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also include the info about trigger and echo channels on the ultrasonic sensor


===== Troubleshooting
. Distance measurements not showing: Check all connections, ensure the sensor is placed correctly,
and check the power source.

===== YAML Pin Order
The order for declaring the Trigger Pin for the Ultrasonic Sensor is as follows:

[source, yaml]
----
digital-input:
ultra-sonic-trig:
address: 23
----
So the Trigger Pin would be connected to GPIO 23.

The order for declaring the Echo Pin for the Ultrasonic Sensor is as follows:

[source, yaml]
----
digital-output:
ultra-sonic-echo:
address: 24
----
So the Echo Pin would be connected to GPIO 24.

===== Constructors

[source, java]
----
include::../../../../../../pi4micronaut-utils/src/main/java/com/opensourcewithslu/inputDevices/UltraSonicSensorHelper.java[tag=const]
----

===== Methods

[source, java]
----
include::../../../../../../pi4micronaut-utils/src/main/java/com/opensourcewithslu/inputDevices/UltraSonicSensorHelper.java[tags=method]
----

===== An Example Controller

====== This controller uses the push button to turn an LED on and off
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not related to ultrasonic


[source, java]
----
include::../../../../../../components/src/main/java/com/opensourcewithslu/components/controllers/UltraSonicSensorController.java[tag=ex]
----
2 changes: 2 additions & 0 deletions pi4micronaut-utils/src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ include::components/inputComponents/rfidScanner.adoc[]

include::components/inputComponents/photosensor.adoc[]

include::components/inputComponents/ultraSonicSensor.adoc[]


include::components/outputComponents.adoc[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ public class UltraSonicSensorHelper {
* @param triggerPin The DigitalOutput pin for triggering the ultrasonic sensor.
* @param echoPin The DigitalInput pin for receiving the echo from the ultrasonic sensor.
*/
public UltraSonicSensorHelper(DigitalOutput triggerPin, DigitalInput echoPin) {
//tag::const[]
public UltraSonicSensorHelper(DigitalOutput triggerPin, DigitalInput echoPin)
//end::const[]
{
this.triggerPin = triggerPin;
this.echoPin = echoPin;
initialize();
Expand All @@ -32,7 +35,10 @@ public UltraSonicSensorHelper(DigitalOutput triggerPin, DigitalInput echoPin) {
/**
* Initializes the Ultrasonic Sensor
*/
public void initialize() {
//tag::method[]
public void initialize()
//end::method[]
{
log.info("Ultrasonic Sensor Initialized");
sensorActive = true;
// TriggerPin is low initially
Expand All @@ -42,7 +48,10 @@ public void initialize() {
/**
* Begins measuring distance from sensor calling triggerAndMeasureDistance function every 100 milliseconds
*/
public void startMeasuring() {
//tag::method[]
public void startMeasuring()
//end::method[]
{
if (!sensorActive) {
return;
}
Expand Down Expand Up @@ -110,7 +119,10 @@ private void calculateDistance(long durationInNano) {
*
* @return The distance value in centimeters.
*/
public double getDistanceInCentimeter() {
//tag::method[]
public double getDistanceInCentimeter()
//end::method[]
{
return distance;
}

Expand All @@ -119,14 +131,20 @@ public double getDistanceInCentimeter() {
*
* @return The distance value in meters.
*/
public double getDistanceInMeters() {
//tag::method[]
public double getDistanceInMeters()
//end::method[]
{
return distance/100;
}

/**
* Shuts down ultrasonic sensor
*/
public void stopMeasuring() {
//tag::method[]
public void stopMeasuring()
//end::method[]
{
sensorActive = false;
if (!executorService.isShutdown()) {
executorService.shutdownNow();
Expand Down
Loading