Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
88ed293
start scaffolding for sensor
arfrie22 Jul 8, 2025
fdb625a
ads1115 support for esp and ospi
arfrie22 Jul 9, 2025
8c58b8b
Wrote code for esp from scratch
arfrie22 Jul 9, 2025
ee0a531
fix submodules
arfrie22 Jul 9, 2025
e6190ca
fix i2cd.h
arfrie22 Jul 9, 2025
14e3ac1
fix print
arfrie22 Jul 9, 2025
b3e8d9b
fix import
arfrie22 Jul 9, 2025
f5114e1
added missing semicolon
arfrie22 Jul 9, 2025
67d3381
add virtual deconsturctor for analogsensor interface
arfrie22 Jul 9, 2025
dbaf646
only include i2c in the c block for i2cd.h
arfrie22 Jul 9, 2025
591ff82
fix interface again
arfrie22 Jul 9, 2025
9f032f3
add mutex for i2cd.h
arfrie22 Jul 9, 2025
840d932
fix init
arfrie22 Jul 9, 2025
73bdfc8
fix i2c
arfrie22 Jul 9, 2025
dd4e733
Working ads 1115 impl
arfrie22 Jul 10, 2025
b6de2dd
test smt50
arfrie22 Jul 10, 2025
dfb2623
add sensor class
arfrie22 Jul 10, 2025
77ad166
inital setup of sensors and endpoint to get them
arfrie22 Jul 11, 2025
86fef74
add delete sensor
arfrie22 Jul 11, 2025
67eba7d
move sensors over to define to allow them to be disabled
arfrie22 Jul 11, 2025
5ddcba9
current analog setup with endpoints
arfrie22 Jul 15, 2025
e36c292
added logs and saving / loading of sensors from flash
arfrie22 Jul 16, 2025
fef742a
Store sensor data in flash not memory and make weather sensor class l…
arfrie22 Jul 17, 2025
5ce6e67
remove serial.printf
arfrie22 Jul 17, 2025
3d1f232
change pagination to cursor instead of skip for reading sensor log
arfrie22 Jul 17, 2025
90f8268
Current sensor code, littlefs makes this too slow on each read/write
arfrie22 Jul 21, 2025
5d8d9e6
Temp disabled logging sensors since it would add 4s of latency
arfrie22 Jul 21, 2025
6affe86
split log file into multiple files to make it a reasonable speed on l…
arfrie22 Jul 23, 2025
cb00122
added HTML_INTERNAL_ERROR (0x50) for error codes
arfrie22 Jul 23, 2025
0a57e3e
switch include bracket to quote
arfrie22 Jul 23, 2025
4d1a86f
add cmath to fix nan issue on docker
arfrie22 Jul 23, 2025
cc50109
fix printf type from sizet to uint16t
arfrie22 Jul 23, 2025
fc414e7
add file commands for linux
arfrie22 Jul 23, 2025
60a9439
fix read write to not cause race condition
arfrie22 Jul 23, 2025
d94e024
fix fwrite
arfrie22 Jul 23, 2025
db5285d
add i2c detect
arfrie22 Jul 23, 2025
07ec96e
add limits include for the server
arfrie22 Jul 23, 2025
1e8bcdc
fix demo using bus
arfrie22 Jul 23, 2025
4b7f719
Fix sensor reading for more than 1 sensor, made it so sensor's inital…
arfrie22 Aug 1, 2025
ab5a6a2
Added sensor adjustments for programs
arfrie22 Aug 4, 2025
cea79c4
gate the adjustments inside of a defined block for demo
arfrie22 Aug 4, 2025
d2f738c
removed dsa which doesn't exist
arfrie22 Aug 4, 2025
d039d2d
allowed jsn to give information specific to sensor type
arfrie22 Aug 4, 2025
4ec2b8d
fix json
arfrie22 Aug 4, 2025
540ad16
Try to fix compilation on docker
arfrie22 Aug 4, 2025
a171650
update otf
arfrie22 Aug 4, 2025
e3ac642
update otf
arfrie22 Aug 4, 2025
c88b17e
move numeric limits to above bfiller.h
arfrie22 Aug 4, 2025
f103fd5
include types.h
arfrie22 Aug 4, 2025
5dfe115
added missing include for opensprinkler server
arfrie22 Aug 4, 2025
d824039
added missing stdarg
arfrie22 Aug 4, 2025
018968a
switch to using points to describe function instead of piecewise
arfrie22 Aug 6, 2025
76f80ec
ensure that points are entered in order
arfrie22 Aug 6, 2025
9d05165
use std limits infinity
arfrie22 Aug 6, 2025
e7b8791
added sensor type to json
arfrie22 Aug 6, 2025
2bf808b
add sensors flags to disable sensor/logging, and fixed the json outpu…
arfrie22 Aug 7, 2025
1e18d32
add clearing sensor log
arfrie22 Aug 7, 2025
300d710
make it so sensor adjustments can't have two points with the same x v…
arfrie22 Aug 8, 2025
343f5e1
start of dynamically generating sensor page
arfrie22 Aug 18, 2025
e2149cc
faught with C++ to make it easier to print out enum names
arfrie22 Aug 18, 2025
303cae7
update enums
arfrie22 Aug 19, 2025
40ca5ac
Update sensor description json
arfrie22 Aug 20, 2025
0dd5ad0
fix json
arfrie22 Aug 21, 2025
52c4387
add default option to json
arfrie22 Aug 21, 2025
4648626
flush buffer to prevent stack smashing
arfrie22 Aug 21, 2025
e5bcdb8
fix ensemble sensor
arfrie22 Aug 21, 2025
854dd57
add default option to flags
arfrie22 Aug 21, 2025
ccba75f
fixed ads1115 pin json
arfrie22 Aug 25, 2025
65e28d4
made ensemble sensor use a drop down to select sensors
arfrie22 Aug 25, 2025
8f1a38f
made sensor interval in minutes, fixed reading sensors, made ensemble…
arfrie22 Aug 25, 2025
6342b50
fix null ptr and move sen adj to be in the program endpoint
arfrie22 Aug 29, 2025
dca0f19
Merge remote-tracking branch 'origin/dev/221_3' into analog-rewrite
arfrie22 Aug 29, 2025
f092bc6
merge 2.2.1(4)
rayshobby Nov 17, 2025
39db235
remove AVR support
rayshobby Nov 18, 2025
6651fc3
remove AVR from this firmware
rayshobby Nov 18, 2025
c68b7e3
fix merge conflicts
rayshobby Nov 18, 2025
3ed4c55
fix dec2hexchar issue
rayshobby Nov 18, 2025
e3487c2
fix macro defines so the firmware compiled in demo
rayshobby Nov 18, 2025
6871c27
fix indentation and fix typo (inital->initial)
rayshobby Nov 19, 2025
18d4613
fix minor issues with i2cd
rayshobby Nov 22, 2025
5c66a48
fix ospi compilation error
rayshobby Nov 22, 2025
baa171c
make time type consistent (uint32_t)
rayshobby Dec 6, 2025
92a3aa3
recover sensor.cpp back to original for saving RAM/flash memory consu…
rayshobby Dec 6, 2025
08a38fd
use stack variables
rayshobby Jan 22, 2026
c8d2c57
change sensor value type from double to float; set default sampling i…
rayshobby Apr 12, 2026
03fc4de
adopt placement new to allow statically allocated sensor object, elim…
rayshobby Apr 13, 2026
8780099
change notifier to use circular array queue instead of linked list, t…
rayshobby Apr 13, 2026
79b7f34
fix demo compilation error
rayshobby Apr 13, 2026
8c701e9
fix docker build error
rayshobby Apr 13, 2026
3948de7
adjust the conversative size of tmp_buffer and ether_buffer
rayshobby Apr 13, 2026
c3fdf24
adjust overflow buffer size; improve email feature to support local s…
rayshobby Apr 16, 2026
6a8c5f5
revise sensor log, change log data structure, optimize each log file …
rayshobby Apr 25, 2026
b4ec2b1
move sensor logs to /logs/ subfolder; set a cap to the sprinkler log …
rayshobby Apr 25, 2026
c33bdbf
add support for Master3 and Master4; add support for expanding iopt o…
rayshobby Apr 26, 2026
93d7eed
restructure sensor adjustment data file; change to lazy file creation…
rayshobby Apr 26, 2026
d7c55df
add uuid for sensors to reference them by unique ids instead of posit…
rayshobby Apr 26, 2026
33f8dcf
reorganize SensorAdjustment class, move its read and write functions …
rayshobby Apr 26, 2026
d9cc50d
rearrange some sensor related functions to the sensor.h and .cpp file…
rayshobby Apr 27, 2026
95212ef
fix sens.dat writing bug; add utility API to list and delete flash fi…
rayshobby Apr 27, 2026
3d2782b
fix bug in get_sensor_adjustment; fix where get_sensor_adjustment is …
rayshobby Apr 27, 2026
e4d1472
add rate limit to poll_sensors in main loop; add sensor_adjustment fa…
rayshobby Apr 27, 2026
09f43e6
fix sensor add bug
rayshobby Apr 27, 2026
3b55398
fix sensor find_index bug; reformat sensor adj in /jp output
rayshobby Apr 27, 2026
407de9f
update sensor log endpoint names to make them consistent with the oth…
rayshobby Apr 28, 2026
26f9881
change bfill to use res.write callback, this eliminates the need to h…
rayshobby Apr 28, 2026
4b302d4
support multiple formats of /jsl output, in particular, it support a …
rayshobby Apr 29, 2026
68c1289
refactor sensors: put them in sensors subfolder. update sensor descri…
rayshobby Apr 29, 2026
eeeb9be
add missing sensors folder
rayshobby Apr 29, 2026
dc1b290
rename some variable and class names; remove scale and offset from ba…
rayshobby Apr 29, 2026
cb82295
remove min/max from aggregate sensor children fields as those are not…
rayshobby Apr 30, 2026
1b2a9ac
modify sens.dat layout to make it more future proof (in case we need …
rayshobby Apr 30, 2026
d92ffc1
add sensor::status, supporting indicator of whether sensor reading is…
rayshobby Apr 30, 2026
70248d4
add 'usa' parameter for manual_start_program to allow applying sensor…
rayshobby May 1, 2026
6f1f96f
remove redundant check
rayshobby May 1, 2026
2034896
rename SensorAdjustment::flag to reserved since for now this variable…
rayshobby May 1, 2026
7551b1d
revert back to use SensorAdjustment::flag as it allows indepenently t…
rayshobby May 1, 2026
bf44c70
suport mock ads1115 for LInux/Demo; given all platforms now support s…
rayshobby May 2, 2026
eef0d43
temporarily change the forward declaration of millis back until we ch…
rayshobby May 2, 2026
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "external/TinyWebsockets"]
path = external/TinyWebsockets
url = https://github.com/gilmaimon/TinyWebsockets.git
[submodule "external/influxdb-cpp"]
path = external/influxdb-cpp
url = https://github.com/orca-zhang/influxdb-cpp.git
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/raspberrypi-archive-keyring.gpg] ht
## 1st stage compiles OpenSprinkler code
FROM base AS os-build

