diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp index 8a5d794a7..effcc44ab 100755 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp @@ -179,7 +179,8 @@ void PolychromeUSBController::WriteRGSwap void PolychromeUSBController::WriteHeader ( unsigned char cfg, - unsigned char configstring[] + unsigned char* configstring, + unsigned int configsize ) { unsigned char usb_buf[65]; @@ -194,7 +195,7 @@ void PolychromeUSBController::WriteHeader \*-----------------------------------------------------*/ usb_buf[0x01] = POLYCHROME_USB_WRITE_HEADER; usb_buf[0x03] = cfg; - memcpy(&usb_buf[4], configstring, sizeof(configstring)); + memcpy(&usb_buf[4], configstring, configsize); /*-----------------------------------------------------*\ | Send packet | @@ -207,7 +208,7 @@ PolychromeZoneInfo PolychromeUSBController::GetZoneConfig(unsigned char zone) { unsigned char usb_buf[65]; PolychromeZoneInfo zoneinfo; - unsigned char all; + //unsigned char all; unsigned char r; unsigned char g; unsigned char b; @@ -242,7 +243,7 @@ PolychromeZoneInfo PolychromeUSBController::GetZoneConfig(unsigned char zone) zoneinfo.color = ToRGBColor(r,g,b); zoneinfo.speed = usb_buf[0x08]; zoneinfo.zone = usb_buf[0x03]; - all = usb_buf[0x10]; + //all = usb_buf[0x10]; return(zoneinfo); } diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h index 7fa2f641e..188d0ed0d 100755 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h @@ -128,8 +128,9 @@ public: void WriteHeader ( - unsigned char cfg, - unsigned char configstring [] + unsigned char cfg, + unsigned char* configstring, + unsigned int configsize ); protected: diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index 41d168627..9332c6868 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -258,8 +258,8 @@ void RGBController_PolychromeUSB::ResizeZone(int zone, int new_size) zonecfg[i]=zones[i].leds_count; } - unsigned char zonecmd = POLYCHROME_USB_LEDCOUNT_CFG; - // WriteHeader(zonecmd, zonecfg); + // unsigned char zonecmd = POLYCHROME_USB_LEDCOUNT_CFG; + // WriteHeader(zonecmd, zonecfg, sizeof(zonecfg)); } void RGBController_PolychromeUSB::DeviceUpdateLEDs() diff --git a/Controllers/CoolerMasterController/CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController.cpp index 485311722..7ea550435 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/CMSmallARGBController.cpp @@ -147,7 +147,7 @@ void CMSmallARGBController::SetMode(unsigned char mode, unsigned char speed, RGB SendUpdate(); } -void CMSmallARGBController::SetLedsDirect(RGBColor *led_colours, unsigned int led_count) +void CMSmallARGBController::SetLedsDirect(RGBColor* /*led_colours*/, unsigned int /*led_count*/) { // Mode not yet Tested /* diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp index 9353de081..18bf9a814 100644 --- a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp @@ -336,7 +336,7 @@ void RGBController_CMARGBController::DeviceUpdateLEDs() } } -void RGBController_CMARGBController::UpdateZoneLEDs(int zone) +void RGBController_CMARGBController::UpdateZoneLEDs(int /*zone*/) { //cmargb->SetLedsDirect( zones[zone].colors, zones[zone].leds_count ); } diff --git a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp index e9707b976..af4fc56c1 100644 --- a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp @@ -224,14 +224,14 @@ void RGBController_CMSmallARGBController::DeviceUpdateLEDs() } } -void RGBController_CMSmallARGBController::UpdateZoneLEDs(int zone) +void RGBController_CMSmallARGBController::UpdateZoneLEDs(int /*zone*/) { - bool random_colours = (modes[active_mode].color_mode == MODE_COLORS_RANDOM); + //bool random_colours = (modes[active_mode].color_mode == MODE_COLORS_RANDOM); //cmargb->SetLedsDirect(zones[zone].colors, random_colours); } -void RGBController_CMSmallARGBController::UpdateSingleLED(int led) +void RGBController_CMSmallARGBController::UpdateSingleLED(int /*led*/) { //cmargb->SetMode( modes[active_mode].value, modes[active_mode].speed ); //cmargb->SetLedsDirect( zones[0].colors, zones[0].leds_count ); diff --git a/Controllers/FanBusController/FanBusInterface.cpp b/Controllers/FanBusController/FanBusInterface.cpp index ed5551cdf..2e786e637 100644 --- a/Controllers/FanBusController/FanBusInterface.cpp +++ b/Controllers/FanBusController/FanBusInterface.cpp @@ -113,7 +113,7 @@ void FanBusInterface::write_queue { unsigned char fanbus_msg[] = { 0x00, int_addr, dev_addr, val, 0xFF }; - for(int i = 0; i < sizeof(fanbus_msg); i++) + for(unsigned int i = 0; i < sizeof(fanbus_msg); i++) { fanbus_msg_queued.push_back(fanbus_msg[i]); } diff --git a/Controllers/FanBusController/RGBController_FanBus.cpp b/Controllers/FanBusController/RGBController_FanBus.cpp index 14e71b377..3b36e269d 100644 --- a/Controllers/FanBusController/RGBController_FanBus.cpp +++ b/Controllers/FanBusController/RGBController_FanBus.cpp @@ -43,7 +43,7 @@ void RGBController_FanBus::SetupZones() led_zone.matrix_map = NULL; zones.push_back(led_zone); - for(int led_idx = 0; led_idx < led_zone.leds_count; led_idx++) + for(unsigned int led_idx = 0; led_idx < led_zone.leds_count; led_idx++) { led new_led; new_led.name = "LED "; diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp index 0753309b6..91a6e1f86 100644 --- a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp +++ b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp @@ -129,7 +129,7 @@ void RGBController_HoltekA1FA::DeviceUpdateMode() if((active_mode < HOLTEK_A1FA_MODE_NEON) && (previous_mode < HOLTEK_A1FA_MODE_NEON)) { //If we're switching from and to static and breathing then sync the mode colors - for ( int i = 0; i < modes[active_mode].colors_max; i++) + for(unsigned int i = 0; i < modes[active_mode].colors_max; i++) { modes[active_mode].colors[i] = modes[previous_mode].colors[i]; } diff --git a/Controllers/LEDStripController/LEDStripController.cpp b/Controllers/LEDStripController/LEDStripController.cpp index fbe526dee..4b925e62a 100644 --- a/Controllers/LEDStripController/LEDStripController.cpp +++ b/Controllers/LEDStripController/LEDStripController.cpp @@ -184,7 +184,7 @@ void LEDStripController::SetLEDsKeyboardVisualizer(std::vector colors) \*-------------------------------------------------------------*/ unsigned short sum = 0; - for (int i = 0; i < (payload_size + 1); i++) + for(unsigned int i = 0; i < (payload_size + 1); i++) { sum += serial_buf[i]; } @@ -317,4 +317,4 @@ void LEDStripController::SetLEDsTPM2(std::vector colors) } delete[] serial_buf; -} \ No newline at end of file +} diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index d4bba7289..7fe651aef 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -735,7 +735,7 @@ razer_report RazerController::razer_create_mode_breathing_one_color_extended_mat return report; } -razer_report RazerController::razer_create_mode_breathing_one_color_standard_matrix_report(unsigned char variable_storage, unsigned char led_id, unsigned char red, unsigned char grn, unsigned char blu) +razer_report RazerController::razer_create_mode_breathing_one_color_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/, unsigned char red, unsigned char grn, unsigned char blu) { razer_report report = razer_create_report(0x03, 0x0A, 0x08); @@ -790,7 +790,7 @@ razer_report RazerController::razer_create_mode_breathing_two_colors_extended_ma return report; } -razer_report RazerController::razer_create_mode_breathing_two_colors_standard_matrix_report(unsigned char variable_storage, unsigned char led_id, unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2) +razer_report RazerController::razer_create_mode_breathing_two_colors_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/, unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2) { razer_report report = razer_create_report(0x03, 0x0A, 0x08); @@ -838,7 +838,7 @@ razer_report RazerController::razer_create_mode_none_extended_matrix_report(unsi return report; } -razer_report RazerController::razer_create_mode_none_standard_matrix_report(unsigned char variable_storage, unsigned char led_id) +razer_report RazerController::razer_create_mode_none_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/) { struct razer_report report = razer_create_report(0x03, 0x0A, 0x01); @@ -858,7 +858,7 @@ razer_report RazerController::razer_create_mode_spectrum_cycle_extended_matrix_r return report; } -razer_report RazerController::razer_create_mode_spectrum_cycle_standard_matrix_report(unsigned char variable_storage, unsigned char led_id) +razer_report RazerController::razer_create_mode_spectrum_cycle_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/) { razer_report report = razer_create_report(0x03, 0x0A, 0x01); @@ -883,7 +883,7 @@ razer_report RazerController::razer_create_mode_static_extended_matrix_report(un return report; } -razer_report RazerController::razer_create_mode_static_standard_matrix_report(unsigned char variable_storage, unsigned char led_id, unsigned char red, unsigned char grn, unsigned char blu) +razer_report RazerController::razer_create_mode_static_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/, unsigned char red, unsigned char grn, unsigned char blu) { razer_report report = razer_create_report(0x03, 0x0A, 0x04); @@ -909,7 +909,7 @@ razer_report RazerController::razer_create_mode_wave_extended_matrix_report(unsi return report; } -razer_report RazerController::razer_create_mode_wave_standard_matrix_report(unsigned char variable_storage, unsigned char led_id, unsigned char direction) +razer_report RazerController::razer_create_mode_wave_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/, unsigned char direction) { razer_report report = razer_create_report(0x03, 0x0A, 0x02); diff --git a/Controllers/RazerController/RazerKrakenController.h b/Controllers/RazerController/RazerKrakenController.h index 2b20ca32c..8c7232963 100644 --- a/Controllers/RazerController/RazerKrakenController.h +++ b/Controllers/RazerController/RazerKrakenController.h @@ -43,7 +43,7 @@ union razer_kraken_effect_byte /*---------------------------------------------------------*\ | Razer Kraken Report Types (taken from OpenRazer) | \*---------------------------------------------------------*/ -PACK(typedef struct razer_kraken_request_report +PACK(struct razer_kraken_request_report { unsigned char report_id; unsigned char destination; diff --git a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp index 0742e630e..d350a5dff 100644 --- a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp +++ b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp @@ -305,21 +305,21 @@ void RGBController_ZalmanZSync::DeviceUpdateMode() } } - // controller->SetChannelEffect(channel, - // zones[channel].leds_count, - // modes[active_mode].value, - // modes[active_mode].speed, - // direction, - // random, - // mode_colors[0], - // mode_colors[1], - // mode_colors[2], - // mode_colors[3], - // mode_colors[4], - // mode_colors[5], - // mode_colors[6], - // mode_colors[7], - // mode_colors[8]); + controller->SetChannelEffect(channel, + zones[channel].leds_count, + modes[active_mode].value, + modes[active_mode].speed, + direction, + random, + mode_colors[0], + mode_colors[1], + mode_colors[2], + mode_colors[3], + mode_colors[4], + mode_colors[5], + mode_colors[6], + mode_colors[7], + mode_colors[8]); } } }