File tree Expand file tree Collapse file tree 4 files changed +8
-9
lines changed Expand file tree Collapse file tree 4 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -71,8 +71,8 @@ lib_deps =
71
71
adafruit/Adafruit TouchScreen
72
72
adafruit/Adafruit MQTT Library
73
73
bblanchon/ArduinoJson
74
- https://github.com/PaulStoffregen/OneWire .git
75
- https://github.com/milesburton /Arduino-Temperature-Control-Library.git
74
+ https://github.com/pstolarz/OneWireNg .git
75
+ https://github.com/pstolarz /Arduino-Temperature-Control-Library.git# OneWireNg
76
76
https://github.com/Sensirion/arduino-sht.git
77
77
https://github.com/Sensirion/arduino-i2c-scd4x.git
78
78
https://github.com/Sensirion/arduino-i2c-sen5x.git
Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ Wippersnapper_V2::Wippersnapper_V2() {
71
71
// Initialize controller classes
72
72
WsV2.digital_io_controller = new DigitalIOController ();
73
73
WsV2.analogio_controller = new AnalogIOController ();
74
+ WsV2._ds18x20_controller = new DS18X20Controller ();
74
75
};
75
76
76
77
/* *************************************************************************/
Original file line number Diff line number Diff line change 32
32
#include " protos/checkin.pb.h"
33
33
#include " protos/digitalio.pb.h"
34
34
#include " protos/signal.pb.h"
35
+ #include " protos/ds18x20.pb.h"
35
36
36
37
// External libraries
37
38
#include " Adafruit_MQTT.h" // MQTT Client
52
53
#include " components/sensor/model.h"
53
54
#include " components/digitalIO/controller.h"
54
55
#include " components/analogio/controller.h"
56
+ #include " components/ds18x20/controller.h"
55
57
56
58
57
59
// Components (API v1)
@@ -114,6 +116,7 @@ class CheckinModel;
114
116
class SensorModel ;
115
117
class DigitalIOController ;
116
118
class AnalogIOController ;
119
+ class DS18X20Controller ;
117
120
118
121
/* *************************************************************************/
119
122
/* !
@@ -220,6 +223,7 @@ class Wippersnapper_V2 {
220
223
DigitalIOController
221
224
*digital_io_controller; // /< Instance of DigitalIO controller class
222
225
AnalogIOController *analogio_controller; // /< Instance of AnalogIO controller
226
+ DS18X20Controller *_ds18x20_controller; // /< Instance of DS18X20 controller
223
227
224
228
// TODO: does this really need to be global?
225
229
uint8_t _macAddrV2[6 ]; /* !< Unique network iface identifier */
Original file line number Diff line number Diff line change 15
15
#ifndef WS_DS18X20_HARDWARE_H
16
16
#define WS_DS18X20_HARDWARE_H
17
17
#include " Wippersnapper_V2.h"
18
- #include < DallasTemperature.h>
19
18
20
19
struct DS18X20_Pin {
21
20
// Specific to the DS18X20 sensor object
22
- OneWire
23
- *oneWire; // /< Ptr reference to the OneWire bus object used by this pin
24
- DallasTemperature
25
- *dallasTempObj; // /< Pointer to a DallasTemperature sensor object
26
- DeviceAddress dallasTempAddr; // /< Temperature sensor's address
21
+ // TODO: Implement this!
27
22
// From the PB model
28
23
char onewire_pin[5 ]; // /< Pin utilized by the OneWire bus, used for addressing
29
24
float period; // /< The desired period to read the sensor, in seconds
@@ -44,7 +39,6 @@ class DS18X20Hardware {
44
39
public:
45
40
DS18X20Hardware ();
46
41
~DS18X20Hardware ();
47
-
48
42
private:
49
43
std::vector<DS18X20_Pin> _DS18X20_Pins; // /< Vector of analogio pins
50
44
};
You can’t perform that action at this time.
0 commit comments