ARG BUILD_VERSION="DEMO"
ARG BUILD_VERSION="OSPI"

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y bash g++ make libmosquittopp-dev libssl-dev libi2c-dev liblgpio-dev
Expand Down
2 changes: 1 addition & 1 deletion EMailSender.h
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ class EMailSender {
bool isSASLLogin = false;

bool useAuth = true;
bool isCramMD5Login = false;
bool isCramMD5Login = false;

String _serverResponce;

Expand Down
5 changes: 0 additions & 5 deletions I2CRTC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
23 Dec 2013 -- modified by Ray Wang (Rayshobby LLC) to add support for MCP7940
*/


#if defined(ARDUINO)

#include "I2CRTC.h"
#include <Wire.h>

Expand Down Expand Up @@ -159,5 +156,3 @@ uint8_t I2CRTC::bcd2dec(uint8_t num)
}

I2CRTC RTC = I2CRTC(); // create an instance for the user

#endif
5 changes: 1 addition & 4 deletions I2CRTC.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
*/


#ifndef I2CRTC_h
#define I2CRTC_h
#pragma once

#define DS1307_ADDR 0x68
#define MCP7940_ADDR 0x6F
Expand Down Expand Up @@ -35,5 +34,3 @@ class I2CRTC

extern I2CRTC RTC;

#endif

Loading
Loading