Skip to content

Commit

Permalink
[gree] Allow wider temperature range (openhab#14217)
Browse files Browse the repository at this point in the history 
* Fix checkstyle
* Allow wider temp range
* Remaining checkstyle

Signed-off-by: lsiepel <[email protected]>
  • Loading branch information
@lsiepel @renescherer
lsiepel authored and renescherer committed Mar 23, 2023
1 parent ce29f30 commit fb04b5c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions ...ab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeBindingConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ public class GreeBindingConstants {
// Temperatur types and min/max ranges
public static final int TEMP_UNIT_CELSIUS = 0;
public static final int TEMP_UNIT_FAHRENHEIT = 1;
public static final int TEMP_MIN_C = 16;
public static final int TEMP_MIN_C = 5;
public static final int TEMP_MAX_C = 30;
public static final int TEMP_MIN_F = 61;
public static final int TEMP_MIN_F = 41;
public static final int TEMP_MAX_F = 86;
public static final int TEMP_HALFSTEP_NO = 0;
public static final int TEMP_HALFSTEP_YES = 1;
Expand Down
2 changes: 1 addition & 1 deletion ...g.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public boolean isMalformedURL() {
return getCauseClass() == UnknownHostException.class;
}

public boolean IsJSONException() {
public boolean isJSONException() {
return getCauseClass() == JsonSyntaxException.class;
}

Expand Down
8 changes: 4 additions & 4 deletions ...ding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
@Component(service = GreeDeviceFinder.class, configurationPid = "devicefinder.gree")
public class GreeDeviceFinder {
private final Logger logger = LoggerFactory.getLogger(GreeDeviceFinder.class);
private static final Gson gson = (new GsonBuilder()).create();
private static final Gson GSON = (new GsonBuilder()).create();

protected final InetAddress ipAddress = InetAddress.getLoopbackAddress();
protected Map<String, GreeAirDevice> deviceTable = new HashMap<>();
Expand All @@ -75,7 +75,7 @@ public void scan(DatagramSocket clientSocket, String broadcastAddress, boolean s
// Send the Scan message
GreeScanRequestDTO scanGson = new GreeScanRequestDTO();
scanGson.t = GREE_CMDT_SCAN;
String scanReq = gson.toJson(scanGson);
String scanReq = GSON.toJson(scanGson);
sendData = scanReq.getBytes(StandardCharsets.UTF_8);
logger.debug("Sending scan packet to {}", ipAddress.getHostAddress());
clientSocket.setSoTimeout(DISCOVERY_TIMEOUT_MS);
Expand Down Expand Up @@ -108,7 +108,7 @@ public void scan(DatagramSocket clientSocket, String broadcastAddress, boolean s
logger.debug("Response received from address {}: {}", remoteAddress.getHostAddress(), decryptedMsg);

// Create the JSON to hold the response values
scanResponseGson.packJson = gson.fromJson(decryptedMsg, GreeScanReponsePackDTO.class);
scanResponseGson.packJson = GSON.fromJson(decryptedMsg, GreeScanReponsePackDTO.class);

// Now make sure the device is reported as a Gree device
if (scanResponseGson.packJson.brand.equalsIgnoreCase("gree")) {
Expand All @@ -135,7 +135,7 @@ public void scan(DatagramSocket clientSocket, String broadcastAddress, boolean s

private <T> T fromJson(DatagramPacket packet, Class<T> classOfT) {
String json = new String(packet.getData(), StandardCharsets.UTF_8).replace("\\u0000", "").trim();
return gson.fromJson(json, classOfT);
return GSON.fromJson(json, classOfT);
}

public void addDevice(GreeAirDevice newDevice) {
Expand Down
36 changes: 18 additions & 18 deletions ...b.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeAirDevice.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
@NonNullByDefault
public class GreeAirDevice {
private final Logger logger = LoggerFactory.getLogger(GreeAirDevice.class);
private static final Gson gson = new Gson();
private static final Gson GSON = new Gson();
private boolean isBound = false;
private final InetAddress ipAddress;
private int port = 0;
Expand Down Expand Up @@ -115,7 +115,7 @@ public void getDeviceStatus(DatagramSocket clientSocket) throws GreeException {
reqStatusPackGson.t = GREE_CMDT_STATUS;
reqStatusPackGson.cols = colArray;
reqStatusPackGson.mac = getId();
String reqStatusPackStr = gson.toJson(reqStatusPackGson);
String reqStatusPackStr = GSON.toJson(reqStatusPackGson);

// Encrypt and send the Status Request pack
String encryptedStatusReqPacket = GreeCryptoUtil.encryptPack(getKey(), reqStatusPackStr);
Expand All @@ -134,7 +134,7 @@ public void getDeviceStatus(DatagramSocket clientSocket) throws GreeException {
GreeStatusResponseDTO resp = receiveResponse(clientSocket, GreeStatusResponseDTO.class);
resp.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), resp.pack);
logger.debug("Response from device: {}", resp.decryptedPack);
resp.packJson = gson.fromJson(resp.decryptedPack, GreeStatusResponsePackDTO.class);
resp.packJson = GSON.fromJson(resp.decryptedPack, GreeStatusResponsePackDTO.class);

// save the results
statusResponseGson = Optional.of(resp);
Expand All @@ -155,7 +155,7 @@ public void bindWithDevice(DatagramSocket clientSocket) throws GreeException {
bindReqPackGson.mac = getId();
bindReqPackGson.t = GREE_CMDT_BIND;
bindReqPackGson.uid = 0;
String bindReqPackStr = gson.toJson(bindReqPackGson);
String bindReqPackStr = GSON.toJson(bindReqPackGson);

// Encrypt and send the Binding Request pack
String encryptedBindReqPacket = GreeCryptoUtil.encryptPack(GreeCryptoUtil.getAESGeneralKeyByteArray(),
Expand All @@ -166,7 +166,7 @@ public void bindWithDevice(DatagramSocket clientSocket) throws GreeException {
// Recieve a response, create the JSON to hold the response values
GreeBindResponseDTO resp = receiveResponse(clientSocket, GreeBindResponseDTO.class);
resp.decryptedPack = GreeCryptoUtil.decryptPack(GreeCryptoUtil.getAESGeneralKeyByteArray(), resp.pack);
resp.packJson = gson.fromJson(resp.decryptedPack, GreeBindResponsePackDTO.class);
resp.packJson = GSON.fromJson(resp.decryptedPack, GreeBindResponsePackDTO.class);

// Now set the key and flag to indicate the bind was successful
encKey = resp.packJson.key;
Expand Down Expand Up @@ -277,10 +277,10 @@ public void setDeviceTempSet(DatagramSocket clientSocket, QuantityType<?> temp)
// If commanding Fahrenheit set halfStep to 1 or 0 to tell the A/C which F integer
// temperature to use as celsius alone is ambigious
double newVal = temp.doubleValue();
int CorF = SIUnits.CELSIUS.equals(temp.getUnit()) ? TEMP_UNIT_CELSIUS : TEMP_UNIT_FAHRENHEIT; // 0=Celsius,
int celsiusOrFahrenheit = SIUnits.CELSIUS.equals(temp.getUnit()) ? TEMP_UNIT_CELSIUS : TEMP_UNIT_FAHRENHEIT; // 0=Celsius,
// 1=Fahrenheit
if (((CorF == TEMP_UNIT_CELSIUS) && (newVal < TEMP_MIN_C || newVal > TEMP_MAX_C))
|| ((CorF == TEMP_UNIT_FAHRENHEIT) && (newVal < TEMP_MIN_F || newVal > TEMP_MAX_F))) {
if (((celsiusOrFahrenheit == TEMP_UNIT_CELSIUS) && (newVal < TEMP_MIN_C || newVal > TEMP_MAX_C))
|| ((celsiusOrFahrenheit == TEMP_UNIT_FAHRENHEIT) && (newVal < TEMP_MIN_F || newVal > TEMP_MAX_F))) {
throw new IllegalArgumentException("Temp Value out of Range");
}

Expand All @@ -301,15 +301,15 @@ public void setDeviceTempSet(DatagramSocket clientSocket, QuantityType<?> temp)
// ******************TempRec TemSet Mapping for setting Fahrenheit****************************
// subtract the float version - the int version to get the fractional difference
// if the difference is positive set halfStep to 1, negative to 0
if (CorF == TEMP_UNIT_FAHRENHEIT) { // If Fahrenheit,
if (celsiusOrFahrenheit == TEMP_UNIT_FAHRENHEIT) { // If Fahrenheit,
halfStep = newVal - outVal > 0 ? TEMP_HALFSTEP_YES : TEMP_HALFSTEP_NO;
}
logger.debug("Converted temp from {}{} to temp={}, halfStep={}, unit={})", newVal, temp.getUnit(), outVal,
halfStep, CorF == TEMP_UNIT_CELSIUS ? "C" : "F");
halfStep, celsiusOrFahrenheit == TEMP_UNIT_CELSIUS ? "C" : "F");

// Set the values in the HashMap
HashMap<String, Integer> parameters = new HashMap<>();
parameters.put(GREE_PROP_TEMPUNIT, CorF);
parameters.put(GREE_PROP_TEMPUNIT, celsiusOrFahrenheit);
parameters.put(GREE_PROP_SETTEMP, outVal);
parameters.put(GREE_PROP_TEMPREC, halfStep);
executeCommand(clientSocket, parameters);
Expand Down Expand Up @@ -423,7 +423,7 @@ protected void executeCommand(DatagramSocket clientSocket, Map<String, Integer>
execCmdPackGson.opt = keyArray;
execCmdPackGson.p = valueArray;
execCmdPackGson.t = GREE_CMDT_CMD;
String execCmdPackStr = gson.toJson(execCmdPackGson);
String execCmdPackStr = GSON.toJson(execCmdPackGson);

// Now encrypt and send the Command Request pack
String encryptedCommandReqPacket = GreeCryptoUtil.encryptPack(getKey(), execCmdPackStr);
Expand All @@ -435,7 +435,7 @@ protected void executeCommand(DatagramSocket clientSocket, Map<String, Integer>
execResponseGson.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), execResponseGson.pack);

// Create the JSON to hold the response values
execResponseGson.packJson = gson.fromJson(execResponseGson.decryptedPack, GreeExecResponsePackDTO.class);
execResponseGson.packJson = GSON.fromJson(execResponseGson.decryptedPack, GreeExecResponsePackDTO.class);
} catch (IOException | JsonSyntaxException e) {
throw new GreeException("Exception on command execution", e);
}
Expand All @@ -461,7 +461,7 @@ private DatagramPacket createPackRequest(int i, String pack) {
request.uid = 0;
request.tcid = getId();
request.pack = pack;
byte[] sendData = gson.toJson(request).getBytes(StandardCharsets.UTF_8);
byte[] sendData = GSON.toJson(request).getBytes(StandardCharsets.UTF_8);
DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, ipAddress, port);
return sendPacket;
}
Expand All @@ -472,20 +472,20 @@ private <T> T receiveResponse(DatagramSocket clientSocket, Class<T> classOfT)
DatagramPacket receivePacket = new DatagramPacket(receiveData, receiveData.length);
clientSocket.receive(receivePacket);
String json = new String(receivePacket.getData(), StandardCharsets.UTF_8).replace("\\u0000", "").trim();
return gson.fromJson(json, classOfT);
return GSON.fromJson(json, classOfT);
}

private void updateTempFtoC() {
// Status message back from A/C always reports degrees C
// If using Fahrenheit, us SetTem, TemUn and TemRec to reconstruct the Fahrenheit temperature
// Get Celsius or Fahrenheit from status message
int CorF = getIntStatusVal(GREE_PROP_TEMPUNIT);
int celsiusOrFahrenheit = getIntStatusVal(GREE_PROP_TEMPUNIT);
int newVal = getIntStatusVal(GREE_PROP_SETTEMP);
int halfStep = getIntStatusVal(GREE_PROP_TEMPREC);

if ((CorF == -1) || (newVal == -1) || (halfStep == -1)) {
if ((celsiusOrFahrenheit == -1) || (newVal == -1) || (halfStep == -1)) {
throw new IllegalArgumentException("SetTem,TemUn or TemRec is invalid, not performing conversion");
} else if (CorF == 1) { // convert SetTem to Fahrenheit
} else if (celsiusOrFahrenheit == 1) { // convert SetTem to Fahrenheit
// Find the valueName in the Returned Status object
String[] columns = statusResponseGson.get().packJson.cols;
Integer[] values = statusResponseGson.get().packJson.dat;
Expand Down

0 comments on commit fb04b5c

Please sign in to comment.