Commit c457d435 authored by ryan.whiteley's avatar ryan.whiteley

all thinkspeak feeds working again for both soil sensors, average and cpu temp

parent 5e6b743f
...@@ -27,9 +27,15 @@ def adc_setup(): ...@@ -27,9 +27,15 @@ def adc_setup():
'use: iscdetect -y 1 to investigate I2C address') 'use: iscdetect -y 1 to investigate I2C address')
exit(-1) exit(-1)
def cpu_temp_finder():
temp = open('/sys/class/thermal/thermal_zone0/temp')
cpu_temp = temp.read()
temp.close()
return '{:.1f}'.format(float(cpu_temp)/1000) + ' c'
#main driver for measurments and MQTT #main driver for measurments and MQTT
def main_loop(channel):#insert channel variable when setting up thingspeak def main_loop(channel):#insert channel variable when setting up thingspeak
#LCD initialisation goes here
try: try:
#get sensor reading and percentage conversions #get sensor reading and percentage conversions
...@@ -39,20 +45,25 @@ def main_loop(channel):#insert channel variable when setting up thingspeak ...@@ -39,20 +45,25 @@ def main_loop(channel):#insert channel variable when setting up thingspeak
soil_two_percent = ((soil_two - two_dry_reading) * 100)/(two_wet_reading - two_dry_reading) soil_two_percent = ((soil_two - two_dry_reading) * 100)/(two_wet_reading - two_dry_reading)
soil_avg = (soil_one_percent + soil_two_percent) / 2 soil_avg = (soil_one_percent + soil_two_percent) / 2
temp = open('/sys/class/thermal/thermal_zone0/temp')
cpu_temp = temp.read()
temp.close()
cpu_ts = '{:.1f}'.format(float(cpu_temp)/1000)
print(soil_one) print(soil_one)
print(soil_two) print(soil_two)
print('soil one: %d%%' % soil_one_percent) print('soil one: %d%%' % soil_one_percent)
print('soil two: %d%%' % soil_two_percent) print('soil two: %d%%' % soil_two_percent)
print('soil average: %d%%' % soil_avg) print('soil average: %d%%' % soil_avg)
print('CPU temp @: ', cpu_ts)
#publish sensor info to MQTT server #publish sensor info to MQTT server
#publish.single(mqtt_soil_path_one, stuff, hostname= mqtt_soil_server) #publish.single(mqtt_soil_path_one, stuff, hostname= mqtt_soil_server)
#send to thingspeak #send to thingspeak
test = 5 test = 5
response = channel.update({'field1': soil_one_percent, 'field2': soil_two_percent, 'field3': soil_avg, 'field4': test}) response = channel.update({'field1': soil_one_percent, 'field2': soil_two_percent, 'field3': soil_avg, 'field4': cpu_ts})
#print to the LCD display #print to the LCD display
except: except:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment