From 632782cf158e9996819245901d4f4279473ad082 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 15 Nov 2017 18:06:56 +0100 Subject: [PATCH] changes --- .../MeasurementCollector/ADataObject.class | Bin 855 -> 1642 bytes .../MeasurementCollector/ADataParser.class | Bin 0 -> 408 bytes .../ElectricEnergyDataObject.class | Bin 0 -> 1262 bytes .../FinderOnePhasePowerMeter.class | Bin 0 -> 1628 bytes .../FinderThreePhasePowerMeter.class | Bin 0 -> 1635 bytes .../HottisFourChannelThermometer.class | Bin 0 -> 1677 bytes .../MeasurementCollector/MBusParser.class | Bin 3350 -> 4885 bytes .../MeasurementCollector.class | Bin 1688 -> 1544 bytes .../TemperatureDataObject.class | Bin 947 -> 1193 bytes .../MeasurementCollector/ADataObject.java | 12 ++++++ .../MeasurementCollector/ADataParser.java | 4 +- .../ElectricEnergyDataObject.java | 23 ++++++++++++ .../FinderOnePhasePowerMeter.java | 19 ++++++++++ .../FinderThreePhasePowerMeter.java | 19 ++++++++++ .../HottisFourChannelThermometer.java | 7 ++-- .../MeasurementCollector/MBusParser.java | 35 +++++++++++++++++- .../MeasurementCollector.java | 4 +- .../TemperatureDataObject.java | 2 +- 18 files changed, 115 insertions(+), 10 deletions(-) create mode 100644 bin/de/hottis/MeasurementCollector/ADataParser.class create mode 100644 bin/de/hottis/MeasurementCollector/ElectricEnergyDataObject.class create mode 100644 bin/de/hottis/MeasurementCollector/FinderOnePhasePowerMeter.class create mode 100644 bin/de/hottis/MeasurementCollector/FinderThreePhasePowerMeter.class create mode 100644 bin/de/hottis/MeasurementCollector/HottisFourChannelThermometer.class create mode 100644 src/de/hottis/MeasurementCollector/ElectricEnergyDataObject.java create mode 100644 src/de/hottis/MeasurementCollector/FinderOnePhasePowerMeter.java create mode 100644 src/de/hottis/MeasurementCollector/FinderThreePhasePowerMeter.java diff --git a/bin/de/hottis/MeasurementCollector/ADataObject.class b/bin/de/hottis/MeasurementCollector/ADataObject.class index 556693abcbfd13eb1dfe52170831aebfff4db5bd..fe44849c155f5373139bb4996dd5dec5419e0e75 100644 GIT binary patch delta 767 zcmZ{h-A)=o6vzK(wXkkCF@B>a&}zknMc2=QVrk)`z47A$qw#XkkzfD`EMA%5E2x*g zgiQ!dH1PqN^xAjmLo_|Ri*3TTnPlcalXHIOf6hDye(KuyUk^_J){ySxKX8wY}lewBTO5y8=9OW3~=^=C^uz;F!Ykz zv`b}cN7OhkX~eFdlC2rYmJ~J-Z-fD4l3D0*ejgLV>|s{f`&e9=!juP1vf<*hqS@WMu8CW zS?Sg#X!-MI{aAj!%_vz4-d-s`TK$B#nBn;oX7P^qLDm+Z#OJGc8zc8D6io0Qa33cS zVy$}tn8Xy{2y=*X)N40(-UkWyLZ-WrmRsfz#b7Ib3uC?6k$+m?adeaK*owkdzC0p+ z^bLt^b9kWx>(JzW##}MH>fJB7!4B3B&6kHZ!X2c%m`(TSVC!%FCT0=&eq)Hqv!%bLl01k!l%pifp z28o@&zkg!C_m9^%0JwnT0wxG&ds0t<*(S9mopPj(JYNUr$Z&}2>PEA^*D+Bn;0R&e z>SwK-_KmvRwK9V+JM=cf_M{q2wjHS|80{oWkD|)a7*aJy>zl7mX6saC6PKss$ae!_ zS=+{ImX#1*{_*yv3b9e)K)%aHwcRc!)nD~MCd7St`RngZ^%p4P`4UH1)gebix7Nw3 f>mSI@dmwWJgsCtGKp{ATx#&XF1Qt>)hidf+#YKPF literal 0 HcmV?d00001 diff --git a/bin/de/hottis/MeasurementCollector/ElectricEnergyDataObject.class b/bin/de/hottis/MeasurementCollector/ElectricEnergyDataObject.class new file mode 100644 index 0000000000000000000000000000000000000000..2747ab26a05e48a9119f56cb10777555f3290ae4 GIT binary patch literal 1262 zcmb7EZBNrs6n^eD=vK-G<3$Fd;OjPCii!%3kRYp?IEDc-!Y5M3b(D1N(zO`=m3#rC zi9f&}Wjyz`N(mvvFZbSa?zzu-&T~%t>-YDc02Z;VAi?nZkn2aT?^|7cgPYyJ<8AKv z>#l9{rtf;XA$HGd8V>hbr&ZH8HxG`vVn7@f)Tc@H8?Eym_PC^mOr^kK$Kqv1o;XzGQo-;v4#ypX7s|2dG zxG#&YOB%z)xWfPDT-|m9ugTw8Lb1u4s-73afNAPSlD^j@#?XUavJ|osNRzF`>^`#l zV|JEeXrM4iYo1=5Aw_Qhy*x8}fuSE5-Mhfp8>OJ+)1_~iILGuZo%_amBBNYT&hhw6 zrY_MsPT+t>Yd>zP{t117 zD2ee||C8~|ww4l7EAgQ_Ju_#%^PO|PGe3TP{RZF()^+qTESthOaDCtMjBUZah7>j7 z_#3Wmi;C|`W6N?(A$J_Hd%!)h>wXY&Tlhli&=`ge`Fn2I+^HHnD-19Cmj zeZI@3CnQ58YdMymV+f_vB?fK7HAM^|#1qhQg<-H@IpTGrRu*!PmuC?MPFJ@wYAgmE!!wq zo}WoKUCuTbqD8CfaGxs6@bN#evjtaH4Yw|wTBBkd*2)dfP?dZmDy}p$xeKwgy^0Yu zqS-jQu49a0BuG7=zb+*|Qc1-yinxwzy~VPrL?f-rrXytaNRexz$8jB#I&LrwoZ&0z z1g3D4dS4Yj!&vH7t9%`bB3ic?CjXXt4AZ!sz#ZHraS&3GKhmY{^oQZ%c#bV(6kQHJj>B96C3FcPANi7*Z#^T$g_K6@u z6b>|C3NB9I{S~N<+gZ1gq8}SkeC!Dmek;*=R4jGcJ14w5x4P(=#o- zV7gu=-EuiMFhq-H)#e^mm*LZYU}p=Ctm;lf*!5;bKdP6TuC8kNR#Y5mWOA2cXZw}I zZ$+zh^tpx!hA}^NpZ=DV{8%Lw!#Ls^t~0Fmsqc;wjx;Mfwvg3hMXrS&#|=ztxXCbh zj<28-xP{x){i^U7CQ`53f@LueTB`i-StU_$pC&}<^;1Rc(6D;a?x;#`SoxzlnkF> z>0L7PnJ|JB4>V&6FHYzK6m^i4Hh>j++o0HrQ?3=S&50u837+~qH|Z~7h4?AkbF30x hl-3tmLx}8gtRq8Z$kO>_$7`eGl_M{PmvkDy<{$6T!p;By literal 0 HcmV?d00001 diff --git a/bin/de/hottis/MeasurementCollector/HottisFourChannelThermometer.class b/bin/de/hottis/MeasurementCollector/HottisFourChannelThermometer.class new file mode 100644 index 0000000000000000000000000000000000000000..9b5bcbf7f6289051b1a09efe37122ddaf24b0bfa GIT binary patch literal 1677 zcmbtUTTc@~6#j;8yY#|Et`_lv*A|3DMN|q^Y$a%l8VVSE8@iKr$zGc6t_i=zKcO!W zB{4qxFZ?6MGrP5vplyf`-RaCZbIy0Z^PTze>+3fF3wWWThasm6t>$>1(a<&oZ}_gT zgzXg^(-alYakcfpw&wV5p~h`nm|HdBT85_^V!*rLh zt3~edx7=+Amm#)n*oK#9h-9)m3`)V#MFJ5dQ&7>%Fi1 z;jSU~%|pej84ZS&QkUGFO3E=r>k<~jMy3>$<{6gIf_#KoY|$+1wNr$JKNBGr5<$ z5fU^bY#v=#G0HF;lperebzOcSi%MVwNfj3v7P>IJC9Jw|gIXoBFmx{_h}?CdS49$& zxT4}RL;p!0nIeU&xJEjt3Xfql^Rh`}o4N?zb%x1K6eKW(ne z;XWQvy4O3(Iw!KEI2$J8Ni9OBLq zW|yLAB^^D){JYR+VRlgM;FMNAQQ!!H049PYNlMvAqtcIAg7S*MY+^V7nh!xVff5`n x;!yy88;|jXK+Cfw{sx74&BFiy literal 0 HcmV?d00001 diff --git a/bin/de/hottis/MeasurementCollector/MBusParser.class b/bin/de/hottis/MeasurementCollector/MBusParser.class index 7751f98b9797d9c1ef5c7672c418bf3c3aa3d661..7101ba22cce12ce9a1060c53228ad52a535c500c 100644 GIT binary patch literal 4885 zcmbtYd3aP;7608NN_KXNpSCA#g=Bn_C7asKglw`qW!zO(VEI_0 z*It8_VyCCYHn+#+Xu&ntCpa53Mdz;wTVZFVKyF!ii$GqT9g-g8qS$~JQw64!jdoIb ziw8cGXqYZAYqY%w+_BbFXz4O=BW4H`wn?Ynb!|`z%q=U=;;NCXHR_<521;==kzvWs z4Ffv_W@Z&J=puxt#W*K(={6_}@F zEifpO$u;fg(&2m>39KvN0KLmGNe?H9~uP19s4iw3zX*nr9aC zoc3@+pmHn(4aPeWGifm1G7c7)b3MKk(BuIbOgdC&K?YV%I4b?FYO760Hgi^!9dCEw zbs7lMlF@h@@VJ3Hu}Yx8jeLa^`ac_d(E2VV*p1=*gL+S-xw?(U~<5c4C)?yOh5Ml5D-@$Tk@_ z@Or#~$GLXmnm}_MBrR9dwkn*@TnMJ8e_0~A%sARjGf=w4np8FW~qC^3wE z8urpk*U6$3pRCxT1}xYD6R1d9fuJ1^F*dwBe-H~3Pj<6moOT62_!+3`EmMy75s1C-5=)*rcLXi2YEOXc~RZjBR+^Zk#mGqeSbDoz_d$ zha);ZMRzsZju}xI{zw6y!e=#nW_Tv)N;s16{TxmagLab9JSA%c13KH!1Kh?6swx*0S2wC%ADFuy&Dp3&C0|DcF>Vd!lfr?DImmidWS&Hu3DC( zF#odvY8fHyzp^A|)hT3(0uP+hk?A*-QwYO!o@N7;g)@6fX95Vh^&pdui-ugvO~#Cc z=-?BDXo@n)=9(eq^7&)6HAApMWd-v~CUS;5gWrmWcTZih{toKa5&Epia zR*qu1en`6l#&31Z;6A$4?cy~2tv~UO28f0$8eXF3xAMUglxxGP6`VNO&Mi<7!OiSL zbNT!mhiUwu&zZ(q4sR7E{h) zTA-pbg`3V`Rz)x7>^zIPXHZ76g5>-&s3Penx$q1YopPlu=I>4J>C>o(kEc(k{1VLI z6QYd2xAE%|?kP^6gQZx;nM#(oV>z`Ds76g%o4lozLtVwyil;GaehMoZtGu=6u{wuA zzs9>ELj|hys=SQ@%S{8z<9y@1TT*DQ&iCbCcvi30a+m5onC{c2=)U|Z`l6zubJ#Hn zefK=ld{`H1@xl{*FZ(o~cHtb}Sgrf?6hhSnzJe6m)la0_#Ha`54D|{_G{i91ks-AWw4aUS9IrevXgT1|Oco@ubi2 zIw^DO>cSpu=0a6vFS>X7@^bT1cvlMVIfqBj;D;XJ-5=%lY! zkLMQO_!Pdb)-DPh?|X$VXymFo+4~(HSCzsGJceRU(eDtK#0$8LJpL&I?C6wDXQP1K zPbqF8R_5}BFc0g9r3RG4kj}B8#PBHEtJMuv~1zo#HTG6c6x$a1^V> zF}?~O$2xHW8$>T#`{y`bVq^az8pW&F>>@Koyb^O6WGd5NDc8Klx6@E?XplHHx z@G|dqg!;aM-@-$kbMY#vLTcSl9UY)fFiO&2d&z$lzr%QHUX0)458U%dT52)RPfPpL zfV4jkNK;f=nxfLuNZ~K!yokwtG--jRVEtDO0S#;1UlOlr_&YsQ+=ou}XwJSt!)^^> zjXeh003-9SXkk$w!`m2>O>v@++VCko#tH6LjrdYJ8^|4CP>h$0>8pS6MmhNBe*s&c BZ&UyP delta 1581 zcmZ`(U2qds6#j00_HH(t(xz?Nv?VR5{YhKGPiY|_7O2*iwgQ1FDB`wVLQ1l!>81h- zK}E5OC|-+-imj;NzfcIEGaX)h5NDWiaO6#2e5EhG6VIj&j1Np^?w)(jx#v6gJ74ZZ z?THHI+U*}_0JI=`T={E(v^r+Q%ry-5`i6c6$NJ=uuE35$6)K7tN(GaOm4bfNiB*48MvBREpEKR%yNp1#WTO{<~C%29A1h)=^^*qEYZ{VyC-|#$(`FYh={YE{v)$k!J7` zlaWC!t`Bt(Mg3YltuvI=H}u>kpd*5P4l!_o+Db}d2vGfGDjG^skwkhhG@KYnkA^zpiBT&~ zNH5_q$IA>A_s+74zLIZMTy>UI8aSfjHOnKL$+^iZcpXPM-VnE4<-s>CrScI{gc z(D0Uuw{e_&yS33ieJ^!I^4=~(h!S_BWT24a#PojmI#!@q;@PYZCR23bfavxFgv~Qt zRdiKK&uxHT1%;%kBXGhz8ux$@y#7Y4HnQ&feQ<99~EZU zbUz-LL$D3dVGo68gBMWMltpb{v$yFA7TItWA#clnR%_VN>|Jrk9lqms`kmg@S*#J2 z^QtoIijX^ae9K{(mCAl;W-9l$pZodDWjq>|{c;w4VVB>P#b#^i4=aA<3br$Z)iY@G zt5@(0Bg|c4_j&C83C6Zd81cKaNM$i*LF~6S2eNpP%q(8bV%$1&jNxSN=QF72JC98M znD?Dac(<7j%_W_qdjdD`2PWvI7G2#$5HO$U2oN>ZXrr~ADC#77dWj&7zH!uI40Skw zdXifM#?go=G~pNe-oPTIo0^!yrzDIq?7(S!M%DrJ<8ypL)y64) z24`ueQ`F#>_===+6B!@A#y14=Ep??*19NHLQQG(98G@9f3%WQM#}6E>9HIP5#(9ou p;>nl8VtDSAz|qAK;q*pvA_>cK1Y*CF3|7D~;Um}!1ZKmDhN#7`cakbd%uX%HUJK;}ggnyKk7E3MG$**rO&! vVoXXxSJS>yMhi=uoQ@g{|J%%%tECKBu*Ar1vSO`kmI@oT`eWG1@!0GT&W delta 224 zcmeC+nZYY?>ff$?3=9k=4B_kyOpFZ1lNlL}H#+AqvxKA;mrUNw9L>hg;K|6K2^3eD zyn&gU*@J;^G9ODLZwXL7AhD=8wTO{HdlI7p2S@`*U~(tRbu`IKjrggN;?odWhB=n#aC`L~)hL~X)r9n^j1wkC>AA%mb zp;6EW^aH*0AH79;PCW>{%-*wRt+m(8JX&ws<@fKGHvqGkzmlI+IlHo&O73o~q?0x% z4EF5R!-=;-&5vbx;1%3%29p-a$?(B% zMK6QP;FkGOF}_x*<;w*HedyOOSjgtVpn@R;^jns+3@ZpBtbei3x;ItXO}BVY9&x$*NO}wDA6v405JY z(?6tGT|y7cuzi7wn?T-L;(rco2cts7qeyLWHm#%RE3 z;sfvuJd1JcW-@bU?z!`lemBg?@7E8|!5^9*!)e#dTA1V%?Rxa8IZvu^==BWpiu`48 zANYg2i_kv^ZqJW`8xx!2|M{FEQTKW#Whw^q3Ol|HgR8#Zy&jx~XBG|%(X*"); + return sb.toString(); + } } diff --git a/src/de/hottis/MeasurementCollector/ADataParser.java b/src/de/hottis/MeasurementCollector/ADataParser.java index d109410..3db53ab 100644 --- a/src/de/hottis/MeasurementCollector/ADataParser.java +++ b/src/de/hottis/MeasurementCollector/ADataParser.java @@ -5,6 +5,6 @@ import java.util.List; import org.openmuc.jmbus.DataRecord; -public interface ADataParser { - public List parse(LocalDateTime timestamp, String name, List dataRecords); +public interface ADataParser { + public List parse(LocalDateTime timestamp, String name, List dataRecords); } diff --git a/src/de/hottis/MeasurementCollector/ElectricEnergyDataObject.java b/src/de/hottis/MeasurementCollector/ElectricEnergyDataObject.java new file mode 100644 index 0000000..390d9b8 --- /dev/null +++ b/src/de/hottis/MeasurementCollector/ElectricEnergyDataObject.java @@ -0,0 +1,23 @@ +package de.hottis.MeasurementCollector; + +import java.time.LocalDateTime; +import java.util.HashMap; + +public class ElectricEnergyDataObject extends ADataObject { + static final String ENERGY_KEY = "energy"; + static final String POWER_KEY = "power"; + static final String TABLE_NAME = "ElectricEnergy"; + + public ElectricEnergyDataObject(LocalDateTime timestamp, String name, double energy, double power) { + super(timestamp, name); + HashMap values = new HashMap(); + values.put(ENERGY_KEY, energy); + values.put(POWER_KEY, power); + setValues(values); + } + + @Override + public String getTableName() { + return TABLE_NAME; + } +} diff --git a/src/de/hottis/MeasurementCollector/FinderOnePhasePowerMeter.java b/src/de/hottis/MeasurementCollector/FinderOnePhasePowerMeter.java new file mode 100644 index 0000000..005713a --- /dev/null +++ b/src/de/hottis/MeasurementCollector/FinderOnePhasePowerMeter.java @@ -0,0 +1,19 @@ +package de.hottis.MeasurementCollector; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.openmuc.jmbus.DataRecord; + +public class FinderOnePhasePowerMeter implements ADataParser { + public List parse(LocalDateTime timestamp, String name, List dataRecords) { + ArrayList list = new ArrayList(); + + ElectricEnergyDataObject tdo = new ElectricEnergyDataObject(timestamp, name, + dataRecords.get(0).getScaledDataValue(), dataRecords.get(4).getScaledDataValue()); + list.add(tdo); + + return list; + } +} diff --git a/src/de/hottis/MeasurementCollector/FinderThreePhasePowerMeter.java b/src/de/hottis/MeasurementCollector/FinderThreePhasePowerMeter.java new file mode 100644 index 0000000..ab4de8b --- /dev/null +++ b/src/de/hottis/MeasurementCollector/FinderThreePhasePowerMeter.java @@ -0,0 +1,19 @@ +package de.hottis.MeasurementCollector; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.openmuc.jmbus.DataRecord; + +public class FinderThreePhasePowerMeter implements ADataParser { + public List parse(LocalDateTime timestamp, String name, List dataRecords) { + ArrayList list = new ArrayList(); + + ElectricEnergyDataObject tdo = new ElectricEnergyDataObject(timestamp, name, + dataRecords.get(0).getScaledDataValue(), dataRecords.get(17).getScaledDataValue()); + list.add(tdo); + + return list; + } +} diff --git a/src/de/hottis/MeasurementCollector/HottisFourChannelThermometer.java b/src/de/hottis/MeasurementCollector/HottisFourChannelThermometer.java index 2dede56..6feb2a2 100644 --- a/src/de/hottis/MeasurementCollector/HottisFourChannelThermometer.java +++ b/src/de/hottis/MeasurementCollector/HottisFourChannelThermometer.java @@ -6,14 +6,15 @@ import java.util.List; import org.openmuc.jmbus.DataRecord; -public class HottisFourChannelThermometer implements ADataParser { - public List parse(LocalDateTime timestamp, String name, List dataRecords) { - ArrayList list = new ArrayList(); +public class HottisFourChannelThermometer implements ADataParser { + public List parse(LocalDateTime timestamp, String name, List dataRecords) { + ArrayList list = new ArrayList(); TemperatureDataObject tdo = new TemperatureDataObject(timestamp, "Hedge", dataRecords.get(5).getScaledDataValue()); list.add(tdo); tdo = new TemperatureDataObject(timestamp, "House", dataRecords.get(7).getScaledDataValue()); + list.add(tdo); return list; } diff --git a/src/de/hottis/MeasurementCollector/MBusParser.java b/src/de/hottis/MeasurementCollector/MBusParser.java index f321780..6ed0b65 100644 --- a/src/de/hottis/MeasurementCollector/MBusParser.java +++ b/src/de/hottis/MeasurementCollector/MBusParser.java @@ -16,11 +16,17 @@ public class MBusParser extends AMessageParser { static final String TOPIC = "IoT/Measurement/MeterbusHub"; private final JSONParser jsonParser; + private final HottisFourChannelThermometer hottisFourChannelThermometer; + private final FinderOnePhasePowerMeter finderOnePhasePowerMeter; + private final FinderThreePhasePowerMeter finderThreePhasePowerMeter; public MBusParser() { super(TOPIC); JsonParserFactory jsonParserFactory = JsonParserFactory.getInstance(); jsonParser = jsonParserFactory.newJsonParser(); + hottisFourChannelThermometer = new HottisFourChannelThermometer(); + finderOnePhasePowerMeter = new FinderOnePhasePowerMeter(); + finderThreePhasePowerMeter = new FinderThreePhasePowerMeter(); } @Override @@ -40,8 +46,33 @@ public class MBusParser extends AMessageParser { variableDataStructure.decode(); List dataRecords = variableDataStructure.getDataRecords(); - for (DataRecord dataRecord : dataRecords) { - System.out.println(dataRecord.getScaledDataValue() + " " + dataRecord.getUnit().getUnit()); + //for (DataRecord dataRecord : dataRecords) { + // System.out.println(dataRecord.getScaledDataValue() + " " + dataRecord.getUnit().getUnit()); + //} + + List measurementItems; + switch (name) { + case "thermom.": + measurementItems = hottisFourChannelThermometer.parse(timestamp, name, dataRecords); + break; + case "light": + case "computer": + case "freezer": + case "dryer": + case "laundry": + case "dishwasher": + measurementItems = finderOnePhasePowerMeter.parse(timestamp, name.substring(0,1).toUpperCase() + name.substring(1).toLowerCase(), dataRecords); + break; + case "electricity": + measurementItems = finderThreePhasePowerMeter.parse(timestamp, "Total", dataRecords); + break; + default: + System.out.println("unknown name"); + measurementItems = null; + } + + for (ADataObject ado : measurementItems) { + System.out.println(ado); } } catch (Exception e) { System.out.println("Exception when handling mbus message: " + e); diff --git a/src/de/hottis/MeasurementCollector/MeasurementCollector.java b/src/de/hottis/MeasurementCollector/MeasurementCollector.java index f31f048..3c4f678 100644 --- a/src/de/hottis/MeasurementCollector/MeasurementCollector.java +++ b/src/de/hottis/MeasurementCollector/MeasurementCollector.java @@ -15,8 +15,8 @@ public class MeasurementCollector { MqttReceiver mqttReceiver = new MqttReceiver(config); mqttReceiver.connect(); - TestParser testParser = new TestParser(); - mqttReceiver.registerParser(testParser); + // TestParser testParser = new TestParser(); + // mqttReceiver.registerParser(testParser); MBusParser mbusParser = new MBusParser(); mqttReceiver.registerParser(mbusParser); diff --git a/src/de/hottis/MeasurementCollector/TemperatureDataObject.java b/src/de/hottis/MeasurementCollector/TemperatureDataObject.java index 1a9969f..ec67dae 100644 --- a/src/de/hottis/MeasurementCollector/TemperatureDataObject.java +++ b/src/de/hottis/MeasurementCollector/TemperatureDataObject.java @@ -5,7 +5,7 @@ import java.util.HashMap; public class TemperatureDataObject extends ADataObject { static final String TEMPERATURE_KEY = "temperature"; - static final String TABLE_NAME = "temperature"; + static final String TABLE_NAME = "Temperature"; public TemperatureDataObject(LocalDateTime timestamp, String name, double temperature) { super(timestamp, name);