From 3dca24a1e5d6a96df23c0085e1f6dc6c9a6d8633 Mon Sep 17 00:00:00 2001
From: Manon MALIQUE <manon.malique@irit.fr>
Date: Tue, 5 Mar 2024 10:29:28 +0100
Subject: [PATCH] Correcting bugs
---
neosensor/libraries/neocampus_modules/airquality.h | 2 +-
neosensor/libraries/neocampus_modules/base.h | 6 ------
neosensor/libraries/neocampus_modules/humidity.h | 2 +-
neosensor/libraries/neocampus_modules/luminosity.h | 2 +-
neosensor/libraries/neocampus_modules/temperature.h | 2 +-
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/neosensor/libraries/neocampus_modules/airquality.h b/neosensor/libraries/neocampus_modules/airquality.h
index 0c0c965e..ae061dab 100644
--- a/neosensor/libraries/neocampus_modules/airquality.h
+++ b/neosensor/libraries/neocampus_modules/airquality.h
@@ -96,7 +96,7 @@ class airquality : public base {
/*
* protected methods
*/
- float calibrate(uint8_t _sensor) override;
+ float calibrate(uint8_t _sensor);
};
diff --git a/neosensor/libraries/neocampus_modules/base.h b/neosensor/libraries/neocampus_modules/base.h
index 90616189..611bcee7 100644
--- a/neosensor/libraries/neocampus_modules/base.h
+++ b/neosensor/libraries/neocampus_modules/base.h
@@ -103,12 +103,6 @@ class base {
// analog value need to get sent
boolean _trigger;
- //Manon
- /*
- * public virtual functions
- */
- virtual float calibrate(uint8_t _sensor) = 0;
-
private:
/*
* private methods
diff --git a/neosensor/libraries/neocampus_modules/humidity.h b/neosensor/libraries/neocampus_modules/humidity.h
index 190acd58..e75d516c 100644
--- a/neosensor/libraries/neocampus_modules/humidity.h
+++ b/neosensor/libraries/neocampus_modules/humidity.h
@@ -97,7 +97,7 @@ class humidity : public base {
/*
* protected methods
*/
- float calibrate(uint8_t _sensor) override;
+ float calibrate(uint8_t _sensor);
};
diff --git a/neosensor/libraries/neocampus_modules/luminosity.h b/neosensor/libraries/neocampus_modules/luminosity.h
index 200278d9..b72be91f 100644
--- a/neosensor/libraries/neocampus_modules/luminosity.h
+++ b/neosensor/libraries/neocampus_modules/luminosity.h
@@ -100,7 +100,7 @@ class luminosity : public base {
/*
* protected methods
*/
- float calibrate(uint8_t _sensor) override;
+ float calibrate(uint8_t _sensor);
};
diff --git a/neosensor/libraries/neocampus_modules/temperature.h b/neosensor/libraries/neocampus_modules/temperature.h
index 3e173760..d26d59f4 100644
--- a/neosensor/libraries/neocampus_modules/temperature.h
+++ b/neosensor/libraries/neocampus_modules/temperature.h
@@ -101,7 +101,7 @@ class temperature : public base {
/*
* protected methods
*/
- float calibrate(uint8_t _sensor) override;
+ float calibrate(uint8_t _sensor);
};
#endif /* _TEMPERATURE_H_ */
--
GitLab