diff --git a/doc/bin/gen_lcd_screen.sh b/doc/bin/gen_lcd_screen.sh index c22a2fc..9881e69 100755 --- a/doc/bin/gen_lcd_screen.sh +++ b/doc/bin/gen_lcd_screen.sh @@ -1,27 +1,39 @@ #!/bin/bash -IMG_PATH="${1}" -line[0]="${2}" -line[1]="${3}" -TARGET="${4}" - COLOR="green" TARGET_EXTENSION="jpg" CHAR_PATH="${IMG_PATH}/LCD_characters_${COLOR}" -if [ ! -e ${IMG_PATH} ] +while [[ "$#" -gt 0 ]]; do + case $1 in + -i|--imgpath) IMG_PATH="${2}"; shift ;; + -1|--line1) line[0]="${2}"; shift ;; + -2|--line2) line[1]="${2}"; shift ;; + -t|--target) TARGET="${2}"; shift ;; + -b|--baseimg) BASE_IMG="${2}"; shift ;; + *) echo "Unknown parameter passed: $1"; exit 1 ;; + esac + shift +done + +if [ ! -e "${IMG_PATH}" ] then echo "Cannot find path for images \"${IMG_PATH}\"" exit 10 fi -if [ ! -e ${CHAR_PATH} ] +if [ ! -e "${IMG_PATH}/${CHAR_PATH}" ] then echo "Cannot find path for character-images \"${CHAR_PATH}\"" exit 11 fi -cp "${IMG_PATH}/LCD_${COLOR}.png" /tmp/LCD_$$.png +if [ ${BASE_IMG} ] +then + cp "${IMG_PATH}/MicroDexed_Panel/Rotate_1/${BASE_IMG}.png" /tmp/LCD_$$.png +else + cp "${IMG_PATH}/LCD_green.png" /tmp/LCD_$$.png +fi special_flag="false" for (( n=0; n<2; n++ )) @@ -40,9 +52,9 @@ do continue else special_flag="false" - if [ ! -e "${CHAR_PATH}/${special}.png" ] + if [ ! -e "${IMG_PATH}/${CHAR_PATH}/${special}.png" ] then - echo "Cannot find \"${CHAR_PATH}/${special}.png\"." + echo "Cannot find \"${IMG_PATH}/${CHAR_PATH}/${special}.png\"." c=" " else c=${special} @@ -62,14 +74,14 @@ do c="dot" fi x=$( bc -l <<<"230 + ${xpos} * 30" ) - composite -gravity NorthWest -geometry "+${x}+${y}" "${CHAR_PATH}/${c}.png" /tmp/LCD_$$.png /tmp/LCD_$$.png + composite -gravity NorthWest -geometry "+${x}+${y}" "${IMG_PATH}/${CHAR_PATH}/${c}.png" /tmp/LCD_$$.png /tmp/LCD_$$.png fi done done convert /tmp/LCD_$$.png /tmp/LCD_$$.${TARGET_EXTENSION} -if [ "${3}" ] +if [ "${TARGET}" ] then mv /tmp/LCD_$$.${TARGET_EXTENSION} "${TARGET}" else diff --git a/doc/images/MicroDexed_Panel/Rotate 1/263-053-final+light-shadow.png b/doc/images/MicroDexed_Panel/Rotate 1/263-053-final+light-shadow.png deleted file mode 100644 index c5c60fc..0000000 Binary files a/doc/images/MicroDexed_Panel/Rotate 1/263-053-final+light-shadow.png and /dev/null differ diff --git a/doc/images/MicroDexed_Panel/Rotate 2/263-053-final+light-shadow.png b/doc/images/MicroDexed_Panel/Rotate 2/263-053-final+light-shadow.png deleted file mode 100644 index c5c60fc..0000000 Binary files a/doc/images/MicroDexed_Panel/Rotate 2/263-053-final+light-shadow.png and /dev/null differ diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Preset Down.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Down.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Preset Down.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Down.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Presets Left.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Left.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Presets Left.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Left.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Presets Long Press.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Long_Press.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Presets Long Press.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Long_Press.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Preset Push 1.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Push_1.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Preset Push 1.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Push_1.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Presets Right.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Right.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Presets Right.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Right.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Preset up.png b/doc/images/MicroDexed_Panel/Rotate_1/Preset_Up.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Preset up.png rename to doc/images/MicroDexed_Panel/Rotate_1/Preset_Up.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Push and Long Prres.png b/doc/images/MicroDexed_Panel/Rotate_1/Push_and_Long_Press.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Push and Long Prres.png rename to doc/images/MicroDexed_Panel/Rotate_1/Push_and_Long_Press.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Down.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Down.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Down.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Down.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Left.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Left.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Left.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Left.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Long Press.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Long_Press.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Long Press.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Long_Press.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Push 1.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Push_1.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Push 1.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Push_1.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Right.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Right.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Right.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Right.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Setting 1.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Setting_1.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Setting 1.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Setting_1.png diff --git a/doc/images/MicroDexed_Panel/Rotate 1/Volume Up.png b/doc/images/MicroDexed_Panel/Rotate_1/Volume_Up.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 1/Volume Up.png rename to doc/images/MicroDexed_Panel/Rotate_1/Volume_Up.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Down 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Down 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Down 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Down 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Down 2b.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Down 2b.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Down 2b.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Down 2b.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Left 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Left 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Left 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Left 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Right 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Right 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Right 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Right 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Up 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Up 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Up 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Up 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Presets Up 2b.png b/doc/images/MicroDexed_Panel/Rotate_2/Presets Up 2b.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Presets Up 2b.png rename to doc/images/MicroDexed_Panel/Rotate_2/Presets Up 2b.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Down 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Down 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Down 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Down 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume High 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume High 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume High 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume High 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Left 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Left 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Left 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Left 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Low 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Low 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Low 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Low 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Right 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Right 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Right 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Right 2.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Setting.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Setting.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Setting.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Setting.png diff --git a/doc/images/MicroDexed_Panel/Rotate 2/Volume Up 2.png b/doc/images/MicroDexed_Panel/Rotate_2/Volume Up 2.png similarity index 100% rename from doc/images/MicroDexed_Panel/Rotate 2/Volume Up 2.png rename to doc/images/MicroDexed_Panel/Rotate_2/Volume Up 2.png diff --git a/doc/manuals/MicroDexed-User_Manual/01 ANLGSYN 1 b/doc/manuals/MicroDexed-User_Manual/01 ANLGSYN 1 new file mode 100644 index 0000000..264929f Binary files /dev/null and b/doc/manuals/MicroDexed-User_Manual/01 ANLGSYN 1 differ diff --git a/doc/manuals/MicroDexed-User_Manual/01%bracket_open%ANLGSYN 1 %bracket_close% b/doc/manuals/MicroDexed-User_Manual/01%bracket_open%ANLGSYN 1 %bracket_close% new file mode 100644 index 0000000..d397db0 Binary files /dev/null and b/doc/manuals/MicroDexed-User_Manual/01%bracket_open%ANLGSYN 1 %bracket_close% differ diff --git a/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.md b/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.md index 65bdab1..5449692 100644 --- a/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.md +++ b/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.md @@ -57,10 +57,12 @@ The __PRESET__ encoder has only one permanent function: On a freshly installed MD the screen should greet you with the sound/bank selection. The volume is set to 80%. +__Long-Press PRESET__: Changes between voice and bank selection: ![](images/10_SoundBank_1.jpg) -* __Long-Press PRESET__: Changes between voice and bank selection. -* __Turn PRESET left/right__: Change voice or bank (voices: 1-32, banks: 0-99) + __Turn PRESET left/right__: Change voice or bank (voices: 1-32, banks: 0-99): + +![](images/10_SoundBank_2.jpg) - [](../../images/LCD_characters_green/small_1_inv.png) indicates that you are using timbre 1. - [](../../images/LCD_characters_green/key.png) indicates that you currently use the monotimbral engine. diff --git a/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.pdf b/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.pdf index dd1e97e..e804cbd 100644 Binary files a/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.pdf and b/doc/manuals/MicroDexed-User_Manual/MicroDexed-User_Manual.pdf differ diff --git a/doc/manuals/MicroDexed-User_Manual/build.sh b/doc/manuals/MicroDexed-User_Manual/build.sh index c403b9f..bdc8314 100755 --- a/doc/manuals/MicroDexed-User_Manual/build.sh +++ b/doc/manuals/MicroDexed-User_Manual/build.sh @@ -2,7 +2,8 @@ # # sudo apt install wkhtmltopdf pandoc -LCDIMG="../../bin/gen_lcd_screen.sh ../../images" +LCDIMG="../../bin/gen_lcd_screen.sh --imgpath ../../images" -${LCDIMG} "00 SONUS1 %small_1_inv%%key%" "01%bracket_open%ANLGSYN 1 %bracket_close%" images/10_SoundBank_1.jpg +${LCDIMG} --baseimg Preset_Up --line1 "00 SONUS1 %small_1_inv%%key%" --line2 "01%bracket_open%ANLGSYN 1 %bracket_close%" --target images/10_SoundBank_1.jpg +${LCDIMG} --baseimg Preset_Long_Press --line1 "00 %bracket_open%SONUS1 %bracket_close%%small_1_inv%%key%" --line2 "01 ANLGSYN 1 %note%" --target images/10_SoundBank_2.jpg diff --git a/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_1.jpg b/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_1.jpg index 0215965..4632e50 100644 Binary files a/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_1.jpg and b/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_1.jpg differ diff --git a/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_2.jpg b/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_2.jpg new file mode 100644 index 0000000..15cbced Binary files /dev/null and b/doc/manuals/MicroDexed-User_Manual/images/10_SoundBank_2.jpg differ