eeeck/the-waterinator
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename functions name for better code clarity

Browse Source
This commit is contained in:
Erick
2025-05-15 22:08:36 +02:00
parent 412354fe88
commit cf3230c470
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/atmega/include/config.h
+8
View File
@@ -1,6 +1,8 @@
#ifndef CONFIG_H #ifndef CONFIG_H
#define CONFIG_H #define CONFIG_H
//#define VASE_NUM 0
#define MOISTURE_SENSOR_A0 PC0 #define MOISTURE_SENSOR_A0 PC0
#define MOISTURE_SENSOR_A1 PC1 #define MOISTURE_SENSOR_A1 PC1
#define MOISTURE_SENSOR_A2 PC2 #define MOISTURE_SENSOR_A2 PC2
@@ -12,6 +14,12 @@
//#define MOISTURE_SENSOR_A6 PC6 //#define MOISTURE_SENSOR_A6 PC6
//#define MOISTURE_SENSOR_A7 PC7 //#define MOISTURE_SENSOR_A7 PC7
// You may connect only the number of pumps that actually are needed in the vase
#define PUMP_D3 PD3
#define PUMP_D4 PD4
#define PUMP_D5 PD5
#define PUMP_D6 PD6
#define PUMP_D7 PD7
#define SENSOR_READINGS 5 #define SENSOR_READINGS 5
#define SENSORS_NUM 6 #define SENSORS_NUM 6
firmware/atmega/include/moisture.h
+4 -4
View File
@@ -4,10 +4,10 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
void initMoistureSensors(void); void sensorsInit(void);
void triggerSensorsRead(void); void triggerRead(void);
int16_t moistureSensorsAverage(int8_t sensorPin); int16_t moistureAverage(int8_t sensorPin);
int16_t readMoisture(void); int16_t moistureRead(void);
extern volatile bool readSensors; extern volatile bool readSensors;
firmware/atmega/source/main.c
+6 -7
View File
@@ -7,7 +7,7 @@
#include "adc.h" #include "adc.h"
ISR(WDT_vect) { ISR(WDT_vect) {
triggerSensorsRead(); triggerRead();
} }
void watchdogs(void) { void watchdogs(void) {
@@ -27,7 +27,8 @@ void enterSleep(void) {
void setup(void) { void setup(void) {
adcInit(); adcInit();
initMoistureSensors(); //pumpsInit();
sensorsInit();
watchdogs(); watchdogs();
} }
@@ -36,12 +37,10 @@ int main(void) {
while(true) { while(true) {
if (readSensors) { if (readSensors) {
int16_t result = readMoisture(); int16_t result = moistureRead();
//espSend(VASE_NUM, result)
//TODO: send result to esp32
} }
// readFromEsp() // if(espGet("ask if i need to water plants") == true) {trigger()}
// if esp tells to water plants: waterPlants()
enterSleep(); enterSleep();
} }
return 0; return 0;
firmware/atmega/source/moisture.c
+5 -5
View File
@@ -8,7 +8,7 @@
volatile bool readSensors = false; volatile bool readSensors = false;
void initMoistureSensors(void) { void sensorsInit(void) {
// Set as input // Set as input
DDRC &= ~((1 << MOISTURE_SENSOR_A0) | DDRC &= ~((1 << MOISTURE_SENSOR_A0) |
(1 << MOISTURE_SENSOR_A1) | (1 << MOISTURE_SENSOR_A1) |
@@ -29,11 +29,11 @@ void initMoistureSensors(void) {
//(1 << MOISTURE_SENSOR_A7)); //(1 << MOISTURE_SENSOR_A7));
} }
void triggerSensorsRead(void) { void triggerRead(void) {
readSensors = true; readSensors = true;
} }
int16_t moistureSensorsAverage(int8_t sensorPin) { int16_t moistureAverage(int8_t sensorPin) {
int16_t sum = 0; int16_t sum = 0;
for (int i = 0; i < SENSOR_READINGS; i++) { for (int i = 0; i < SENSOR_READINGS; i++) {
sum += adcRead(sensorPin); sum += adcRead(sensorPin);
@@ -44,7 +44,7 @@ int16_t moistureSensorsAverage(int8_t sensorPin) {
return sum / SENSOR_READINGS; return sum / SENSOR_READINGS;
} }
int16_t readMoisture(void) { int16_t moistureRead(void) {
uint8_t sensorPins[SENSORS_NUM] = { MOISTURE_SENSOR_A0, MOISTURE_SENSOR_A1, uint8_t sensorPins[SENSORS_NUM] = { MOISTURE_SENSOR_A0, MOISTURE_SENSOR_A1,
MOISTURE_SENSOR_A2, MOISTURE_SENSOR_A3, MOISTURE_SENSOR_A2, MOISTURE_SENSOR_A3,
MOISTURE_SENSOR_A4, MOISTURE_SENSOR_A5 }; MOISTURE_SENSOR_A4, MOISTURE_SENSOR_A5 };
@@ -53,7 +53,7 @@ int16_t readMoisture(void) {
int16_t overallSum = 0; int16_t overallSum = 0;
for (int i = 0; i < SENSORS_NUM; i++) { for (int i = 0; i < SENSORS_NUM; i++) {
int16_t sensorAverage = moistureSensorsAverage(sensorPins[i]); int16_t sensorAverage = moistureAverage(sensorPins[i]);
//TODO: if a sensor gives 0 or 1023, discard that sensor entirely (means it is disconnected or not working) //TODO: if a sensor gives 0 or 1023, discard that sensor entirely (means it is disconnected or not working)
overallSum += sensorAverage; overallSum += sensorAverage;
} }