diff --git a/.gitignore b/.gitignore index f652b45..854a110 100644 --- a/.gitignore +++ b/.gitignore @@ -297,3 +297,5 @@ __pycache__/ *.btm.cs *.odx.cs *.xsd.cs +/Java/First Program/nbproject/private/ +/Java/First Program/build/ \ No newline at end of file diff --git a/C++/Learning c++/Learning c++.sln b/C++/Learning c++/Learning c++.sln new file mode 100644 index 0000000..586a05e --- /dev/null +++ b/C++/Learning c++/Learning c++.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2043 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Learning c++", "Learning c++\Learning c++.vcxproj", "{7BDBAFCF-76B0-490F-88D4-6F077C7717A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Debug|x64.ActiveCfg = Debug|x64 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Debug|x64.Build.0 = Debug|x64 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Debug|x86.ActiveCfg = Debug|Win32 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Debug|x86.Build.0 = Debug|Win32 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Release|x64.ActiveCfg = Release|x64 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Release|x64.Build.0 = Release|x64 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Release|x86.ActiveCfg = Release|Win32 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C70229D8-3F1C-4885-869E-076C00D14444} + EndGlobalSection +EndGlobal diff --git a/C++/Learning c++/Learning c++/Learning c++.cpp b/C++/Learning c++/Learning c++/Learning c++.cpp new file mode 100644 index 0000000..6c62e09 Binary files /dev/null and b/C++/Learning c++/Learning c++/Learning c++.cpp differ diff --git a/C++/Learning c++/Learning c++/Learning c++.vcxproj b/C++/Learning c++/Learning c++/Learning c++.vcxproj new file mode 100644 index 0000000..e315e0c --- /dev/null +++ b/C++/Learning c++/Learning c++/Learning c++.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {7BDBAFCF-76B0-490F-88D4-6F077C7717A9} + Win32Proj + Learningc + 10.0.16299.0 + + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/C++/Learning c++/Learning c++/Learning c++.vcxproj.filters b/C++/Learning c++/Learning c++/Learning c++.vcxproj.filters new file mode 100644 index 0000000..f5cd331 --- /dev/null +++ b/C++/Learning c++/Learning c++/Learning c++.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/C++/Learning c++/Learning c++/stdafx.cpp b/C++/Learning c++/Learning c++/stdafx.cpp new file mode 100644 index 0000000..d41c338 Binary files /dev/null and b/C++/Learning c++/Learning c++/stdafx.cpp differ diff --git a/C++/Learning c++/Learning c++/stdafx.h b/C++/Learning c++/Learning c++/stdafx.h new file mode 100644 index 0000000..94d4ed8 Binary files /dev/null and b/C++/Learning c++/Learning c++/stdafx.h differ diff --git a/C++/Learning c++/Learning c++/targetver.h b/C++/Learning c++/Learning c++/targetver.h new file mode 100644 index 0000000..567cd34 Binary files /dev/null and b/C++/Learning c++/Learning c++/targetver.h differ diff --git a/Java/First Program/build.xml b/Java/First Program/build.xml new file mode 100644 index 0000000..17ce683 --- /dev/null +++ b/Java/First Program/build.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + Builds, tests, and runs the project First Program. + + + diff --git a/Java/First Program/manifest.mf b/Java/First Program/manifest.mf new file mode 100644 index 0000000..328e8e5 --- /dev/null +++ b/Java/First Program/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/Java/First Program/nbproject/build-impl.xml b/Java/First Program/nbproject/build-impl.xml new file mode 100644 index 0000000..3734af2 --- /dev/null +++ b/Java/First Program/nbproject/build-impl.xml @@ -0,0 +1,1420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Java/First Program/nbproject/genfiles.properties b/Java/First Program/nbproject/genfiles.properties new file mode 100644 index 0000000..db3bbbc --- /dev/null +++ b/Java/First Program/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=e32cc2f0 +build.xml.script.CRC32=d8a1b36c +build.xml.stylesheet.CRC32=8064a381@1.80.1.48 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=e32cc2f0 +nbproject/build-impl.xml.script.CRC32=ca980d1c +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/Java/First Program/nbproject/project.properties b/Java/First Program/nbproject/project.properties new file mode 100644 index 0000000..0975d72 --- /dev/null +++ b/Java/First Program/nbproject/project.properties @@ -0,0 +1,74 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processor.options= +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/First_Program.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +includes=** +jar.compress=false +javac.classpath= +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.external.vm=true +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class=first.program.FirstProgram +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project. +# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/Java/First Program/nbproject/project.xml b/Java/First Program/nbproject/project.xml new file mode 100644 index 0000000..affacf3 --- /dev/null +++ b/Java/First Program/nbproject/project.xml @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + First Program + + + + + + + + + diff --git a/Java/First Program/src/first/program/FirstProgram.java b/Java/First Program/src/first/program/FirstProgram.java new file mode 100644 index 0000000..4f429bb --- /dev/null +++ b/Java/First Program/src/first/program/FirstProgram.java @@ -0,0 +1,28 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package first.program; + +/** + * + * @author Ben + */ +public class FirstProgram { + + /** + * @param args the command line arguments + */ + public static void main(String[] args) { + Person dave = new Person("Dave"); + System.out.println(dave.Name); + } +} + +class Person { + public String Name; + public Person(String name) { + Name = name; + } +} diff --git a/JavaScript/adruino-temp-sensor/client/history.csv b/JavaScript/adruino-temp-sensor/client/history.csv index dd68faf..b254906 100644 --- a/JavaScript/adruino-temp-sensor/client/history.csv +++ b/JavaScript/adruino-temp-sensor/client/history.csv @@ -237,3 +237,7 @@ time,temperature 2018-7-22 18:02:03,30 2018-7-22 18:03:03,30 2018-7-22 18:04:03,30 +2018-7-25 13:23:28,32 +2018-7-25 13:24:28,32 +2018-7-25 13:25:28,32 +2018-7-25 13:26:28,32 diff --git a/JavaScript/adruino-temp-sensor/index.js b/JavaScript/adruino-temp-sensor/index.js index 8809dec..01cee5b 100644 --- a/JavaScript/adruino-temp-sensor/index.js +++ b/JavaScript/adruino-temp-sensor/index.js @@ -7,7 +7,7 @@ let server = require('http').createServer(app); let io = require('socket.io')(server); /* COMMUNICATION WITH ARDUINO AND CLENSING OF DATA */ -let lastHour = [] +let lastHour = []; let history = []; let temperature; const parser = new parsers.Readline({ @@ -42,7 +42,7 @@ app.get('/', function(req, res) { res.sendFile(__dirname + '/client/index.html'); }); app.listen(7000); -console.log('Server listening on 8081') +console.log('Server listening on 7000') /* WEBSOCKETS */