demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 23:22:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[gree] Allow wider temperature range (#14217)

Browse Source 
* Fix checkstyle
* Allow wider temp range
* Remaining checkstyle

Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-01-14 12:14:09 +01:00 committed by GitHub
parent d497defe34
commit b9bec522ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeBindingConstants.java
View File

@ -143,9 +143,9 @@ public class GreeBindingConstants {
// Temperatur types and min/max ranges // Temperatur types and min/max ranges
public static final int TEMP_UNIT_CELSIUS = 0; public static final int TEMP_UNIT_CELSIUS = 0;
public static final int TEMP_UNIT_FAHRENHEIT = 1; 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_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_MAX_F = 86;
public static final int TEMP_HALFSTEP_NO = 0; public static final int TEMP_HALFSTEP_NO = 0;
public static final int TEMP_HALFSTEP_YES = 1; public static final int TEMP_HALFSTEP_YES = 1;

2
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeException.java
View File

@ -92,7 +92,7 @@ public class GreeException extends Exception {
return getCauseClass() == UnknownHostException.class; return getCauseClass() == UnknownHostException.class;
} }
public boolean IsJSONException() { public boolean isJSONException() {
return getCauseClass() == JsonSyntaxException.class; return getCauseClass() == JsonSyntaxException.class;
} }

8
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/discovery/GreeDeviceFinder.java
View File

@ -52,7 +52,7 @@ import com.google.gson.JsonSyntaxException;
@Component(service = GreeDeviceFinder.class, configurationPid = "devicefinder.gree") @Component(service = GreeDeviceFinder.class, configurationPid = "devicefinder.gree")
public class GreeDeviceFinder { public class GreeDeviceFinder {
private final Logger logger = LoggerFactory.getLogger(GreeDeviceFinder.class); 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 final InetAddress ipAddress = InetAddress.getLoopbackAddress();
protected Map<String, GreeAirDevice> deviceTable = new HashMap<>(); protected Map<String, GreeAirDevice> deviceTable = new HashMap<>();
@ -75,7 +75,7 @@ public class GreeDeviceFinder {
// Send the Scan message // Send the Scan message
GreeScanRequestDTO scanGson = new GreeScanRequestDTO(); GreeScanRequestDTO scanGson = new GreeScanRequestDTO();
scanGson.t = GREE_CMDT_SCAN; scanGson.t = GREE_CMDT_SCAN;
String scanReq = gson.toJson(scanGson); String scanReq = GSON.toJson(scanGson);
sendData = scanReq.getBytes(StandardCharsets.UTF_8); sendData = scanReq.getBytes(StandardCharsets.UTF_8);
logger.debug("Sending scan packet to {}", ipAddress.getHostAddress()); logger.debug("Sending scan packet to {}", ipAddress.getHostAddress());
clientSocket.setSoTimeout(DISCOVERY_TIMEOUT_MS); clientSocket.setSoTimeout(DISCOVERY_TIMEOUT_MS);
@ -108,7 +108,7 @@ public class GreeDeviceFinder {
logger.debug("Response received from address {}: {}", remoteAddress.getHostAddress(), decryptedMsg); logger.debug("Response received from address {}: {}", remoteAddress.getHostAddress(), decryptedMsg);
// Create the JSON to hold the response values // 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 // Now make sure the device is reported as a Gree device
if (scanResponseGson.packJson.brand.equalsIgnoreCase("gree")) { if (scanResponseGson.packJson.brand.equalsIgnoreCase("gree")) {
@ -135,7 +135,7 @@ public class GreeDeviceFinder {
private <T> T fromJson(DatagramPacket packet, Class<T> classOfT) { private <T> T fromJson(DatagramPacket packet, Class<T> classOfT) {
String json = new String(packet.getData(), StandardCharsets.UTF_8).replace("\\u0000", "").trim(); 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) { public void addDevice(GreeAirDevice newDevice) {

36
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeAirDevice.java
View File

@ -60,7 +60,7 @@ import com.google.gson.JsonSyntaxException;
@NonNullByDefault @NonNullByDefault
public class GreeAirDevice { public class GreeAirDevice {
private final Logger logger = LoggerFactory.getLogger(GreeAirDevice.class); 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 boolean isBound = false;
private final InetAddress ipAddress; private final InetAddress ipAddress;
private int port = 0; private int port = 0;
@ -115,7 +115,7 @@ public class GreeAirDevice {
reqStatusPackGson.t = GREE_CMDT_STATUS; reqStatusPackGson.t = GREE_CMDT_STATUS;
reqStatusPackGson.cols = colArray; reqStatusPackGson.cols = colArray;
reqStatusPackGson.mac = getId(); reqStatusPackGson.mac = getId();
String reqStatusPackStr = gson.toJson(reqStatusPackGson); String reqStatusPackStr = GSON.toJson(reqStatusPackGson);
// Encrypt and send the Status Request pack // Encrypt and send the Status Request pack
String encryptedStatusReqPacket = GreeCryptoUtil.encryptPack(getKey(), reqStatusPackStr); String encryptedStatusReqPacket = GreeCryptoUtil.encryptPack(getKey(), reqStatusPackStr);
@ -134,7 +134,7 @@ public class GreeAirDevice {
GreeStatusResponseDTO resp = receiveResponse(clientSocket, GreeStatusResponseDTO.class); GreeStatusResponseDTO resp = receiveResponse(clientSocket, GreeStatusResponseDTO.class);
resp.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), resp.pack); resp.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), resp.pack);
logger.debug("Response from device: {}", resp.decryptedPack); 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 // save the results
statusResponseGson = Optional.of(resp); statusResponseGson = Optional.of(resp);
@ -155,7 +155,7 @@ public class GreeAirDevice {
bindReqPackGson.mac = getId(); bindReqPackGson.mac = getId();
bindReqPackGson.t = GREE_CMDT_BIND; bindReqPackGson.t = GREE_CMDT_BIND;
bindReqPackGson.uid = 0; bindReqPackGson.uid = 0;
String bindReqPackStr = gson.toJson(bindReqPackGson); String bindReqPackStr = GSON.toJson(bindReqPackGson);
// Encrypt and send the Binding Request pack // Encrypt and send the Binding Request pack
String encryptedBindReqPacket = GreeCryptoUtil.encryptPack(GreeCryptoUtil.getAESGeneralKeyByteArray(), String encryptedBindReqPacket = GreeCryptoUtil.encryptPack(GreeCryptoUtil.getAESGeneralKeyByteArray(),
@ -166,7 +166,7 @@ public class GreeAirDevice {
// Recieve a response, create the JSON to hold the response values // Recieve a response, create the JSON to hold the response values
GreeBindResponseDTO resp = receiveResponse(clientSocket, GreeBindResponseDTO.class); GreeBindResponseDTO resp = receiveResponse(clientSocket, GreeBindResponseDTO.class);
resp.decryptedPack = GreeCryptoUtil.decryptPack(GreeCryptoUtil.getAESGeneralKeyByteArray(), resp.pack); 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 // Now set the key and flag to indicate the bind was successful
encKey = resp.packJson.key; encKey = resp.packJson.key;
@ -277,10 +277,10 @@ public class GreeAirDevice {
// If commanding Fahrenheit set halfStep to 1 or 0 to tell the A/C which F integer // 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 // temperature to use as celsius alone is ambigious
double newVal = temp.doubleValue(); 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 // 1=Fahrenheit
if (((CorF == TEMP_UNIT_CELSIUS) && (newVal < TEMP_MIN_C || newVal > TEMP_MAX_C)) if (((celsiusOrFahrenheit == TEMP_UNIT_CELSIUS) && (newVal < TEMP_MIN_C || newVal > TEMP_MAX_C))
|| ((CorF == TEMP_UNIT_FAHRENHEIT) && (newVal < TEMP_MIN_F || newVal > TEMP_MAX_F))) { || ((celsiusOrFahrenheit == TEMP_UNIT_FAHRENHEIT) && (newVal < TEMP_MIN_F || newVal > TEMP_MAX_F))) {
throw new IllegalArgumentException("Temp Value out of Range"); throw new IllegalArgumentException("Temp Value out of Range");
} }
@ -301,15 +301,15 @@ public class GreeAirDevice {
// ******************TempRec TemSet Mapping for setting Fahrenheit**************************** // ******************TempRec TemSet Mapping for setting Fahrenheit****************************
// subtract the float version - the int version to get the fractional difference // 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 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; halfStep = newVal - outVal > 0 ? TEMP_HALFSTEP_YES : TEMP_HALFSTEP_NO;
} }
logger.debug("Converted temp from {}{} to temp={}, halfStep={}, unit={})", newVal, temp.getUnit(), outVal, 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 // Set the values in the HashMap
HashMap<String, Integer> parameters = new 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_SETTEMP, outVal);
parameters.put(GREE_PROP_TEMPREC, halfStep); parameters.put(GREE_PROP_TEMPREC, halfStep);
executeCommand(clientSocket, parameters); executeCommand(clientSocket, parameters);
@ -423,7 +423,7 @@ public class GreeAirDevice {
execCmdPackGson.opt = keyArray; execCmdPackGson.opt = keyArray;
execCmdPackGson.p = valueArray; execCmdPackGson.p = valueArray;
execCmdPackGson.t = GREE_CMDT_CMD; execCmdPackGson.t = GREE_CMDT_CMD;
String execCmdPackStr = gson.toJson(execCmdPackGson); String execCmdPackStr = GSON.toJson(execCmdPackGson);
// Now encrypt and send the Command Request pack // Now encrypt and send the Command Request pack
String encryptedCommandReqPacket = GreeCryptoUtil.encryptPack(getKey(), execCmdPackStr); String encryptedCommandReqPacket = GreeCryptoUtil.encryptPack(getKey(), execCmdPackStr);
@ -435,7 +435,7 @@ public class GreeAirDevice {
execResponseGson.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), execResponseGson.pack); execResponseGson.decryptedPack = GreeCryptoUtil.decryptPack(getKey(), execResponseGson.pack);
// Create the JSON to hold the response values // 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) { } catch (IOException | JsonSyntaxException e) {
throw new GreeException("Exception on command execution", e); throw new GreeException("Exception on command execution", e);
} }
@ -461,7 +461,7 @@ public class GreeAirDevice {
request.uid = 0; request.uid = 0;
request.tcid = getId(); request.tcid = getId();
request.pack = pack; 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); DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, ipAddress, port);
return sendPacket; return sendPacket;
} }
@ -472,20 +472,20 @@ public class GreeAirDevice {
DatagramPacket receivePacket = new DatagramPacket(receiveData, receiveData.length); DatagramPacket receivePacket = new DatagramPacket(receiveData, receiveData.length);
clientSocket.receive(receivePacket); clientSocket.receive(receivePacket);
String json = new String(receivePacket.getData(), StandardCharsets.UTF_8).replace("\\u0000", "").trim(); 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() { private void updateTempFtoC() {
// Status message back from A/C always reports degrees C // Status message back from A/C always reports degrees C
// If using Fahrenheit, us SetTem, TemUn and TemRec to reconstruct the Fahrenheit temperature // If using Fahrenheit, us SetTem, TemUn and TemRec to reconstruct the Fahrenheit temperature
// Get Celsius or Fahrenheit from status message // 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 newVal = getIntStatusVal(GREE_PROP_SETTEMP);
int halfStep = getIntStatusVal(GREE_PROP_TEMPREC); 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"); 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 // Find the valueName in the Returned Status object
String[] columns = statusResponseGson.get().packJson.cols; String[] columns = statusResponseGson.get().packJson.cols;
Integer[] values = statusResponseGson.get().packJson.dat; Integer[] values = statusResponseGson.get().packJson.dat;