Merge branch 'main' of https://github.com/charleshenville/utra-hacks-…

…2024

backend/log.csv

@@ -44,3 +44,138 @@
 42,1707176615.0,77.3,32.35,23.45,0.0
 43,1707176655.0,76.2,32.15,23.3,0.0
 44,1707176695.0,76.75,31.8,23.7,0.0
+45,1707177510.0,75.1,30.9,24.7,0.0
+46,1707177550.0,75.15,31.05,24.7,0.0
+47,1707177589.4,75.35,31.45,24.95,0.0
+48,1707177629.0,75.05,31.15,25.25,0.0
+49,1707177669.0,75.3,31.75,25.35,0.0
+50,1707177709.0,75.2,30.95,24.85,0.0
+51,1707177749.0,74.85,31.05,24.45,0.0
+52,1707177789.0,74.75,31.1,24.45,0.0
+53,1707177829.0,75.2,31.1,24.75,0.0
+54,1707177869.0,75.05,31.2,24.55,0.0
+55,1707177909.0,74.45,30.85,24.9,0.0
+56,1707177949.0,74.7,31.7,25.45,0.0
+57,1707177989.0,75.2,31.8,25.0,0.0
+58,1707178029.0,74.95,31.2,24.85,0.0
+59,1707178069.0,74.85,32.1,25.3,0.0
+60,1707178109.0,74.4,31.3,24.65,0.0
+61,1707178149.0,74.3,30.8,24.5,0.0
+62,1707178189.0,74.6,31.55,25.15,0.0
+63,1707178229.0,74.7,30.95,24.8,0.0
+64,1707178269.0,74.8,31.25,25.0,0.0
+65,1707178308.4,74.8,30.7,25.3,0.0
+66,1707178348.2,74.65,31.1,25.5,0.0
+67,1707178388.0,74.05,31.35,25.35,0.0
+68,1707178428.0,74.5,30.3,24.85,0.0
+69,1707178468.0,74.25,31.0,25.15,0.0
+70,1707178508.0,74.45,30.7,25.1,0.0
+71,1707178548.0,74.75,31.05,25.15,0.0
+72,1707178588.0,74.3,30.95,25.25,0.0
+73,1707178628.0,74.1,30.4,25.15,0.0
+74,1707178668.0,74.55,31.0,25.5,0.0
+75,1707178708.0,74.05,31.2,24.9,0.0
+76,1707178748.0,74.5,30.8,25.25,0.0
+77,1707178788.0,74.3,31.05,25.6,0.0
+78,1707178828.0,74.2,31.0,25.3,0.0
+79,1707178868.0,74.6,31.15,25.4,0.0
+80,1707178908.0,74.0,30.7,25.3,0.0
+81,1707178947.6,74.25,30.65,25.25,0.0
+82,1707178987.0,74.25,30.8,25.65,0.0
+83,1707179027.0,74.0,30.55,24.95,0.0
+84,1707179067.0,74.2,30.65,25.0,0.0
+85,1707179107.0,74.5,30.75,25.15,0.0
+86,1707179147.0,74.05,30.65,24.75,0.0
+87,1707179187.0,74.3,31.05,25.95,0.0
+88,1707179227.0,73.45,30.15,25.35,0.0
+89,1707179267.0,73.8,30.95,25.45,0.0
+90,1707179307.0,74.25,30.55,25.4,0.0
+91,1707179347.0,73.4,30.35,25.2,0.0
+92,1707179387.0,73.85,30.9,25.65,0.0
+93,1707179427.0,73.2,29.75,24.85,0.0
+94,1707179467.0,73.85,30.55,25.95,0.0
+95,1707179507.0,73.7,30.45,25.25,0.0
+96,1707179547.0,73.7,30.25,24.95,0.0
+97,1707179587.0,73.45,29.95,24.65,0.0
+98,1707179627.0,73.4,30.15,25.0,0.0
+99,1707179666.8,73.75,30.0,24.6,0.0
+100,1707179706.0,73.75,30.55,25.1,0.0
+101,1707179746.0,73.9,30.6,25.65,0.0
+102,1707179786.0,74.0,30.7,25.45,0.0
+103,1707179826.0,73.6,30.3,25.5,0.0
+104,1707179866.0,73.8,30.85,25.6,0.0
+105,1707179906.0,73.75,30.7,25.65,0.0
+106,1707179946.0,73.9,31.0,25.45,0.0
+107,1707179986.0,73.4,30.95,25.55,0.0
+108,1707180026.0,73.7,30.45,25.65,0.0
+109,1707180066.0,73.65,30.55,25.7,0.0
+110,1707180106.0,73.3,30.55,25.5,0.0
+111,1707180146.0,73.1,30.1,24.55,0.0
+112,1707180186.0,73.55,30.35,25.25,0.0
+113,1707180225.4,73.35,30.6,25.75,0.0
+114,1707180265.0,73.5,30.85,25.8,0.0
+115,1707180305.0,73.6,29.95,25.25,0.0
+116,1707180345.0,73.75,30.65,25.65,0.0
+117,1707180385.0,73.85,30.75,26.05,0.0
+118,1707180425.0,73.6,30.9,25.7,0.0
+119,1707180465.0,74.1,30.8,26.05,0.0
+120,1707180505.0,73.35,30.7,26.1,0.0
+121,1707180545.0,73.6,30.65,26.3,0.0
+122,1707180585.0,73.6,30.45,26.05,0.0
+123,1707180625.0,73.75,30.35,25.7,0.0
+124,1707180665.0,73.3,30.6,25.6,0.0
+125,1707180705.0,73.75,30.65,26.15,0.0
+126,1707180745.0,73.55,30.5,25.65,0.0
+127,1707180784.6,73.4,30.5,26.25,0.0
+128,1707180824.8,73.65,30.35,26.25,0.0
+129,1707180864.0,73.25,30.15,25.9,0.0
+130,1707180904.0,73.15,30.1,25.95,0.0
+131,1707180944.0,73.7,30.75,26.15,0.0
+132,1707180984.0,73.55,30.25,26.15,0.0
+133,1707181024.0,73.4,30.35,25.85,0.0
+134,1707181064.0,73.2,30.0,26.2,0.0
+135,1707181104.0,73.45,30.5,26.2,0.0
+136,1707181144.0,73.15,30.75,25.65,0.0
+137,1707181184.0,73.05,29.9,25.4,0.0
+138,1707181224.0,73.5,30.0,25.95,0.0
+139,1707181264.0,73.2,30.4,26.25,0.0
+140,1707181304.0,73.3,30.2,26.3,0.0
+141,1707181344.0,73.35,30.25,25.55,0.0
+142,1707181383.4,73.5,30.65,25.85,0.0
+143,1707181423.0,73.35,30.7,26.5,0.0
+144,1707181463.0,73.55,30.15,25.85,0.0
+145,1707181503.0,73.35,29.85,25.9,0.0
+146,1707181543.0,72.8,29.9,25.25,0.0
+147,1707181583.0,72.8,29.6,25.4,0.0
+148,1707181623.0,72.6,30.2,25.75,0.0
+149,1707181663.0,73.15,30.35,26.75,0.0
+150,1707181703.0,72.75,29.6,24.9,0.0
+151,1707181743.0,72.75,30.0,25.85,0.0
+152,1707181783.0,73.25,30.2,26.1,0.0
+153,1707181823.0,72.8,29.55,25.75,0.0
+154,1707181863.0,73.2,30.0,26.2,0.0
+155,1707181903.0,73.25,30.1,26.3,0.0
+156,1707181943.0,72.95,29.9,26.15,0.0
+157,1707181983.0,73.05,30.05,26.55,0.0
+158,1707182023.0,72.95,30.2,26.4,0.0
+159,1707182063.0,73.0,29.7,26.0,0.0
+160,1707182103.0,73.05,30.2,26.25,0.0
+161,1707182142.4,73.1,30.05,25.95,0.0
+162,1707182182.0,73.1,30.25,26.15,0.0
+163,1707182222.0,73.2,30.45,26.45,0.0
+164,1707182262.0,73.2,29.7,26.35,0.0
+165,1707182302.0,73.25,30.4,26.2,0.0
+166,1707182342.0,73.45,29.95,26.25,0.0
+167,1707182384.2,73.25,30.05,26.45,0.0
+168,1707182424.0,73.2,30.15,26.5,0.0
+169,1707182464.0,73.2,29.95,26.25,0.0
+170,1707182504.0,73.0,29.5,25.95,0.0
+171,1707182544.0,73.2,30.2,26.6,0.0
+172,1707182584.0,72.8,29.35,25.45,0.0
+173,1707182624.0,73.25,30.35,26.4,0.0
+174,1707182664.0,73.15,29.95,26.35,0.0
+175,1707182704.0,72.9,30.35,26.4,0.0
+176,1707182744.0,72.95,29.45,26.45,0.0
+177,1707182784.0,72.55,29.45,26.25,0.0
+178,1707182824.0,72.85,29.85,26.15,0.0
+179,1707182864.0,72.65,30.25,25.9,0.0

backend/service_state.py

@@ -10,7 +10,7 @@ def __init__(self, nil=0):
 
         self.thresh_seconds = 3600 # Obliterate time deltas longer than this
         self.num_plants = 3
-        self.smooth_interval = 5 # Num samples needed to smooth
+        self.smooth_interval = 20 # Num samples needed to smooth
 
         self.cdt = datetime.now()
         self.sse = int(self.cdt.timestamp())