diff --git a/zenidrv-g203-lightsync b/zenidrv-g203-lightsync index cd008f4..da265ea 100755 --- a/zenidrv-g203-lightsync +++ b/zenidrv-g203-lightsync @@ -44,50 +44,55 @@ while [ ${showMenu} -eq 0 ] ; do color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \ --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \ "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" ) - if [ "${color_selected}" == "Black" ] ; then - color_apply="000000" - elif [ "${color_selected}" == "White" ] ; then - color_apply="FFFFFF" - elif [ "${color_selected}" == "Red" ] ; then - color_apply="FF0000" - elif [ "${color_selected}" == "Lime" ] ; then - color_apply="00FF00" - elif [ "${color_selected}" == "Blue" ] ; then - color_apply="0000FF" - elif [ "${color_selected}" == "Yellow" ] ; then - color_apply="FFFF00" - elif [ "${color_selected}" == "Cyan" ] ; then - color_apply="00FFFF" - elif [ "${color_selected}" == "Magenta" ] ; then - color_apply="FF00FF" - elif [ "${color_selected}" == "Silver" ] ; then - color_apply="C0C0C0" - elif [ "${color_selected}" == "Gray" ] ; then - color_apply="808080" - elif [ "${color_selected}" == "Maroon" ] ; then - color_apply="800000" - elif [ "${color_selected}" == "Olive" ] ; then - color_apply="808000" - elif [ "${color_selected}" == "Green" ] ; then - color_apply="008000" - elif [ "${color_selected}" == "Purple" ] ; then - color_apply="800080" - elif [ "${color_selected}" == "Teal" ] ; then - color_apply="008080" - elif [ "${color_selected}" == "Navy" ] ; then - color_apply="000080" - fi - sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Solid effect" \ - --window-icon=${iconPath} --pulsate --no-cancel --auto-close - g203-led.py lightsync solid "${color_apply}" - device_error=$? - if [ ${device_error} -eq 0 ] ; then - echo > /dev/null + canceled=$? + if [ ${canceled} -eq 0 ] ; then + if [ "${color_selected}" == "Black" ] ; then + color_apply="000000" + elif [ "${color_selected}" == "White" ] ; then + color_apply="FFFFFF" + elif [ "${color_selected}" == "Red" ] ; then + color_apply="FF0000" + elif [ "${color_selected}" == "Lime" ] ; then + color_apply="00FF00" + elif [ "${color_selected}" == "Blue" ] ; then + color_apply="0000FF" + elif [ "${color_selected}" == "Yellow" ] ; then + color_apply="FFFF00" + elif [ "${color_selected}" == "Cyan" ] ; then + color_apply="00FFFF" + elif [ "${color_selected}" == "Magenta" ] ; then + color_apply="FF00FF" + elif [ "${color_selected}" == "Silver" ] ; then + color_apply="C0C0C0" + elif [ "${color_selected}" == "Gray" ] ; then + color_apply="808080" + elif [ "${color_selected}" == "Maroon" ] ; then + color_apply="800000" + elif [ "${color_selected}" == "Olive" ] ; then + color_apply="808000" + elif [ "${color_selected}" == "Green" ] ; then + color_apply="008000" + elif [ "${color_selected}" == "Purple" ] ; then + color_apply="800080" + elif [ "${color_selected}" == "Teal" ] ; then + color_apply="008080" + elif [ "${color_selected}" == "Navy" ] ; then + color_apply="000080" + fi + sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Solid effect" \ + --window-icon=${iconPath} --pulsate --no-cancel --auto-close + g203-led.py lightsync solid "${color_apply}" + device_error=$? + if [ ${device_error} -eq 0 ] ; then + echo > /dev/null + else + zenity --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ + --text "Device not found or connected" + fi + color_apply="none" else - zenity --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ - --text "Device not found or connected" + color_apply="none" fi - color_apply="none" elif [ "${opcion}" == "Cycle" ] ; then sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Cycle effect" \ --window-icon=${iconPath} --pulsate --no-cancel --auto-close @@ -103,50 +108,55 @@ while [ ${showMenu} -eq 0 ] ; do color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \ --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \ "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" ) - if [ "${color_selected}" == "Black" ] ; then - color_apply="000000" - elif [ "${color_selected}" == "White" ] ; then - color_apply="FFFFFF" - elif [ "${color_selected}" == "Red" ] ; then - color_apply="FF0000" - elif [ "${color_selected}" == "Lime" ] ; then - color_apply="00FF00" - elif [ "${color_selected}" == "Blue" ] ; then - color_apply="0000FF" - elif [ "${color_selected}" == "Yellow" ] ; then - color_apply="FFFF00" - elif [ "${color_selected}" == "Cyan" ] ; then - color_apply="00FFFF" - elif [ "${color_selected}" == "Magenta" ] ; then - color_apply="FF00FF" - elif [ "${color_selected}" == "Silver" ] ; then - color_apply="C0C0C0" - elif [ "${color_selected}" == "Gray" ] ; then - color_apply="808080" - elif [ "${color_selected}" == "Maroon" ] ; then - color_apply="800000" - elif [ "${color_selected}" == "Olive" ] ; then - color_apply="808000" - elif [ "${color_selected}" == "Green" ] ; then - color_apply="008000" - elif [ "${color_selected}" == "Purple" ] ; then - color_apply="800080" - elif [ "${color_selected}" == "Teal" ] ; then - color_apply="008080" - elif [ "${color_selected}" == "Navy" ] ; then - color_apply="000080" - fi - sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Breathe effect" \ - --window-icon=${iconPath} --pulsate --no-cancel --auto-close - g203-led.py lightsync breathe "${color_apply}" - device_error=$? - if [ ${device_error} -eq 0 ] ; then - echo > /dev/null + canceled=$? + if [ ${canceled} -eq 0 ] ; then + if [ "${color_selected}" == "Black" ] ; then + color_apply="000000" + elif [ "${color_selected}" == "White" ] ; then + color_apply="FFFFFF" + elif [ "${color_selected}" == "Red" ] ; then + color_apply="FF0000" + elif [ "${color_selected}" == "Lime" ] ; then + color_apply="00FF00" + elif [ "${color_selected}" == "Blue" ] ; then + color_apply="0000FF" + elif [ "${color_selected}" == "Yellow" ] ; then + color_apply="FFFF00" + elif [ "${color_selected}" == "Cyan" ] ; then + color_apply="00FFFF" + elif [ "${color_selected}" == "Magenta" ] ; then + color_apply="FF00FF" + elif [ "${color_selected}" == "Silver" ] ; then + color_apply="C0C0C0" + elif [ "${color_selected}" == "Gray" ] ; then + color_apply="808080" + elif [ "${color_selected}" == "Maroon" ] ; then + color_apply="800000" + elif [ "${color_selected}" == "Olive" ] ; then + color_apply="808000" + elif [ "${color_selected}" == "Green" ] ; then + color_apply="008000" + elif [ "${color_selected}" == "Purple" ] ; then + color_apply="800080" + elif [ "${color_selected}" == "Teal" ] ; then + color_apply="008080" + elif [ "${color_selected}" == "Navy" ] ; then + color_apply="000080" + fi + sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Breathe effect" \ + --window-icon=${iconPath} --pulsate --no-cancel --auto-close + g203-led.py lightsync breathe "${color_apply}" + device_error=$? + if [ ${device_error} -eq 0 ] ; then + echo > /dev/null + else + zenity --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ + --text "Device not found or connected" + fi + color_apply="none" else - zenity --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ - --text "Device not found or connected" + color_apply="none" fi - color_apply="none" elif [ "${opcion}" == "Wave" ] ; then sleep 2 | zenity --progress --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --text "Applying Wave effect" \ --window-icon=${iconPath} --pulsate --no-cancel --auto-close diff --git a/zenidrv-g203-prodigy b/zenidrv-g203-prodigy index 11d9456..e854b93 100755 --- a/zenidrv-g203-prodigy +++ b/zenidrv-g203-prodigy @@ -43,50 +43,55 @@ while [ ${showMenu} -eq 0 ] ; do color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \ --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \ "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" ) - if [ "${color_selected}" == "Black" ] ; then - color_apply="000000" - elif [ "${color_selected}" == "White" ] ; then - color_apply="FFFFFF" - elif [ "${color_selected}" == "Red" ] ; then - color_apply="FF0000" - elif [ "${color_selected}" == "Lime" ] ; then - color_apply="00FF00" - elif [ "${color_selected}" == "Blue" ] ; then - color_apply="0000FF" - elif [ "${color_selected}" == "Yellow" ] ; then - color_apply="FFFF00" - elif [ "${color_selected}" == "Cyan" ] ; then - color_apply="00FFFF" - elif [ "${color_selected}" == "Magenta" ] ; then - color_apply="FF00FF" - elif [ "${color_selected}" == "Silver" ] ; then - color_apply="C0C0C0" - elif [ "${color_selected}" == "Gray" ] ; then - color_apply="808080" - elif [ "${color_selected}" == "Maroon" ] ; then - color_apply="800000" - elif [ "${color_selected}" == "Olive" ] ; then - color_apply="808000" - elif [ "${color_selected}" == "Green" ] ; then - color_apply="008000" - elif [ "${color_selected}" == "Purple" ] ; then - color_apply="800080" - elif [ "${color_selected}" == "Teal" ] ; then - color_apply="008080" - elif [ "${color_selected}" == "Navy" ] ; then - color_apply="000080" - fi - sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Applying Solid effect" \ - --window-icon=${iconPath} --pulsate --no-cancel --auto-close - g203-led.py solid "${color_apply}" - device_error=$? - if [ ${device_error} -eq 0 ] ; then - echo > /dev/null + canceled=$? + if [ ${canceled} -eq 0 ] ; then + if [ "${color_selected}" == "Black" ] ; then + color_apply="000000" + elif [ "${color_selected}" == "White" ] ; then + color_apply="FFFFFF" + elif [ "${color_selected}" == "Red" ] ; then + color_apply="FF0000" + elif [ "${color_selected}" == "Lime" ] ; then + color_apply="00FF00" + elif [ "${color_selected}" == "Blue" ] ; then + color_apply="0000FF" + elif [ "${color_selected}" == "Yellow" ] ; then + color_apply="FFFF00" + elif [ "${color_selected}" == "Cyan" ] ; then + color_apply="00FFFF" + elif [ "${color_selected}" == "Magenta" ] ; then + color_apply="FF00FF" + elif [ "${color_selected}" == "Silver" ] ; then + color_apply="C0C0C0" + elif [ "${color_selected}" == "Gray" ] ; then + color_apply="808080" + elif [ "${color_selected}" == "Maroon" ] ; then + color_apply="800000" + elif [ "${color_selected}" == "Olive" ] ; then + color_apply="808000" + elif [ "${color_selected}" == "Green" ] ; then + color_apply="008000" + elif [ "${color_selected}" == "Purple" ] ; then + color_apply="800080" + elif [ "${color_selected}" == "Teal" ] ; then + color_apply="008080" + elif [ "${color_selected}" == "Navy" ] ; then + color_apply="000080" + fi + sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Applying Solid effect" \ + --window-icon=${iconPath} --pulsate --no-cancel --auto-close + g203-led.py solid "${color_apply}" + device_error=$? + if [ ${device_error} -eq 0 ] ; then + echo > /dev/null + else + zenity --title "zenidrv-g203-prodigy ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ + --text "Device not found or connected" + fi + color_apply="none" else - zenity --title "zenidrv-g203-prodigy ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ - --text "Device not found or connected" + color_apply="none" fi - color_apply="none" elif [ "${opcion}" == "Cycle" ] ; then sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Applying Cycle effect" \ --window-icon=${iconPath} --pulsate --no-cancel --auto-close @@ -102,50 +107,55 @@ while [ ${showMenu} -eq 0 ] ; do color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \ --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \ "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" ) - if [ "${color_selected}" == "Black" ] ; then - color_apply="000000" - elif [ "${color_selected}" == "White" ] ; then - color_apply="FFFFFF" - elif [ "${color_selected}" == "Red" ] ; then - color_apply="FF0000" - elif [ "${color_selected}" == "Lime" ] ; then - color_apply="00FF00" - elif [ "${color_selected}" == "Blue" ] ; then - color_apply="0000FF" - elif [ "${color_selected}" == "Yellow" ] ; then - color_apply="FFFF00" - elif [ "${color_selected}" == "Cyan" ] ; then - color_apply="00FFFF" - elif [ "${color_selected}" == "Magenta" ] ; then - color_apply="FF00FF" - elif [ "${color_selected}" == "Silver" ] ; then - color_apply="C0C0C0" - elif [ "${color_selected}" == "Gray" ] ; then - color_apply="808080" - elif [ "${color_selected}" == "Maroon" ] ; then - color_apply="800000" - elif [ "${color_selected}" == "Olive" ] ; then - color_apply="808000" - elif [ "${color_selected}" == "Green" ] ; then - color_apply="008000" - elif [ "${color_selected}" == "Purple" ] ; then - color_apply="800080" - elif [ "${color_selected}" == "Teal" ] ; then - color_apply="008080" - elif [ "${color_selected}" == "Navy" ] ; then - color_apply="000080" - fi - sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Applying Breathe effect" \ - --window-icon=${iconPath} --pulsate --no-cancel --auto-close - g203-led.py breathe "${color_apply}" - device_error=$? - if [ ${device_error} -eq 0 ] ; then - echo > /dev/null + canceled=$? + if [ ${canceled} -eq 0 ] ; then + if [ "${color_selected}" == "Black" ] ; then + color_apply="000000" + elif [ "${color_selected}" == "White" ] ; then + color_apply="FFFFFF" + elif [ "${color_selected}" == "Red" ] ; then + color_apply="FF0000" + elif [ "${color_selected}" == "Lime" ] ; then + color_apply="00FF00" + elif [ "${color_selected}" == "Blue" ] ; then + color_apply="0000FF" + elif [ "${color_selected}" == "Yellow" ] ; then + color_apply="FFFF00" + elif [ "${color_selected}" == "Cyan" ] ; then + color_apply="00FFFF" + elif [ "${color_selected}" == "Magenta" ] ; then + color_apply="FF00FF" + elif [ "${color_selected}" == "Silver" ] ; then + color_apply="C0C0C0" + elif [ "${color_selected}" == "Gray" ] ; then + color_apply="808080" + elif [ "${color_selected}" == "Maroon" ] ; then + color_apply="800000" + elif [ "${color_selected}" == "Olive" ] ; then + color_apply="808000" + elif [ "${color_selected}" == "Green" ] ; then + color_apply="008000" + elif [ "${color_selected}" == "Purple" ] ; then + color_apply="800080" + elif [ "${color_selected}" == "Teal" ] ; then + color_apply="008080" + elif [ "${color_selected}" == "Navy" ] ; then + color_apply="000080" + fi + sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Applying Breathe effect" \ + --window-icon=${iconPath} --pulsate --no-cancel --auto-close + g203-led.py breathe "${color_apply}" + device_error=$? + if [ ${device_error} -eq 0 ] ; then + echo > /dev/null + else + zenity --title "zenidrv-g203-prodigy ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ + --text "Device not found or connected" + fi + color_apply="none" else - zenity --title "zenidrv-g203-prodigy ${VERSION} ($M_DATE)" --error --window-icon=${iconPath} --width=280 \ - --text "Device not found or connected" + color_apply="none" fi - color_apply="none" elif [ "${opcion}" == "Intro (On)" ] ; then sleep 2 | zenity --progress --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --text "Enabling startup effect" \ --window-icon=${iconPath} --pulsate --no-cancel --auto-close