diff --git a/Controllers/RazerController/RGBController_Razer.cpp b/Controllers/RazerController/RGBController_Razer.cpp index c2e2e3fc..fec4f410 100644 --- a/Controllers/RazerController/RGBController_Razer.cpp +++ b/Controllers/RazerController/RGBController_Razer.cpp @@ -3,7 +3,7 @@ /**------------------------------------------------------------------*\ @name Razer - @category Keyboard,Mouse,Mousemat,HeadsetStand,Case + @category Keyboard,Microphone,Mouse,Mousemat,HeadsetStand,Case @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 920bcf65..520f578f 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -7947,7 +7947,7 @@ static const razer_device seiren_emote_device = { "Razer Seiren Emote", RAZER_SEIREN_EMOTE_PID, - DEVICE_TYPE_UNKNOWN, + DEVICE_TYPE_MICROPHONE, true, 4, 16, diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index 1e460726..e7d73ac3 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -86,7 +86,7 @@ public: unsigned int brightness_max; /*brightness max value */ unsigned int colors_min; /* minimum number of mode colors*/ unsigned int colors_max; /* maximum numver of mode colors*/ - + /*--------------------------------------------------------------*\ | Mode Settings | \*--------------------------------------------------------------*/ @@ -153,6 +153,9 @@ typedef struct /*------------------------------------------------------------------*\ | Device Types | +| The enum order should be maintained as is for the API however | +| DEVICE_TYPE_UNKNOWN needs to remain last. Any new device types | +| need to be inserted at the end of the list but before unknown. | \*------------------------------------------------------------------*/ typedef int device_type; @@ -174,7 +177,8 @@ enum DEVICE_TYPE_VIRTUAL, DEVICE_TYPE_STORAGE, DEVICE_TYPE_CASE, - DEVICE_TYPE_UNKNOWN + DEVICE_TYPE_MICROPHONE, + DEVICE_TYPE_UNKNOWN, }; /*------------------------------------------------------------------*\ diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 56863ef6..46ad0553 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -51,6 +51,9 @@ static QString GetIconString(device_type type, bool dark) case DEVICE_TYPE_KEYBOARD: filename = "keyboard"; break; + case DEVICE_TYPE_MICROPHONE: + filename = "microphone"; + break; case DEVICE_TYPE_MOUSE: filename = "mouse"; break; diff --git a/qt/microphone.png b/qt/microphone.png new file mode 100644 index 00000000..6f344dc7 Binary files /dev/null and b/qt/microphone.png differ diff --git a/qt/microphone_dark.png b/qt/microphone_dark.png new file mode 100644 index 00000000..e8657090 Binary files /dev/null and b/qt/microphone_dark.png differ diff --git a/qt/resources.qrc b/qt/resources.qrc index 41a2cd5e..671d3410 100644 --- a/qt/resources.qrc +++ b/qt/resources.qrc @@ -50,5 +50,7 @@ case.png case_dark.png OpenRGBGreyscale.png + microphone.png + microphone_dark.png diff --git a/scripts/build-supported-devices-md.sh b/scripts/build-supported-devices-md.sh index d951cad7..c9317c7b 100755 --- a/scripts/build-supported-devices-md.sh +++ b/scripts/build-supported-devices-md.sh @@ -43,6 +43,7 @@ echo -e "- [Graphics Cards](#graphics-cards)" >> "$MAIN_FILE" echo -e "- [Coolers](#coolers)" >> "$MAIN_FILE" echo -e "- [LED Strips](#led-strips)" >> "$MAIN_FILE" echo -e "- [Keyboards](#keyboards)" >> "$MAIN_FILE" +echo -e "- [Microphones](#microphones)" >> "$MAIN_FILE" echo -e "- [Mice](#mouse)" >> "$MAIN_FILE" echo -e "- [Mouse Mats](#mouse-mats)" >> "$MAIN_FILE" echo -e "- [Headsets](#headsets)" >> "$MAIN_FILE" @@ -134,6 +135,9 @@ do Keyboard) keyboard+=$current_controller ;; + Microphone) + microphone+=$current_controller + ;; Mouse) mouse+=$current_controller ;; @@ -218,10 +222,13 @@ do table_row=$(printf '| `%s:%s` | `%s:%s` | %s |' "${vid}" "${pid/ /}" "${svid}" "${spid/ /}" "${device_name}") ;; *) + table_row="" ;; esac - echo -e "$table_row" >>"$outfile" + if [[ $table_row = *[![:blank:]]* ]]; then + echo -e "$table_row" >>"$outfile" + fi done <<< "$text" done <<< "$detectors" fi @@ -233,6 +240,7 @@ printf "\n## Graphics Cards\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo printf "\n## Coolers\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${cooler}| sort)" >> "$MAIN_FILE" printf "\n## LED Strips\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${ledstrip}| sort)" >> "$MAIN_FILE" printf "\n## Keyboards\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${keyboard}| sort)" >> "$MAIN_FILE" +printf "\n## Microphones\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${microphone}| sort)" >> "$MAIN_FILE" printf "\n## Mice\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${mouse}| sort)" >> "$MAIN_FILE" printf "\n## Mouse Mats\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${mousemat}| sort)" >> "$MAIN_FILE" printf "\n## Headsets\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${headset}| sort)" >> "$MAIN_FILE"