From e29835b4f842dbd3383cae1bd8e394b6f783052e Mon Sep 17 00:00:00 2001 From: TomsBicans Date: Sat, 1 Apr 2023 18:43:30 +0300 Subject: [PATCH] fix: Created microcontroller-computer monitoring program --- .gitignore | 2 + info.txt | 2 + log/analyze.py | 51 ++ log/log.py | 5 +- log/results.csv | 439 ++++++++++++++++++ .../DS3231_TEST/7.semestris.code-workspace | 7 + main/Examples/DS3231_TEST/DS3231_TEST.ino | 199 ++++++++ main/main.ino | 3 +- 8 files changed, 706 insertions(+), 2 deletions(-) create mode 100644 info.txt create mode 100644 log/analyze.py create mode 100644 log/results.csv create mode 100644 main/Examples/DS3231_TEST/7.semestris.code-workspace create mode 100644 main/Examples/DS3231_TEST/DS3231_TEST.ino diff --git a/.gitignore b/.gitignore index 259148f..ef2a381 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ *.exe *.out *.app + +*.log \ No newline at end of file diff --git a/info.txt b/info.txt new file mode 100644 index 0000000..f31f913 --- /dev/null +++ b/info.txt @@ -0,0 +1,2 @@ +Start: 17:40 +End: 21:50 \ No newline at end of file diff --git a/log/analyze.py b/log/analyze.py new file mode 100644 index 0000000..68c5ba2 --- /dev/null +++ b/log/analyze.py @@ -0,0 +1,51 @@ +import sys +import os +import serial +import threading +import time +import os.path as path +from pathlib import Path + +LOG_DIR = path.dirname(__file__) +LOG_FILE = path.join(LOG_DIR, "measurement_data.log") + + +def get_data_lines(data: list[str]): + res = [] + for l in data: + if any(p.lower() in l.lower() for p in ["OBS", "Total"]): + continue + res.append(l) + return res + + +def get_time_lines(data: list[str]): + res = [] + for l in data: + if any(p.lower() in l.lower() for p in ["Total"]): + res.append(l) + return res + + +def write_to_file(loc: str, data: str): + with open(loc, "w") as f: + f.write(data) + return loc + + +def main(): + file = Path(LOG_FILE) + data = str(file.read_text()) + data = data.splitlines() + data = [l for l in data if l] + time_data = get_time_lines(data) + # time_data = + data = get_data_lines(data) + [print(l) for l in data] + data = "\n".join(data) + "\n" + loc = path.join(LOG_DIR, "results.csv") + write_to_file(loc, data) + + +if __name__ == "__main__": + main() diff --git a/log/log.py b/log/log.py index df26183..5d1a551 100644 --- a/log/log.py +++ b/log/log.py @@ -3,6 +3,9 @@ import serial import threading import time +import os.path as path + +LOG_FILE = path.join(path.dirname(__file__), "running_logs.log") def monitor(comport: str, baudrate: int): @@ -24,7 +27,7 @@ def monitor(comport: str, baudrate: int): # print fields # print("device ID: ", ID) # write to file - text_file = open("Pdata.log", "a") + text_file = open(LOG_FILE, "a") # line = str(TIME) + ": " + str(CT) + "\n" text_file.write(line) text_file.close() diff --git a/log/results.csv b/log/results.csv new file mode 100644 index 0000000..05d0d5e --- /dev/null +++ b/log/results.csv @@ -0,0 +1,439 @@ +time,atm_temperature,atm_humidity,atm_air_pressure,atm_air_particle,atm_air_smoke,atm_CO2_ammount,atm_sound_pressure,light_intensity,UV_intensity,quality_rating,user_likes +0,24.00,49.20,99.90,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +35046,24.10,49.20,99.90,608.33,0.00,0.00,14.98,0.00,0.00,200.00,2 +69983,24.00,49.10,99.89,127.53,0.00,0.00,14.78,0.00,0.00,200.00,2 +105131,24.00,49.30,99.89,0.00,0.00,0.00,14.87,0.00,0.00,200.00,2 +140178,24.00,49.30,99.89,0.00,0.00,0.00,14.90,0.00,0.00,200.00,2 +175224,24.00,49.10,99.89,0.00,0.00,0.00,15.18,0.00,0.00,200.00,2 +210271,24.00,49.30,99.90,0.00,0.00,0.00,14.57,0.00,0.00,200.00,2 +245317,24.00,49.50,99.90,437.00,0.00,0.00,14.28,0.00,0.00,200.00,2 +280409,24.00,49.50,99.89,0.00,0.00,0.00,15.68,0.00,0.00,200.00,2 +315456,24.00,49.70,99.90,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +350502,24.00,49.70,99.90,2707.29,0.00,0.00,15.88,0.00,0.00,200.00,2 +385353,24.00,49.90,99.90,0.00,0.00,0.00,14.32,0.00,0.00,200.00,2 +420402,24.00,49.80,99.88,0.00,0.00,0.00,16.03,0.00,0.00,200.00,2 +455452,24.10,50.20,99.89,662.05,0.00,0.00,15.52,0.00,0.00,200.00,2 +490171,24.10,49.70,99.88,2696.83,0.00,0.00,15.33,0.00,0.00,200.00,2 +525209,24.00,49.70,99.88,1441.77,0.00,0.00,16.17,0.00,0.00,200.00,2 +559962,24.00,49.70,99.87,679.62,0.00,0.00,15.15,0.00,0.00,200.00,2 +594666,24.10,49.70,99.87,2323.49,0.00,0.00,15.88,0.00,0.00,200.00,2 +630059,24.00,49.70,99.87,1070.53,0.00,0.00,15.05,0.00,0.00,200.00,2 +665275,24.00,49.70,99.87,3559.04,0.00,0.00,16.12,0.00,0.00,200.00,2 +700060,24.00,49.60,99.87,817.79,0.00,0.00,16.42,0.00,0.00,200.00,2 +735388,24.00,49.60,99.87,0.00,0.00,0.00,16.93,0.00,0.00,200.00,2 +770437,24.00,50.00,99.86,534.52,0.00,0.00,14.75,0.00,0.00,200.00,2 +805628,24.00,49.60,99.86,0.00,0.00,0.00,14.40,0.00,0.00,200.00,2 +840676,24.00,50.00,99.85,0.00,0.00,0.00,15.70,0.00,0.00,200.00,2 +875725,24.00,50.00,99.86,0.00,0.00,0.00,15.90,0.00,0.00,200.00,2 +910774,24.00,49.90,99.86,1485.00,0.00,0.00,16.58,0.00,0.00,200.00,2 +945577,24.00,50.20,99.86,0.00,0.00,0.00,13.78,0.00,0.00,200.00,2 +980625,24.00,50.20,99.85,3508.97,0.00,0.00,16.48,0.00,0.00,200.00,2 +1015591,24.00,50.30,99.85,0.00,0.00,0.00,15.28,0.00,0.00,200.00,2 +1050641,24.00,50.40,99.86,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +1085691,24.00,50.50,99.85,0.00,0.00,0.00,13.62,0.00,0.00,200.00,2 +1120740,24.00,50.50,99.85,427.97,0.00,0.00,16.58,0.00,0.00,200.00,2 +1155914,24.00,50.60,99.86,0.00,0.00,0.00,15.98,0.00,0.00,200.00,2 +1190964,24.00,50.70,99.85,2094.76,0.00,0.00,14.95,0.00,0.00,200.00,2 +1226245,24.00,50.80,99.85,130.45,0.00,0.00,15.07,0.00,0.00,200.00,2 +1261335,24.00,50.90,99.85,0.00,0.00,0.00,17.07,0.00,0.00,200.00,2 +1296384,24.00,51.10,99.85,1275.82,0.00,0.00,15.28,0.00,0.00,200.00,2 +1331314,24.10,51.20,99.84,0.00,0.00,0.00,16.28,0.00,0.00,200.00,2 +1366364,24.10,50.90,99.84,622.16,0.00,0.00,15.60,0.00,0.00,200.00,2 +1401350,24.10,50.80,99.85,4679.84,0.00,0.00,15.13,0.00,0.00,200.00,2 +1436276,24.00,51.00,99.84,0.00,0.00,0.00,15.73,0.00,0.00,200.00,2 +1471326,24.10,51.10,99.84,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +1506375,24.10,51.10,99.84,0.00,0.00,0.00,15.75,0.00,0.00,200.00,2 +1541424,24.00,51.20,99.84,2892.37,0.00,0.00,16.80,0.00,0.00,200.00,2 +1576385,24.10,51.20,99.84,0.00,0.00,0.00,16.10,0.00,0.00,200.00,2 +1611433,24.10,51.40,99.84,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +1646481,24.10,51.40,99.83,1131.18,0.00,0.00,15.35,0.00,0.00,200.00,2 +1681626,24.10,51.50,99.82,886.00,0.00,0.00,15.92,0.00,0.00,200.00,2 +1717007,24.10,51.50,99.83,0.00,0.00,0.00,15.48,0.00,0.00,200.00,2 +1752056,24.10,51.50,99.83,0.00,0.00,0.00,13.97,0.00,0.00,200.00,2 +1787106,24.10,50.90,99.83,0.00,0.00,0.00,18.53,0.00,0.00,200.00,2 +1822157,24.10,50.20,99.83,652.62,0.00,0.00,15.95,0.00,0.00,200.00,2 +1857212,24.10,49.20,99.83,932.86,0.00,0.00,13.62,0.00,0.00,200.00,2 +1892434,24.00,48.60,99.82,0.00,0.00,0.00,15.88,0.00,0.00,200.00,2 +1927483,24.00,48.40,99.82,4849.21,0.00,0.00,16.22,0.00,0.00,200.00,2 +1962488,24.00,47.90,99.82,0.00,0.00,0.00,17.68,0.00,0.00,200.00,2 +1997537,24.00,47.90,99.82,0.00,0.00,0.00,14.43,0.00,0.00,200.00,2 +2032586,24.00,47.40,99.81,0.00,0.00,0.00,15.15,0.00,0.00,200.00,2 +2067636,23.90,47.40,99.81,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +2102686,23.90,47.20,99.82,0.00,0.00,0.00,15.33,0.00,0.00,200.00,2 +2137735,23.90,46.90,99.81,0.00,0.00,0.00,16.63,0.00,0.00,200.00,2 +2172785,23.80,46.60,99.80,0.00,0.00,0.00,15.62,0.00,0.00,200.00,2 +2207835,23.80,46.50,99.81,0.00,0.00,0.00,19.97,0.00,0.00,200.00,2 +2242884,23.80,46.50,99.81,0.00,0.00,0.00,14.15,0.00,0.00,200.00,2 +2277933,23.80,46.50,99.81,3831.15,0.00,0.00,15.62,0.00,0.00,200.00,2 +2313311,23.70,46.20,99.80,963.73,0.00,0.00,15.30,0.00,0.00,200.00,2 +2348474,23.70,46.10,99.79,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +2383584,23.60,45.70,99.80,1211.32,0.00,0.00,14.95,0.00,0.00,200.00,2 +2418476,23.60,45.50,99.79,943.66,0.00,0.00,16.97,0.00,0.00,200.00,2 +2453743,23.60,45.20,99.79,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +2488792,23.60,44.90,99.79,0.00,0.00,0.00,14.52,0.00,0.00,200.00,2 +2523841,23.60,44.80,99.79,0.00,0.00,0.00,15.33,0.00,0.00,200.00,2 +2558889,23.60,44.60,99.79,1508.61,0.00,0.00,16.60,0.00,0.00,200.00,2 +2594112,23.60,44.40,99.79,2190.43,0.00,0.00,16.30,0.00,0.00,200.00,2 +2628845,23.50,44.10,99.79,0.00,0.00,0.00,14.30,0.00,0.00,200.00,2 +2663894,23.50,44.10,99.80,226.58,0.00,0.00,15.27,0.00,0.00,200.00,2 +2698923,23.50,43.90,99.79,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +2733974,23.40,43.70,99.79,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +2769023,23.40,43.60,99.79,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +2804072,23.40,43.50,99.79,0.00,0.00,0.00,17.27,0.00,0.00,200.00,2 +2839121,23.30,43.40,99.79,0.00,0.00,0.00,14.27,0.00,0.00,200.00,2 +2874171,23.30,43.00,99.78,4569.98,0.00,0.00,15.15,0.00,0.00,200.00,2 +2909322,23.30,43.10,99.78,459.04,0.00,0.00,14.82,0.00,0.00,200.00,2 +2944487,23.20,43.20,99.79,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +2979535,23.20,43.00,99.77,1402.15,0.00,0.00,15.13,0.00,0.00,200.00,2 +3014803,23.20,43.00,99.77,0.00,0.00,0.00,15.50,0.00,0.00,200.00,2 +3049852,23.10,43.00,99.77,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +3084900,23.10,42.90,99.77,83.09,0.00,0.00,15.15,0.00,0.00,200.00,2 +3119867,23.10,42.90,99.77,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +3154917,23.10,42.60,99.77,0.00,0.00,0.00,14.65,0.00,0.00,200.00,2 +3189998,23.10,42.60,99.77,6171.55,0.00,0.00,14.60,0.00,0.00,200.00,2 +3224922,23.00,42.70,99.77,0.00,0.00,0.00,13.82,0.00,0.00,200.00,2 +3259971,23.00,42.50,99.77,0.00,0.00,0.00,14.73,0.00,0.00,200.00,2 +3295019,23.00,42.60,99.76,487.35,0.00,0.00,14.22,0.00,0.00,200.00,2 +3330272,23.00,42.40,99.77,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +3365322,23.00,42.30,99.75,0.00,0.00,0.00,14.43,0.00,0.00,200.00,2 +3400371,23.00,42.10,99.77,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +3435420,23.00,42.00,99.77,16174.47,0.00,0.00,21.62,0.00,0.00,200.00,2 +3470705,23.00,41.90,99.76,7080.87,0.00,0.00,16.52,0.00,0.00,200.00,2 +3505730,23.00,43.90,99.75,26860.32,0.00,0.00,14.98,0.00,0.00,200.00,2 +3540772,23.00,49.30,99.76,24471.82,0.00,0.00,14.83,0.00,0.00,200.00,2 +3575813,23.20,49.80,99.76,12384.71,0.00,0.00,21.75,0.00,0.00,200.00,2 +3610737,23.30,48.70,99.76,7664.75,0.00,0.00,15.98,0.00,0.00,200.00,2 +3645643,23.40,46.50,99.76,0.00,0.00,0.00,16.92,0.00,0.00,200.00,2 +3680694,23.40,43.00,99.75,1923.68,0.00,0.00,15.37,0.00,0.00,200.00,2 +3715459,23.50,41.80,99.75,1164.21,0.00,0.00,15.60,0.00,0.00,200.00,2 +3750436,23.50,41.20,99.75,1180.28,0.00,0.00,15.87,0.00,0.00,200.00,2 +3785775,23.50,40.80,99.75,0.00,0.00,0.00,15.38,0.00,0.00,200.00,2 +3820827,23.50,40.60,99.74,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +3855879,23.50,40.50,99.74,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +3890930,23.50,40.30,99.75,1362.49,0.00,0.00,15.93,0.00,0.00,200.00,2 +3925889,23.50,40.30,99.74,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +3960942,23.50,40.20,99.74,0.00,0.00,0.00,14.83,0.00,0.00,200.00,2 +3995995,23.50,40.20,99.75,0.00,0.00,0.00,14.92,0.00,0.00,200.00,2 +4031047,23.50,40.20,99.74,2235.82,0.00,0.00,15.73,0.00,0.00,200.00,2 +4065821,23.40,40.20,99.74,0.00,0.00,0.00,15.68,0.00,0.00,200.00,2 +4100873,23.40,40.20,99.74,0.00,0.00,0.00,16.78,0.00,0.00,200.00,2 +4135925,23.40,40.10,99.75,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +4170978,23.40,39.90,99.74,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +4206031,23.40,39.80,99.74,132.93,0.00,0.00,15.62,0.00,0.00,200.00,2 +4241246,23.40,39.70,99.74,1320.67,0.00,0.00,16.48,0.00,0.00,200.00,2 +4276435,23.40,39.70,99.74,0.00,0.00,0.00,17.33,0.00,0.00,200.00,2 +4311487,23.40,39.80,99.74,0.00,0.00,0.00,14.90,0.00,0.00,200.00,2 +4346539,23.30,39.60,99.75,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +4381591,23.30,39.70,99.75,0.00,0.00,0.00,16.43,0.00,0.00,200.00,2 +4416643,23.30,39.90,99.75,0.00,0.00,0.00,15.52,0.00,0.00,200.00,2 +4451695,23.30,40.30,99.75,1444.71,0.00,0.00,15.45,0.00,0.00,200.00,2 +4486572,23.30,40.60,99.75,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +4521625,23.30,40.90,99.76,1448.68,0.00,0.00,14.67,0.00,0.00,200.00,2 +4556923,23.40,40.90,99.77,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +4591975,23.30,41.00,99.76,0.00,0.00,0.00,16.62,0.00,0.00,200.00,2 +4627027,23.40,41.00,99.76,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +4662079,23.40,41.10,99.77,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +4697131,23.40,41.20,99.76,0.00,0.00,0.00,15.57,0.00,0.00,200.00,2 +4732182,23.40,41.30,99.77,43.57,0.00,0.00,14.47,0.00,0.00,200.00,2 +4767191,23.50,41.50,99.77,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +4802243,23.50,41.60,99.77,703.38,0.00,0.00,15.10,0.00,0.00,200.00,2 +4837053,23.50,41.70,99.77,0.00,0.00,0.00,16.00,0.00,0.00,200.00,2 +4872105,23.50,41.80,99.77,0.00,0.00,0.00,15.28,0.00,0.00,200.00,2 +4907194,23.60,42.00,99.77,552.62,0.00,0.00,17.22,0.00,0.00,200.00,2 +4942505,23.60,42.20,99.77,0.00,0.00,0.00,15.45,0.00,0.00,200.00,2 +4977556,23.60,42.30,99.77,1835.25,0.00,0.00,15.30,0.00,0.00,200.00,2 +5012483,23.60,42.50,99.77,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +5047536,23.60,42.50,99.76,0.00,0.00,0.00,15.73,0.00,0.00,200.00,2 +5082589,23.60,42.70,99.76,4645.66,0.00,0.00,20.03,0.00,0.00,200.00,2 +5117889,23.60,42.70,99.76,1793.94,0.00,0.00,18.78,0.00,0.00,200.00,2 +5153233,23.70,42.80,99.76,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +5188286,23.70,43.10,99.76,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +5223337,23.70,43.20,99.76,0.00,0.00,0.00,16.43,0.00,0.00,200.00,2 +5258389,23.80,43.30,99.75,0.00,0.00,0.00,14.77,0.00,0.00,200.00,2 +5293442,23.80,43.40,99.76,0.00,0.00,0.00,15.50,0.00,0.00,200.00,2 +5328495,23.80,43.50,99.75,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +5363546,23.80,43.60,99.75,0.00,0.00,0.00,15.55,0.00,0.00,200.00,2 +5398598,23.80,41.50,99.76,0.00,0.00,0.00,15.87,0.00,0.00,200.00,2 +5433650,23.80,41.30,99.76,0.00,0.00,0.00,15.77,0.00,0.00,200.00,2 +5468703,23.70,41.30,99.76,0.00,0.00,0.00,16.15,0.00,0.00,200.00,2 +5503756,23.70,41.70,99.77,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +5538808,23.70,41.90,99.76,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +5573859,23.70,42.10,99.77,0.00,0.00,0.00,15.72,0.00,0.00,200.00,2 +5608910,23.70,42.30,99.77,0.00,0.00,0.00,17.67,0.00,0.00,200.00,2 +5643963,23.70,42.30,99.77,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +5679015,23.70,42.30,99.76,0.00,0.00,0.00,14.30,0.00,0.00,200.00,2 +5714067,23.70,42.40,99.77,3025.18,0.00,0.00,15.35,0.00,0.00,200.00,2 +5749348,23.70,42.50,99.77,643.29,0.00,0.00,15.30,0.00,0.00,200.00,2 +5784135,23.70,42.60,99.77,0.00,0.00,0.00,16.17,0.00,0.00,200.00,2 +5819188,23.80,42.80,99.77,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +5854241,23.80,42.80,99.77,0.00,0.00,0.00,15.40,0.00,0.00,200.00,2 +5889294,23.80,42.90,99.77,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +5924345,23.80,43.00,99.77,0.00,0.00,0.00,15.38,0.00,0.00,200.00,2 +5959397,23.80,43.00,99.78,3380.23,0.00,0.00,15.27,0.00,0.00,200.00,2 +5994458,23.80,43.20,99.77,0.00,0.00,0.00,15.28,0.00,0.00,200.00,2 +6029511,23.90,43.20,99.77,0.00,0.00,0.00,15.37,0.00,0.00,200.00,2 +6064564,23.80,43.40,99.78,0.00,0.00,0.00,15.38,0.00,0.00,200.00,2 +6099616,23.90,43.40,99.78,606.01,0.00,0.00,15.28,0.00,0.00,200.00,2 +6134725,23.90,43.60,99.78,0.00,0.00,0.00,15.33,0.00,0.00,200.00,2 +6169777,23.90,43.50,99.79,0.00,0.00,0.00,15.45,0.00,0.00,200.00,2 +6204828,23.90,43.60,99.79,1418.01,0.00,0.00,15.28,0.00,0.00,200.00,2 +6239743,23.90,43.60,99.79,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +6274795,23.90,43.70,99.80,743.92,0.00,0.00,15.08,0.00,0.00,200.00,2 +6309630,23.90,43.80,99.79,1185.44,0.00,0.00,15.43,0.00,0.00,200.00,2 +6344915,23.90,43.80,99.80,0.00,0.00,0.00,15.38,0.00,0.00,200.00,2 +6379967,24.00,43.90,99.80,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +6415020,24.00,44.00,99.80,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +6450073,24.00,44.20,99.80,5232.70,0.00,0.00,15.35,0.00,0.00,200.00,2 +6484921,24.00,44.40,99.80,0.00,0.00,0.00,15.45,0.00,0.00,200.00,2 +6519974,24.00,44.50,99.79,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +6555026,24.00,44.60,99.79,0.00,0.00,0.00,14.87,0.00,0.00,200.00,2 +6590077,24.00,44.70,99.79,0.00,0.00,0.00,15.28,0.00,0.00,200.00,2 +6625129,24.00,44.80,99.78,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +6660181,24.00,45.00,99.78,0.00,0.00,0.00,14.72,0.00,0.00,200.00,2 +6695233,24.00,45.00,99.77,0.00,0.00,0.00,16.58,0.00,0.00,200.00,2 +6730284,24.00,45.10,99.78,0.00,0.00,0.00,15.48,0.00,0.00,200.00,2 +6765335,24.00,45.10,99.77,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +6800387,24.00,45.20,99.77,0.00,0.00,0.00,15.55,0.00,0.00,200.00,2 +6835439,24.00,45.30,99.78,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +6870492,24.00,45.30,99.77,0.00,0.00,0.00,15.33,0.00,0.00,200.00,2 +6905543,24.00,45.20,99.78,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +6940594,24.00,45.30,99.77,130.93,0.00,0.00,15.73,0.00,0.00,200.00,2 +6975428,24.00,45.20,99.78,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +7010481,24.00,45.40,99.78,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +7045533,24.00,45.50,99.77,2701.97,0.00,0.00,15.23,0.00,0.00,200.00,2 +7080471,24.00,45.40,99.78,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +7115523,24.00,45.60,99.78,1595.27,0.00,0.00,15.45,0.00,0.00,200.00,2 +7150254,24.00,45.70,99.78,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +7185306,24.00,45.70,99.78,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +7220358,24.00,45.70,99.79,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +7255411,24.00,45.80,99.77,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +7290464,24.00,46.00,99.77,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +7325516,24.00,46.00,99.77,0.00,0.00,0.00,15.43,0.00,0.00,200.00,2 +7360568,24.00,46.10,99.76,0.00,0.00,0.00,15.30,0.00,0.00,200.00,2 +7395621,24.00,46.10,99.76,764.46,0.00,0.00,15.30,0.00,0.00,200.00,2 +7430687,24.10,46.20,99.76,0.00,0.00,0.00,15.62,0.00,0.00,200.00,2 +7465740,24.00,46.20,99.75,0.00,0.00,0.00,15.40,0.00,0.00,200.00,2 +7500793,24.00,46.20,99.75,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +7535845,24.00,46.20,99.75,0.00,0.00,0.00,15.37,0.00,0.00,200.00,2 +7570897,24.00,46.30,99.75,0.00,0.00,0.00,15.85,0.00,0.00,200.00,2 +7605948,24.00,46.40,99.74,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +7641001,24.00,46.40,99.74,0.00,0.00,0.00,16.70,0.00,0.00,200.00,2 +7676053,24.10,46.40,99.73,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +7711104,24.10,46.40,99.73,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +7746155,24.10,46.40,99.73,54.15,0.00,0.00,15.83,0.00,0.00,200.00,2 +7781003,24.10,46.40,99.73,6794.56,0.00,0.00,15.20,0.00,0.00,200.00,2 +7816345,24.00,46.10,99.72,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +7851397,24.00,41.70,99.72,0.00,0.00,0.00,15.55,0.00,0.00,200.00,2 +7886449,24.00,39.10,99.73,1117.49,0.00,0.00,15.05,0.00,0.00,200.00,2 +7921207,23.90,38.30,99.72,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +7956259,23.80,37.00,99.73,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +7991312,23.60,36.30,99.73,0.00,0.00,0.00,14.42,0.00,0.00,200.00,2 +8026365,23.40,35.30,99.72,0.00,0.00,0.00,14.92,0.00,0.00,200.00,2 +8061416,23.10,35.20,99.73,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +8096481,22.90,34.90,99.73,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +8131532,22.70,34.90,99.74,595.77,0.00,0.00,14.87,0.00,0.00,200.00,2 +8166573,22.50,34.70,99.74,0.00,0.00,0.00,14.73,0.00,0.00,200.00,2 +8201626,22.20,35.00,99.74,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +8236678,22.00,35.00,99.74,0.00,0.00,0.00,14.85,0.00,0.00,200.00,2 +8271730,21.90,35.10,99.75,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +8306783,21.70,34.90,99.73,0.00,0.00,0.00,14.87,0.00,0.00,200.00,2 +8341836,21.50,35.70,99.73,1769.19,0.00,0.00,14.88,0.00,0.00,200.00,2 +8376808,21.40,36.50,99.73,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +8411859,21.30,36.90,99.74,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +8446911,21.30,37.20,99.73,1289.24,0.00,0.00,15.00,0.00,0.00,200.00,2 +8481812,21.30,37.50,99.72,975.90,0.00,0.00,15.12,0.00,0.00,200.00,2 +8517100,21.30,37.70,99.72,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +8552153,21.30,37.90,99.72,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +8587204,21.30,38.10,99.72,3898.69,0.00,0.00,15.07,0.00,0.00,200.00,2 +8622146,21.40,38.10,99.72,2439.35,0.00,0.00,15.07,0.00,0.00,200.00,2 +8657102,21.40,38.20,99.71,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +8692155,21.50,38.30,99.70,667.12,0.00,0.00,15.68,0.00,0.00,200.00,2 +8727349,21.50,38.50,99.70,1132.62,0.00,0.00,15.05,0.00,0.00,200.00,2 +8762597,21.50,38.60,99.70,1287.36,0.00,0.00,15.03,0.00,0.00,200.00,2 +8797501,21.70,38.60,99.70,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +8832552,21.70,38.50,99.69,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +8867603,21.80,38.60,99.69,756.89,0.00,0.00,15.12,0.00,0.00,200.00,2 +8902550,21.90,38.70,99.68,1423.58,0.00,0.00,15.13,0.00,0.00,200.00,2 +8937800,21.90,38.60,99.68,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +8972853,22.00,38.60,99.67,207.70,0.00,0.00,15.02,0.00,0.00,200.00,2 +9008189,22.00,38.60,99.67,651.17,0.00,0.00,15.00,0.00,0.00,200.00,2 +9043416,22.10,38.60,99.67,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +9078469,22.20,38.70,99.66,0.00,0.00,0.00,15.15,0.00,0.00,200.00,2 +9113521,22.20,38.70,99.66,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +9148572,22.30,38.80,99.65,3929.71,0.00,0.00,15.15,0.00,0.00,200.00,2 +9183550,22.40,39.00,99.65,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +9218601,22.50,39.20,99.64,0.00,0.00,0.00,15.23,0.00,0.00,200.00,2 +9253652,22.50,39.30,99.64,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +9288704,22.50,39.30,99.64,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +9323756,22.60,39.40,99.64,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +9358807,22.60,39.50,99.64,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +9393858,22.70,39.40,99.64,659.73,0.00,0.00,16.68,0.00,0.00,200.00,2 +9428754,22.70,39.70,99.64,1173.80,0.00,0.00,17.05,0.00,0.00,200.00,2 +9464134,22.70,39.70,99.63,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +9499186,22.80,39.70,99.63,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +9534238,22.80,39.80,99.63,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +9569289,22.80,39.70,99.63,1539.08,0.00,0.00,15.17,0.00,0.00,200.00,2 +9604053,22.90,39.60,99.64,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +9639106,22.90,39.60,99.63,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +9674159,22.90,39.60,99.63,959.91,0.00,0.00,15.17,0.00,0.00,200.00,2 +9709161,22.90,39.70,99.63,1848.03,0.00,0.00,15.17,0.00,0.00,200.00,2 +9744221,23.00,39.70,99.64,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +9779273,23.00,39.70,99.63,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +9814326,23.00,39.80,99.63,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +9849379,23.00,39.80,99.63,5095.58,0.00,0.00,15.17,0.00,0.00,200.00,2 +9884317,23.10,40.00,99.64,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +9919369,23.10,40.10,99.64,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +9954420,23.10,40.20,99.64,0.00,0.00,0.00,15.23,0.00,0.00,200.00,2 +9989472,23.10,40.10,99.63,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +10024525,23.20,40.20,99.64,0.00,0.00,0.00,15.18,0.00,0.00,200.00,2 +10059578,23.20,40.30,99.64,0.00,0.00,0.00,15.18,0.00,0.00,200.00,2 +10094646,23.20,40.30,99.64,579.07,0.00,0.00,15.15,0.00,0.00,200.00,2 +10129417,23.20,40.40,99.63,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +10164469,23.20,40.40,99.64,4172.45,0.00,0.00,15.22,0.00,0.00,200.00,2 +10199550,23.20,40.40,99.64,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +10234602,23.30,40.50,99.63,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +10269655,23.30,40.50,99.63,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +10304708,23.30,40.60,99.64,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +10339761,23.30,40.60,99.63,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +10374812,23.30,40.70,99.63,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +10409864,23.30,40.70,99.62,971.91,0.00,0.00,14.92,0.00,0.00,200.00,2 +10444776,23.30,40.70,99.62,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +10479827,23.30,40.80,99.62,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +10514878,23.30,40.80,99.61,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +10549930,23.40,40.90,99.62,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +10584982,23.40,40.80,99.62,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +10620034,23.40,40.80,99.62,0.00,0.00,0.00,14.77,0.00,0.00,200.00,2 +10655085,23.40,40.80,99.62,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +10690137,23.40,40.90,99.62,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +10725189,23.40,41.00,99.62,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +10760241,23.40,41.00,99.63,669.22,0.00,0.00,15.13,0.00,0.00,200.00,2 +10795202,23.40,41.20,99.63,0.00,0.00,0.00,14.93,0.00,0.00,200.00,2 +10830254,23.40,41.20,99.62,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +10865306,23.50,41.30,99.62,0.00,0.00,0.00,15.30,0.00,0.00,200.00,2 +10900359,23.40,41.30,99.62,0.00,0.00,0.00,15.47,0.00,0.00,200.00,2 +10935412,23.50,41.40,99.63,656.66,0.00,0.00,15.27,0.00,0.00,200.00,2 +10970528,23.50,41.40,99.63,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +11005581,23.50,41.50,99.63,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +11040633,23.50,41.50,99.62,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +11075685,23.50,41.60,99.62,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +11110738,23.50,41.60,99.62,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +11145791,23.50,41.70,99.62,0.00,0.00,0.00,14.92,0.00,0.00,200.00,2 +11180844,23.50,41.80,99.62,1798.77,0.00,0.00,14.68,0.00,0.00,200.00,2 +11215567,23.50,41.80,99.62,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +11250619,23.50,41.80,99.61,0.00,0.00,0.00,15.30,0.00,0.00,200.00,2 +11285671,23.50,41.80,99.61,412.26,0.00,0.00,15.00,0.00,0.00,200.00,2 +11320896,23.50,41.90,99.61,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +11355948,23.60,42.00,99.61,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +11391000,23.50,42.00,99.61,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +11426051,23.60,42.00,99.61,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +11461102,23.60,42.20,99.61,2143.12,0.00,0.00,15.17,0.00,0.00,200.00,2 +11496211,23.60,42.20,99.61,1632.38,0.00,0.00,15.12,0.00,0.00,200.00,2 +11531073,23.60,42.20,99.60,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +11566124,23.60,42.30,99.60,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +11601175,23.60,42.30,99.61,0.00,0.00,0.00,14.97,0.00,0.00,200.00,2 +11636229,23.60,42.40,99.60,0.00,0.00,0.00,14.97,0.00,0.00,200.00,2 +11671282,23.60,42.50,99.60,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +11706335,23.60,42.50,99.61,0.00,0.00,0.00,15.18,0.00,0.00,200.00,2 +11741386,23.60,42.60,99.61,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +11776438,23.60,42.60,99.61,1197.57,0.00,0.00,15.25,0.00,0.00,200.00,2 +11811475,23.60,42.70,99.61,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +11846527,23.60,42.80,99.61,0.00,0.00,0.00,14.92,0.00,0.00,200.00,2 +11881578,23.60,42.80,99.61,2351.04,0.00,0.00,15.07,0.00,0.00,200.00,2 +11916718,23.60,42.80,99.61,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +11951771,23.60,42.90,99.61,3610.54,0.00,0.00,15.20,0.00,0.00,200.00,2 +11986576,23.60,42.90,99.61,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +12021650,23.60,43.00,99.61,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +12056703,23.60,42.90,99.60,0.00,0.00,0.00,15.42,0.00,0.00,200.00,2 +12091756,23.60,43.00,99.61,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +12126807,23.60,43.00,99.60,0.00,0.00,0.00,15.15,0.00,0.00,200.00,2 +12161859,23.70,43.00,99.61,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +12196912,23.70,43.10,99.60,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +12231965,23.60,43.10,99.60,0.00,0.00,0.00,14.75,0.00,0.00,200.00,2 +12267017,23.70,43.20,99.60,0.00,0.00,0.00,14.70,0.00,0.00,200.00,2 +12302069,23.70,43.20,99.60,0.00,0.00,0.00,14.53,0.00,0.00,200.00,2 +12337121,23.70,43.20,99.60,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +12372174,23.70,43.20,99.60,454.10,0.00,0.00,15.13,0.00,0.00,200.00,2 +12407216,23.70,43.20,99.61,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +12442268,23.70,43.40,99.60,1008.19,0.00,0.00,15.73,0.00,0.00,200.00,2 +12477654,23.70,43.40,99.59,0.00,0.00,0.00,15.32,0.00,0.00,200.00,2 +12512708,23.70,43.40,99.59,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +12547760,23.70,43.40,99.60,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +12582812,23.70,43.60,99.59,0.00,0.00,0.00,15.97,0.00,0.00,200.00,2 +12617865,23.70,43.60,99.59,748.58,0.00,0.00,15.02,0.00,0.00,200.00,2 +12652913,23.70,43.60,99.59,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +12687964,23.70,43.70,99.59,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +12723016,23.70,43.70,99.59,0.00,0.00,0.00,15.35,0.00,0.00,200.00,2 +12758068,23.70,43.70,99.58,0.00,0.00,0.00,15.75,0.00,0.00,200.00,2 +12793121,23.80,43.70,99.59,0.00,0.00,0.00,14.48,0.00,0.00,200.00,2 +12828173,23.70,43.70,99.58,548.12,0.00,0.00,15.03,0.00,0.00,200.00,2 +12863528,23.80,43.80,99.58,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +12898579,23.80,43.90,99.58,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +12933632,23.80,44.00,99.58,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +12968685,23.80,44.00,99.58,0.00,0.00,0.00,15.25,0.00,0.00,200.00,2 +13003737,23.80,44.10,99.58,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +13038790,23.80,44.10,99.57,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +13073842,23.80,44.10,99.58,493.92,0.00,0.00,15.05,0.00,0.00,200.00,2 +13108555,23.80,44.10,99.58,192.02,0.00,0.00,14.83,0.00,0.00,200.00,2 +13143868,23.80,44.10,99.58,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +13178921,23.80,44.20,99.58,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +13213974,23.80,44.20,99.57,1010.47,0.00,0.00,14.82,0.00,0.00,200.00,2 +13248686,23.80,44.20,99.57,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +13283738,23.80,44.20,99.58,3193.98,0.00,0.00,15.12,0.00,0.00,200.00,2 +13318718,23.80,44.20,99.57,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +13353771,23.80,44.30,99.57,154.68,0.00,0.00,15.17,0.00,0.00,200.00,2 +13388996,23.80,44.40,99.58,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +13424049,23.80,44.40,99.58,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +13459102,23.80,44.20,99.58,0.00,0.00,0.00,14.82,0.00,0.00,200.00,2 +13494166,23.80,44.30,99.57,1031.63,0.00,0.00,14.55,0.00,0.00,200.00,2 +13529492,23.80,44.30,99.58,0.00,0.00,0.00,15.38,0.00,0.00,200.00,2 +13564545,23.80,44.20,99.58,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +13599597,23.80,44.30,99.58,0.00,0.00,0.00,15.20,0.00,0.00,200.00,2 +13634649,23.80,44.30,99.57,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +13669702,23.80,44.30,99.58,0.00,0.00,0.00,15.15,0.00,0.00,200.00,2 +13704754,23.80,44.30,99.58,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +13739807,23.80,44.40,99.58,0.00,0.00,0.00,15.13,0.00,0.00,200.00,2 +13774859,23.80,44.40,99.57,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +13809911,23.80,44.40,99.57,0.00,0.00,0.00,15.05,0.00,0.00,200.00,2 +13844963,23.80,44.40,99.58,0.00,0.00,0.00,15.23,0.00,0.00,200.00,2 +13880015,23.90,44.50,99.58,985.96,0.00,0.00,15.12,0.00,0.00,200.00,2 +13914925,23.90,44.50,99.58,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +13949978,23.80,44.50,99.58,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +13985030,23.80,44.60,99.57,0.00,0.00,0.00,15.27,0.00,0.00,200.00,2 +14020083,23.90,44.60,99.58,0.00,0.00,0.00,16.90,0.00,0.00,200.00,2 +14055135,23.90,44.60,99.58,0.00,0.00,0.00,15.07,0.00,0.00,200.00,2 +14090187,23.90,44.60,99.57,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +14125239,23.90,44.70,99.57,1153.17,0.00,0.00,14.95,0.00,0.00,200.00,2 +14159994,23.90,44.70,99.57,0.00,0.00,0.00,15.50,0.00,0.00,200.00,2 +14195047,23.90,44.70,99.58,0.00,0.00,0.00,15.00,0.00,0.00,200.00,2 +14230098,23.90,44.70,99.58,0.00,0.00,0.00,14.97,0.00,0.00,200.00,2 +14265150,23.90,44.80,99.57,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +14300202,23.90,44.80,99.57,0.00,0.00,0.00,14.50,0.00,0.00,200.00,2 +14335254,23.90,44.80,99.57,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 +14370305,23.90,44.70,99.58,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +14405356,23.90,44.60,99.57,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +14440409,23.90,44.70,99.58,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +14475461,23.90,44.70,99.57,2476.07,0.00,0.00,15.02,0.00,0.00,200.00,2 +14510693,23.90,44.60,99.58,0.00,0.00,0.00,14.45,0.00,0.00,200.00,2 +14545746,23.90,44.60,99.57,0.00,0.00,0.00,14.97,0.00,0.00,200.00,2 +14580798,23.90,44.60,99.58,0.00,0.00,0.00,15.17,0.00,0.00,200.00,2 +14615850,23.90,44.70,99.57,0.00,0.00,0.00,14.80,0.00,0.00,200.00,2 +14650903,23.90,44.70,99.58,0.00,0.00,0.00,15.12,0.00,0.00,200.00,2 +14685955,23.90,44.80,99.57,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +14721008,23.90,44.80,99.57,0.00,0.00,0.00,14.88,0.00,0.00,200.00,2 +14756060,23.90,44.80,99.58,0.00,0.00,0.00,15.22,0.00,0.00,200.00,2 +14791111,23.90,44.80,99.58,0.00,0.00,0.00,14.58,0.00,0.00,200.00,2 +14826163,23.90,44.80,99.57,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +14861216,23.90,45.00,99.57,0.00,0.00,0.00,15.95,0.00,0.00,200.00,2 +14896267,23.90,44.90,99.57,0.00,0.00,0.00,16.33,0.00,0.00,200.00,2 +14931320,23.90,44.90,99.58,0.00,0.00,0.00,14.75,0.00,0.00,200.00,2 +14966372,23.90,44.90,99.58,0.00,0.00,0.00,15.37,0.00,0.00,200.00,2 +15001424,23.90,44.80,99.58,0.00,0.00,0.00,14.62,0.00,0.00,200.00,2 +15036476,23.90,44.90,99.58,0.00,0.00,0.00,15.08,0.00,0.00,200.00,2 +15071527,23.90,44.80,99.57,0.00,0.00,0.00,15.02,0.00,0.00,200.00,2 +15106578,23.90,44.90,99.57,236.67,0.00,0.00,15.05,0.00,0.00,200.00,2 +15141700,23.90,44.90,99.57,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +15176752,23.90,44.90,99.58,0.00,0.00,0.00,14.98,0.00,0.00,200.00,2 +15211804,23.90,44.90,99.57,0.00,0.00,0.00,15.03,0.00,0.00,200.00,2 +15246856,23.90,44.90,99.57,1502.33,0.00,0.00,15.05,0.00,0.00,200.00,2 +15281625,23.90,44.90,99.58,0.00,0.00,0.00,14.95,0.00,0.00,200.00,2 +15316678,23.90,44.90,99.57,0.00,0.00,0.00,15.10,0.00,0.00,200.00,2 diff --git a/main/Examples/DS3231_TEST/7.semestris.code-workspace b/main/Examples/DS3231_TEST/7.semestris.code-workspace new file mode 100644 index 0000000..b45b17f --- /dev/null +++ b/main/Examples/DS3231_TEST/7.semestris.code-workspace @@ -0,0 +1,7 @@ +{ + "folders": [ + { + "path": "../../../../../Universitate/LU_Datorzinatnes/7.semestris" + } + ] +} \ No newline at end of file diff --git a/main/Examples/DS3231_TEST/DS3231_TEST.ino b/main/Examples/DS3231_TEST/DS3231_TEST.ino new file mode 100644 index 0000000..8d4bfb5 --- /dev/null +++ b/main/Examples/DS3231_TEST/DS3231_TEST.ino @@ -0,0 +1,199 @@ +/* +DS3231_test.pde +Eric Ayars +4/11 + +Test/demo of read routines for a DS3231 RTC. + +Turn on the serial monitor after loading this to check if things are +working as they should. + +*/ + +#include +#include + +DS3231 Clock; +bool Century=false; +bool h12; +bool PM; +byte ADay, AHour, AMinute, ASecond, ABits; +bool ADy, A12h, Apm; + +byte year, month, date, DoW, hour, minute, second; + +void setup() { + // Start the I2C interface + Wire.begin(); + Clock.setSecond(50);//Set the second + Clock.setMinute(59);//Set the minute + Clock.setHour(11); //Set the hour + Clock.setDoW(5); //Set the day of the week + Clock.setDate(31); //Set the date of the month + Clock.setMonth(5); //Set the month of the year + Clock.setYear(13); //Set the year (Last two digits of the year) + // Start the serial interface + Serial.begin(115200); +} +void ReadDS3231() +{ + int second,minute,hour,date,month,year,temperature; + second=Clock.getSecond(); + minute=Clock.getMinute(); + hour=Clock.getHour(h12, PM); + date=Clock.getDate(); + month=Clock.getMonth(Century); + year=Clock.getYear(); + + temperature=Clock.getTemperature(); + + Serial.print("20"); + Serial.print(year,DEC); + Serial.print('-'); + Serial.print(month,DEC); + Serial.print('-'); + Serial.print(date,DEC); + Serial.print(' '); + Serial.print(hour,DEC); + Serial.print(':'); + Serial.print(minute,DEC); + Serial.print(':'); + Serial.print(second,DEC); + Serial.print('\n'); + Serial.print("Temperature="); + Serial.print(temperature); + Serial.print('\n'); +} +void loop() {ReadDS3231();delay(1000); + // send what's going on to the serial monitor. + // Start with the year +/* Serial.print("2"); + if (Century) { // Won't need this for 89 years. + Serial.print("1"); + } else { + Serial.print("0"); + } + Serial.print(Clock.getYear(), DEC); + Serial.print('-'); + // then the month + Serial.print(Clock.getMonth(Century), DEC); + Serial.print('-'); + // then the date + Serial.print(Clock.getDate(), DEC); + Serial.print(' ');*/ + // and the day of the week + /*Serial.print(Clock.getDoW(), DEC); + Serial.print(' ');*/ + // Finally the hour, minute, and second + /*Serial.print(Clock.getHour(h12, PM), DEC); + Serial.print(':'); + Serial.print(Clock.getMinute(), DEC); + Serial.print(':'); + Serial.print(Clock.getSecond(), DEC); + // Add AM/PM indicator + if (h12) { + if (PM) { + Serial.print(" PM "); + } else { + Serial.print(" AM "); + } + } else { + Serial.print(" 24h "); + } + // Display the temperature + Serial.print("T="); + Serial.print(Clock.getTemperature(), 2); + // Tell whether the time is (likely to be) valid + if (Clock.oscillatorCheck()) { + Serial.print(" O+"); + } else { + Serial.print(" O-"); + }*/ + // Indicate whether an alarm went off + /*if (Clock.checkIfAlarm(1)) { + Serial.print(" A1!"); + } + if (Clock.checkIfAlarm(2)) { + Serial.print(" A2!"); + }*/ + // New line on display + //Serial.print('\n'); + // delay(1000); + // Display Alarm 1 information +/* Serial.print("Alarm 1: "); + Clock.getA1Time(ADay, AHour, AMinute, ASecond, ABits, ADy, A12h, Apm); + Serial.print(ADay, DEC); + if (ADy) { + Serial.print(" DoW"); + } else { + Serial.print(" Date"); + } + Serial.print(' '); + Serial.print(AHour, DEC); + Serial.print(' '); + Serial.print(AMinute, DEC); + Serial.print(' '); + Serial.print(ASecond, DEC); + Serial.print(' '); + if (A12h) { + if (Apm) { + Serial.print('pm '); + } else { + Serial.print('am '); + } + } + if (Clock.checkAlarmEnabled(1)) { + Serial.print("enabled"); + } + Serial.print('\n'); + // Display Alarm 2 information + Serial.print("Alarm 2: "); + Clock.getA2Time(ADay, AHour, AMinute, ABits, ADy, A12h, Apm); + Serial.print(ADay, DEC); + if (ADy) { + Serial.print(" DoW"); + } else { + Serial.print(" Date"); + } + Serial.print(' '); + Serial.print(AHour, DEC); + Serial.print(' '); + Serial.print(AMinute, DEC); + Serial.print(' '); + if (A12h) { + if (Apm) { + Serial.print('pm'); + } else { + Serial.print('am'); + } + } + if (Clock.checkAlarmEnabled(2)) { + Serial.print("enabled"); + }*/ + /* display alarm bits + Serial.print('\n'); + Serial.print('Alarm bits: '); + Serial.print(ABits, DEC); + */ +/* + Serial.print('\n'); + Serial.print('\n'); + delay(1000); + + // Display the time once more as a test of the getTime() function + Clock.getTime(year, month, date, DoW, hour, minute, second); + + Serial.print(year, DEC); + Serial.print("/"); + Serial.print(month, DEC); + Serial.print("/"); + Serial.print(date, DEC); + Serial.print("day of the week :"); + Serial.println(DoW, DEC); + Serial.print(hour, DEC); + Serial.print(":"); + Serial.print(minute, DEC); + Serial.print(":"); + Serial.println(second, DEC);*/ +} + diff --git a/main/main.ino b/main/main.ino index ac6c8ee..5275d42 100644 --- a/main/main.ino +++ b/main/main.ino @@ -554,7 +554,8 @@ void setup() while (!timer.hasElapsed()){ util::display_whole_text_LCD(lcd1_conf, TEXT_BUFFER); continue;} } buzzer::success(); - delay(1500); + delay(1000); + measurement::print_headers(); } int LOOP_COUNT = 0;