diff --git a/main.c b/main.c index 9cc553d..e5df944 100644 --- a/main.c +++ b/main.c @@ -6,9 +6,26 @@ int enc_val, last_enc_val; long dht_Draw_idle=0; bool dht_enabled = false; -#include "DHT_22.h" -#include "Encoder.h" -#include "timers.h" +#include "dht.h" +#include "enc.h" + +ISR(TIMER1_CAPT_vect) +{ + TCNT1 = 0; + DHT_get_bit(); +} + +// Прерывание таймера +ISR(TIMER0_COMPA_vect) +{ + T0_CA(); +} + +// Прерывание TIMER0_COMPA_vectтаймера +ISR(TIMER1_COMPA_vect) +{ + T1_CA(); +} // Настройка void setup() { @@ -31,18 +48,12 @@ void loop() { // Читаем данные с DHT dht_enabled = dht_check(); - dht_Draw_idle++; - if ( dht_Draw_idle>160000 ){ - dht_Draw_idle = 0; if ( dht_enabled ){ Serial.print( dht_humidity() ); Serial.print("% "); Serial.print( dht_temperature() ); Serial.println("C"); } - } - -// Serial.println("Enc [" + (String)enc_val + "] "); enc_val = encoder_value(); bool Draw = false; @@ -54,4 +65,6 @@ void loop() { if (Draw) { Serial.println("Enc [" + (String)enc_val + "] "); } + + } \ No newline at end of file