Skip to content

Commit

Permalink
updated Frame class
Browse files Browse the repository at this point in the history
  • Loading branch information
@tainfante
tainfante committed Dec 13, 2017
1 parent bfd2a1d commit 48334c5
Showing 1 changed file with 17 additions and 147 deletions.
164 changes: 17 additions & 147 deletions src/classes/Frame.java
View file
Original file line number Diff line number Diff line change
@@ -1,138 +1,36 @@
package classes;

import java.time.LocalTime;
import java.time.format.DateTimeFormatter;

public class Frame {

private byte number_of_channels;
private Integer channel_1_data;
private Integer channel_2_data;
private Integer channel_3_data;
private Integer channel_4_data;
private Integer channel_5_data;
private Integer channel_6_data;
private Integer channel_7_data;
private Integer channel_8_data;
private String time;
private Integer[] channel_data=new Integer[10];
private String formattedTime;
private DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_TIME ;

//Constructors

public Frame(String time, byte number_of_channels, Integer channel_1_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data, Integer channel_4_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.channel_4_data = channel_4_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data, Integer channel_4_data, Integer channel_5_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.channel_4_data = channel_4_data;
this.channel_5_data = channel_5_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data, Integer channel_4_data, Integer channel_5_data,
Integer channel_6_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.channel_4_data = channel_4_data;
this.channel_5_data = channel_5_data;
this.channel_6_data = channel_6_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data, Integer channel_4_data, Integer channel_5_data,
Integer channel_6_data, Integer channel_7_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.channel_4_data = channel_4_data;
this.channel_5_data = channel_5_data;
this.channel_6_data = channel_6_data;
this.channel_7_data = channel_7_data;
this.time = time;
}
public Frame(String time, byte number_of_channels, Integer channel_1_data, Integer channel_2_data,
Integer channel_3_data, Integer channel_4_data, Integer channel_5_data,
Integer channel_6_data, Integer channel_7_data, Integer channel_8_data) {
this.number_of_channels = number_of_channels;
this.channel_1_data = channel_1_data;
this.channel_2_data = channel_2_data;
this.channel_3_data = channel_3_data;
this.channel_4_data = channel_4_data;
this.channel_5_data = channel_5_data;
this.channel_6_data = channel_6_data;
this.channel_7_data = channel_7_data;
this.channel_8_data = channel_8_data;
this.time = time;
public Frame(Integer[] channel_data) {
this.channel_data = channel_data;
LocalTime time=LocalTime.now();
formattedTime = formatter.format(time);
}


//Setters

public void setNumber_of_channels(byte number_of_channels) {
this.number_of_channels = number_of_channels;
}

public void setChannel_1_data(Integer channel_1_data) {
this.channel_1_data = channel_1_data;
}

public void setChannel_2_data(Integer channel_2_data) {
this.channel_2_data = channel_2_data;
}

public void setChannel_3_data(Integer channel_3_data) {
this.channel_3_data = channel_3_data;
}

public void setChannel_4_data(Integer channel_4_data) {
this.channel_4_data = channel_4_data;
}

public void setChannel_5_data(Integer channel_5_data) {
this.channel_5_data = channel_5_data;
}

public void setChannel_6_data(Integer channel_6_data) {
this.channel_6_data = channel_6_data;
}

public void setChannel_7_data(Integer channel_7_data) {
this.channel_7_data = channel_7_data;
}

public void setChannel_8_data(Integer channel_8_data) {
this.channel_8_data = channel_8_data;
public void setChannel_data(Integer[] channel_data) {
this.channel_data = channel_data;
}

public void setTime(String time) {
this.time = time;
this.formattedTime = time;
}

//Getters
Expand All @@ -141,39 +39,11 @@ public byte getNumber_of_channels() {
return number_of_channels;
}

public Integer getChannel_1_data() {
return channel_1_data;
}

public Integer getChannel_2_data() {
return channel_2_data;
}

public Integer getChannel_3_data() {
return channel_3_data;
}

public Integer getChannel_4_data() {
return channel_4_data;
}

public Integer getChannel_5_data() {
return channel_5_data;
}

public Integer getChannel_6_data() {
return channel_6_data;
}

public Integer getChannel_7_data() {
return channel_7_data;
}

public Integer getChannel_8_data() {
return channel_8_data;
public Integer[] getChannel_data() {
return channel_data;
}

public String getTime() {
return time;
return formattedTime;
}
}

0 comments on commit 48334c5

Please sign in to comment.