Merge branch 'master' of https://github.com/profesorfalken/jSensors

# Conflicts:
#	.gitignore
#	pom.xml

Author: profesorfalken

.gitignore

@@ -6,4 +6,4 @@ null
 *.iml
 .gitignore
 .vscode/.gitignore
-/jSensors.iml
+/jSensors.iml

README.md

@@ -39,14 +39,14 @@ Monitorize all the hardware sensors of your PC using Java
 
 ## Installation ##
 
-To install jSensors you can add the dependecy to your software project management tool: http://mvnrepository.com/artifact/com.profesorfalken/jSensors/1.0.2
+To install jSensors you can add the dependecy to your software project management tool: http://mvnrepository.com/artifact/com.profesorfalken/jSensors/2.0.2
 
 For example, for Maven you have just to add to your pom.xml: 
 
      <dependency>
           <groupId>com.profesorfalken</groupId>
           <artifactId>jSensors</artifactId>
-          <version>1.0.2</version>
+          <version>2.0.2</version>
      </dependency>
 
 
@@ -90,6 +90,27 @@ It will retrieve a list of hardware components: CPUs, GPUs, Disks...
 
 Same for other hardware components as GPU or Disks.
 
+### Use as a standalone application ###
+
+Execute jSensors and get all sensors data: 
+
+```
+    java -jar jsensors-2.0.2.jar
+```
+
+This will generate a console output. 
+
+
+It is also possible to show a simple gui with all the sensors data:
+
+```
+    java -jar jsensors-2.0.2.jar --gui
+```
+
+Result:
+
+![jSensorsGUI](https://raw.githubusercontent.com/profesorfalken/profesorfalken.github.io/master/files/jsensors-gui.png)
+
 ## Configuring jSensors ##
 
 In order to change jSensors configuration you can either:
@@ -98,16 +119,19 @@ In order to change jSensors configuration you can either:
 
 You only have to create in your classpaht a file with the name _jsensors.properties_.
 
-For the moment (v1.0-PreAlfa) the only modificable parameters (and its default values) are: 
-
-    # Used for unit testing 
+For the moment the only modificable parameters (and its default values) are: 
+    
+    # Test mode
+    # REAL: test on real hardware
+    # STUB: use simulated/hardcoded results to test
     testMode=REAL
-    stubFile=stubFileName
-
+    # Stub Content
+    # string value of the simulated results
+    stubContent=""
     # Debug mode
     # If activated it logs in console all retrieved details
     debugMode=false
-    
+     
 #### Override config element for one request ####
 
 When performing a request we can easily override config elements: 

src/main/java/com/profesorfalken/jsensors/manager/SensorsManager.java

@@ -21,10 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import com.profesorfalken.jsensors.model.components.Components;
-import com.profesorfalken.jsensors.model.components.Cpu;
-import com.profesorfalken.jsensors.model.components.Disk;
-import com.profesorfalken.jsensors.model.components.Gpu;
+import com.profesorfalken.jsensors.model.components.*;
 import com.profesorfalken.jsensors.model.sensors.Fan;
 import com.profesorfalken.jsensors.model.sensors.Load;
 import com.profesorfalken.jsensors.model.sensors.Sensors;
@@ -49,6 +46,7 @@ public Components getComponents() {
 		List<Cpu> cpus = new ArrayList<Cpu>();
 		List<Gpu> gpus = new ArrayList<Gpu>();
 		List<Disk> disks = new ArrayList<Disk>();
+		List<Mobo> mobos = new ArrayList<Mobo>();
 
 		String normalizedSensorsData = getSensorsData();
 
@@ -61,10 +59,12 @@ public Components getComponents() {
 				gpus.add(getGpu(componentData));
 			} else if (componentData.startsWith("DISK")) {
 				disks.add(getDisk(componentData));
+			} else if (componentData.startsWith("MOBO")) {
+				mobos.add(getMobo(componentData));
 			}
 		}
 
-		return new Components(cpus, gpus, disks);
+		return new Components(cpus, gpus, disks, mobos);
 	}
 
 	private Cpu getCpu(String cpuData) {
@@ -79,6 +79,10 @@ private Disk getDisk(String diskData) {
 		return new Disk(getName(diskData), getSensors(diskData));
 	}
 
+	private Mobo getMobo(String moboData) {
+		return new Mobo(getName(moboData), getSensors(moboData));
+	}
+
 	private static String getName(String componentData) {
 		String name = null;
 

src/main/java/com/profesorfalken/jsensors/manager/windows/WindowsSensorsManager.java

@@ -71,6 +71,10 @@ private static String normalizeSensorsData(String rawSensorsData) {
                     normalizedSensorsData.append(COMPONENT_SEPARATOR).append(LINE_BREAK);
                     normalizedSensorsData.append("DISK").append(LINE_BREAK);
                     readingHardLabel = true;
+                } else if ("Mainboard".equals(hardwareType)) {
+                    normalizedSensorsData.append(COMPONENT_SEPARATOR).append(LINE_BREAK);
+                    normalizedSensorsData.append("MOBO").append(LINE_BREAK);
+                    readingHardLabel = false;
                 }
                 continue;
             }

src/main/java/com/profesorfalken/jsensors/manager/windows/powershell/PowerShellScriptHelper.java

@@ -76,6 +76,11 @@ private static String sensorsQueryLoop() {
 		code.append("ForEach ($subhw in $hw.SubHardware)").append(LINE_BREAK);
 		code.append("{").append(LINE_BREAK);
 		code.append("$subhw.Update()").append(LINE_BREAK);
+		code.append("ForEach ($sensor in $subhw.Sensors)").append(LINE_BREAK);
+		code.append("{").append(LINE_BREAK);
+		code.append("$sensor").append(LINE_BREAK);
+		code.append("Write-Host \"\"").append(LINE_BREAK);
+		code.append("}").append(LINE_BREAK);
 		code.append("}").append(LINE_BREAK);
 		code.append("ForEach ($sensor in $hw.Sensors)").append(LINE_BREAK);
 		code.append("{").append(LINE_BREAK);

src/main/java/com/profesorfalken/jsensors/model/components/Components.java

@@ -25,10 +25,12 @@ public class Components {
 	public final List<Cpu> cpus;
 	public final List<Gpu> gpus;
 	public final List<Disk> disks;
+	public final List<Mobo> mobos;
 
-	public Components(List<Cpu> cpus, List<Gpu> gpus, List<Disk> disks) {
+	public Components(List<Cpu> cpus, List<Gpu> gpus, List<Disk> disks, List<Mobo> mobos) {
 		this.cpus = cpus;
 		this.gpus = gpus;
 		this.disks = disks;
+		this.mobos = mobos;
 	}
 }

src/main/java/com/profesorfalken/jsensors/model/components/Mobo.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016-2017 Javier Garcia Alonso.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.profesorfalken.jsensors.model.components;
+
+import com.profesorfalken.jsensors.model.sensors.Sensors;
+
+/**
+ *
+ * @author Roel Goossens
+ */
+public class Mobo extends Component {
+
+	public Mobo(String name, Sensors sensors) {
+		super(name, sensors);
+	}
+
+}

src/main/resources/jsensors.properties

@@ -2,8 +2,9 @@
 # REAL: test on real hardware
 # STUB: use simulated/hardcoded results to test
 testMode=REAL
-stubFile=stubFileName
-
+# Stub Content
+# string value of the simulated results
+stubContent=""
 # Debug mode
 # If activated it logs in console all retrieved details
 debugMode=false