Sfoglia il codice sorgente

Refactored Fan and FanSpeedProfile into model package

Tankernn 8 anni fa
parent
commit
e2ea155b22

+ 1 - 0
src/main/java/eu/tankernn/grid/GridControl.java

@@ -22,6 +22,7 @@ import dorkbox.systemTray.MenuItem;
 import dorkbox.systemTray.SystemTray;
 import eu.tankernn.grid.frame.GridControlPanel;
 import eu.tankernn.grid.model.ComputerModel;
+import eu.tankernn.grid.model.FanSpeedProfile;
 
 public class GridControl implements Runnable {
 

+ 2 - 2
src/main/java/eu/tankernn/grid/frame/FanPanel.java

@@ -10,8 +10,8 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.TitledBorder;
 
-import eu.tankernn.grid.Fan;
-import eu.tankernn.grid.FanSpeedProfile;
+import eu.tankernn.grid.model.Fan;
+import eu.tankernn.grid.model.FanSpeedProfile;
 
 public class FanPanel extends JPanel {
 

+ 1 - 1
src/main/java/eu/tankernn/grid/frame/GridControlPanel.java

@@ -25,9 +25,9 @@ import javax.swing.SpinnerNumberModel;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 
-import eu.tankernn.grid.FanSpeedProfile;
 import eu.tankernn.grid.GridControl;
 import eu.tankernn.grid.model.ComputerModel;
+import eu.tankernn.grid.model.FanSpeedProfile;
 
 public class GridControlPanel extends JFrame {
 

+ 1 - 1
src/main/java/eu/tankernn/grid/frame/ProfileEditor.java

@@ -14,7 +14,7 @@ import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JTextField;
 
-import eu.tankernn.grid.FanSpeedProfile;
+import eu.tankernn.grid.model.FanSpeedProfile;
 
 public class ProfileEditor {
 	

+ 0 - 1
src/main/java/eu/tankernn/grid/model/ComputerModel.java

@@ -15,7 +15,6 @@ import java.util.stream.Stream;
 
 import com.fazecast.jSerialComm.SerialPort;
 
-import eu.tankernn.grid.FanSpeedProfile;
 import eu.tankernn.grid.model.sensor.Sensor;
 import eu.tankernn.grid.model.sensor.SensorFactory;
 

+ 1 - 3
src/main/java/eu/tankernn/grid/Fan.java → src/main/java/eu/tankernn/grid/model/Fan.java

@@ -1,10 +1,8 @@
-package eu.tankernn.grid;
+package eu.tankernn.grid.model;
 
 import java.io.IOException;
 import java.util.function.BiFunction;
 
-import eu.tankernn.grid.model.Communicator;
-
 public class Fan {
 	private double voltage, current;
 	private int rpm, index;

+ 1 - 1
src/main/java/eu/tankernn/grid/FanSpeedProfile.java → src/main/java/eu/tankernn/grid/model/FanSpeedProfile.java

@@ -1,4 +1,4 @@
-package eu.tankernn.grid;
+package eu.tankernn.grid.model;
 
 import java.util.Arrays;
 

+ 0 - 2
src/main/java/eu/tankernn/grid/model/GRID.java

@@ -5,8 +5,6 @@ import java.util.Arrays;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import eu.tankernn.grid.Fan;
-
 /**
  * This class uses the communicator class to communicate with the GRID+
  * controller.