From cc410aff0cc3071235c968423c3eaadf4128f2e9 Mon Sep 17 00:00:00 2001
From: kristjan-komlosi <kristjan.komlosi@gmail.com>
Date: Wed, 28 Jun 2017 13:51:49 +0200
Subject: [PATCH] Update avtosenzor.py

---
 avtosenzor.py | 85 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 65 insertions(+), 20 deletions(-)

diff --git a/avtosenzor.py b/avtosenzor.py
index f52a7a9..70b1b16 100644
--- a/avtosenzor.py
+++ b/avtosenzor.py
@@ -5,43 +5,86 @@ import time
 import ne555 as ne
 import math
 import display
+import sys
 
+def dane(vpr='Potrdi(d/n)->'):
+     str=input(vpr)
+     if str=='d':
+          return True
+     else:
+          return False
+
+
+try:
+     display.init()
+     from display import oled
+except:
+     print('Napaka OLED!')
+     if dane('Resetiram(d/n)->'):
+          machine.reset()
+     
+
+oled.text('OLED deluje!',0,0)
+oled.show()
 #Offline firmware za Vremensko postajo PTIT FE 2017
-svet=ADC(0)    #svetloba
-pin12=tipka=Pin(12, Pin.IN)    #tipka
-pin13=statusled=Pin(13, Pin.OUT) #status LED
-pin15=alertled=Pin(15, Pin.OUT ) #alert LED
-dsb.setup(0)
+try:
+     svet=ADC(0)    #svetloba
+     pin12=tipka=Pin(12, Pin.IN)    #tipka
+     pin13=statusled=Pin(13, Pin.OUT) #status LED
+     pin15=alertled=Pin(15, Pin.OUT ) #alert LED
+except:
+     print('Napaka I/O!')
+     if dane('Resetiram(d/n)->'):
+          machine.reset()
 
-display.init()
-from display import oled
+oled.text('I/O postavljen!',0,10)
+oled.show()
+try:
+     dsb.setup(0)
+except:
+     print('Napaka Temp. senzorja!')
+     if dane('Resetiram(d/n)->'):
+          machine.reset()
+
+oled.text('TS postavljen!',0,20)
+oled.show()
+time.sleep(1)
 
-oled.invert(1)
 oled.fill(0)
-oled.text('NodeMCU:ON',10 ,25)
-oled.text('Hello World!',10,35)
+oled.text('<-------------->', 0, 15)
+oled.text('<NodeMCU Senzor>', 0, 25)
+oled.text('<-------------->', 0, 35)
+oled.text(' !Pozdravljeni! ', 0, 50)
 oled.show()
-oled.invert(0)
+
+time.sleep_ms(750)
 oled.show()
+
 time.sleep(2)
 oled.fill(0)
 oled.show()
+
 statusled.value(1)
 alertled.value(0)
 
+def konec(p):
+     exit=1
+
+exit=0
 temp=0
 svetloba=0
-exit=0
 while tipka.value():
-     oled.fill(0)
+     oled.text('BUSY...',70,55)
      alertled.value(1)
+     oled.show()
+     oled.fill(0)
      try:
           temp=dsb.read_temp()
      except:
           print('Napaka v branju temperature!')
           temp='NAPAKA'
      finally:
-          oled.text('Temp.: ' + str(temp),15,10)
+          oled.text('T: ' + str(temp) + 'C',15,10)
 
      try:
           svetloba=svet.read()
@@ -49,7 +92,7 @@ while tipka.value():
           print('Napaka v branju svetlobe!')
           svetloba='NAPAKA'
      finally:
-          oled.text('Svetlost: ' + str(svetloba),15,20)
+          oled.text('S: ' + str(svetloba) + ' enot',15,20)
 
      try:
           vlaga=ne.main()
@@ -57,17 +100,19 @@ while tipka.value():
           print('Napaka v branju vlage!')
           vlaga='NAPAKA'
      finally:
-          oled.text('Vlaga: ' + str(vlaga), 15, 30)
+          oled.text('RH: ' + str(vlaga) +' Hz', 15, 30)
      oled.text('NodeMCU Senzor',0,0)
-     oled.text('Copyright 2017',5,45)
-     oled.text('Kristjan Komlosi',1,55)
+     oled.text('Uptime: ' + str(time.time()) + 's',5,45)
      oled.show()
      alertled.value(0)
      time.sleep(2)
      
+
 oled.fill(0)
-oled.text('GOODBYE! :)', 15, 35)
+oled.text('<-------------->', 0, 15)
+oled.text('<NodeMCU Senzor>', 0, 25)
+oled.text('<-------------->', 0, 35)
+oled.text('  !Nasvidenje!  ', 0, 50)
 oled.show()
 time.sleep(1.5)
 oled.poweroff()
-