FeenixMakers/corridor_control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove random data and related started concept

Browse Source
This commit is contained in:
Torsten 2021-07-25 18:53:58 +03:00
parent e695930268
commit ad43cdea35
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fan_control/include/collector.hpp
View File

@ -25,8 +25,6 @@ protected:
int week_counter = 0; int week_counter = 0;
int month_counter = 0; int month_counter = 0;
boolean started = false;
void add_month(int from ) ; void add_month(int from ) ;
void switch_logic(float in , float out); void switch_logic(float in , float out);

28
fan_control/src/collector.cpp
View File

@ -22,32 +22,21 @@ DHT dht_in(1, DHT11); // D2 on mini , tx, 01 on basic
DHT dht_out(3, DHT11); // D1 on mini , rx 03 on basic DHT dht_out(3, DHT11); // D1 on mini , rx 03 on basic
Collector collector; Collector collector;
float min_ran = 10;
float max_ran = 30;
float next_rand( float old ){
float f = old + random(-10 , 10) / 100.0 ;
if( f > max_ran) f = max_ran ;
if( f < min_ran) f = min_ran ;
return f;
}
void collector_setup(){ void collector_setup(){
// Initialize device. // Initialize device.
dht_in.begin(); dht_in.begin();
dht_out.begin(); dht_out.begin();
float last_in = 20;
float last_out = 20;
for( int a = 0; a < PER_HOUR*WEEK ; a += 1 ) {
collector.add_week( last_in , last_out );
last_in = next_rand(last_in);
last_out = next_rand(last_out);
}
pinMode(RELAY_BUILTIN , OUTPUT); pinMode(RELAY_BUILTIN , OUTPUT);
digitalWrite( RELAY_BUILTIN , LOW); digitalWrite( RELAY_BUILTIN , LOW);
collector.start(); collector.start();
} }
void Collector::start(){
week_counter = 0;
month_counter = 0;
}
void collector_loop(){ void collector_loop(){
delay(DELAY); delay(DELAY);
// Get temperature event and print its value. // Get temperature event and print its value.
@ -72,14 +61,7 @@ void Collector::add(float in , float out)
} }
} }
void Collector::start(){
started = true;
week_counter = 0;
month_counter = 0;
}
void Collector::switch_logic(float in , float out){ void Collector::switch_logic(float in , float out){
if( !started ) return ;
if(out > (in + 1.0) ){ if(out > (in + 1.0) ){
digitalWrite( RELAY_BUILTIN , HIGH); digitalWrite( RELAY_BUILTIN , HIGH);
DEBUG_OUT.println("Switching on" ); DEBUG_OUT.println("Switching on" );