Merge pull request #98 from Legion2/code-refactoring

improve compatibility with other platforms

Author: Legion2

library.properties

@@ -6,6 +6,6 @@ sentence=Allows iCUE to control RGB LEDs.
 paragraph=The library mimics a Lighting Node PRO and can be controlled as such in iCUE.
 category=Device Control
 url=https://github.com/Legion2/CorsairLightingProtocol
-architectures=*
+architectures=avr
 includes=CorsairLightingProtocol.h
 depends=FastLED

src/CorsairLightingProtocolResponse.cpp

@@ -17,8 +17,7 @@
 #include "CorsairLightingProtocolConstants.h"
 
 void CorsairLightingProtocolResponse::send(const uint8_t* data, size_t size) const {
-	uint8_t response[RESPONSE_SIZE];
-	memset(response, 0x00, sizeof(response));
+	uint8_t response[RESPONSE_SIZE] = { 0x00 };
 	if (size + 1 > sizeof(response)) {
 		return;
 	}
@@ -28,18 +27,17 @@ void CorsairLightingProtocolResponse::send(const uint8_t* data, size_t size) con
 }
 
 void CorsairLightingProtocolResponse::sendError() const {
-	uint8_t response[RESPONSE_SIZE];
-	memset(response, 0x00, sizeof(response));
+	uint8_t response[RESPONSE_SIZE] = { 0x00 };
 	response[0] = PROTOCOL_RESPONSE_ERROR;
 	sendX(response, sizeof(response));
 }
 
 void CorsairLightingProtocolResponse::send_P(const uint8_t* data, size_t size) const {
-	uint8_t response[RESPONSE_SIZE];
-	memset(response, 0x00, sizeof(response));
+	uint8_t response[RESPONSE_SIZE] = { 0x00 };
 	if (size + 1 > sizeof(response)) {
 		return;
 	}
+	response[0] = PROTOCOL_RESPONSE_OK;
 	memcpy_P(response + 1, data, size);
 	sendX(response, sizeof(response));
 }

src/FanController.cpp

@@ -45,6 +45,7 @@ void FanController::handleFanControl(const Command& command, const CorsairLighti
 				break;
 			case FanDetectionType::Disconnected:
 				mask[i] = FanMask::Disconnected;
+				break;
 			}
 		}
 		response->send(reinterpret_cast<byte*>(mask), sizeof(mask));

src/FastLEDController.cpp

@@ -467,5 +467,5 @@ void FastLEDController::setLEDColorValues(uint8_t channel, uint8_t color, uint8_
 
 void FastLEDController::clearLEDColorValues(uint8_t channel)
 {
-	memset(channelData[channel].valuesBuffer[0], 0, sizeof(channelData[channel].ledCount));
+	memset(channelData[channel].valuesBuffer[0], 0, channelData[channel].ledCount);
 }

src/FastLEDControllerUtils.cpp

@@ -37,7 +37,7 @@ void CLP::scale(FastLEDController* controller, uint8_t channelIndex, int scaleTo
 	auto leds = controller->getLEDs(channelIndex);
 	const float scaleFactor = (float)controller->getLEDCount(channelIndex) / scaleToSize;
 	for (int ledIndex = scaleToSize - 1; ledIndex >= 0; ledIndex--) {
-		leds[ledIndex] = leds[round(ledIndex * scaleFactor)];
+		leds[ledIndex] = leds[lround(ledIndex * scaleFactor)];
 	}
 }
 
@@ -66,7 +66,7 @@ void CLP::scaleSegments(FastLEDController* controller, uint8_t channelIndex, con
 		ledStripIndexAfterScaling -= segments[i].scaleToSize;
 		ledStripIndexBeforeScaling -= segments[i].segmentLength;
 		for (int ledIndex = segments[i].scaleToSize - 1; ledIndex >= 0; ledIndex--) {
-			leds[ledStripIndexAfterScaling + ledIndex] = leds[ledStripIndexBeforeScaling + round(ledIndex * scaleFactor)];
+			leds[ledStripIndexAfterScaling + ledIndex] = leds[ledStripIndexBeforeScaling + lround(ledIndex * scaleFactor)];
 		}
 	}
 }

src/LEDController.cpp

@@ -56,12 +56,14 @@ void LEDController::handleLEDControl(const Command& command, const CorsairLighti
 			Serial.println(F("WriteLedRgbValue"));
 #endif
 			// TODO
+			response->sendError();
+			return;
 			break;
 		}
 		case WRITE_LED_COLOR_VALUES:
 		{
 			const uint8_t offset = data[1];
-			const uint8_t inputLength = data[2];
+			const size_t inputLength = min((size_t)data[2], sizeof(data) - 4);
 			const uint8_t color = data[3];
 			if (color >= 3) {
 				response->sendError();

src/RawHID.h

@@ -24,6 +24,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
+
+#if defined(ARDUINO_ARCH_AVR)
+
 #include "HID.h"
 #if defined(USBCON)
 
@@ -164,3 +167,4 @@ class RawHID_ : public PluggableUSBModule, public Stream
 };
 extern RawHID_ RawHID;
 #endif
+#endif

src/TemperatureController.cpp

@@ -37,8 +37,8 @@ void TemperatureController::handleTemperatureControl(const Command& command, con
 			return;
 		}
 		uint16_t temp = getTemperatureValue(tempSensor);
-		uint8_t tempdata[] = { toBigEndian(temp) };
-		response->send(tempdata, sizeof(tempdata));
+		uint8_t tempData[] = { toBigEndian(temp) };
+		response->send(tempData, sizeof(tempData));
 		break;
 	}
 	case READ_VOLTAGE_VALUE:
@@ -69,8 +69,8 @@ void TemperatureController::handleTemperatureControl(const Command& command, con
 		}
 		}
 
-		uint8_t voltagedata[] = { toBigEndian(voltage) };
-		response->send(voltagedata, sizeof(voltagedata));
+		uint8_t voltageData[] = { toBigEndian(voltage) };
+		response->send(voltageData, sizeof(voltageData));
 		break;
 	}
 	default: