FreeCalypso > hg > fc-magnetite
changeset 452:4d7c2ccb5814
config mechanism: high-level UI config made separate from target display drivers
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Wed, 14 Mar 2018 07:22:05 +0000 |
| parents | fd1d9063ad40 |
| children | 96c047b4325e |
| files | components/bmi components/bmi-tcs3 components/gdi components/icn components/icn-tcs3 components/mfw components/mfw-tcs3 configure.sh |
| diffstat | 8 files changed, 105 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/components/bmi Tue Mar 13 18:15:14 2018 +0000 +++ b/components/bmi Wed Mar 14 07:22:05 2018 +0000 @@ -20,14 +20,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/bmi-tcs3 Tue Mar 13 18:15:14 2018 +0000 +++ b/components/bmi-tcs3 Wed Mar 14 07:22:05 2018 +0000 @@ -20,14 +20,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/gdi Tue Mar 13 18:15:14 2018 +0000 +++ b/components/gdi Wed Mar 14 07:22:05 2018 +0000 @@ -42,14 +42,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/icn Tue Mar 13 18:15:14 2018 +0000 +++ b/components/icn Wed Mar 14 07:22:05 2018 +0000 @@ -17,14 +17,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/icn-tcs3 Tue Mar 13 18:15:14 2018 +0000 +++ b/components/icn-tcs3 Wed Mar 14 07:22:05 2018 +0000 @@ -17,14 +17,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/mfw Tue Mar 13 18:15:14 2018 +0000 +++ b/components/mfw Wed Mar 14 07:22:05 2018 +0000 @@ -52,14 +52,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/components/mfw-tcs3 Tue Mar 13 18:15:14 2018 +0000 +++ b/components/mfw-tcs3 Wed Mar 14 07:22:05 2018 +0000 @@ -52,14 +52,20 @@ CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED" CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ" -if [ "$TARGET" != c139 -a "$TARGET" != c11x ] -then - if [ "$DSAMPLE_FULL_COLOR" = 1 ] - then +case "$UI_CONFIG" in + bigcolor) CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY" - fi - CPPFLAGS="$CPPFLAGS -DLSCREEN" -fi + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + bigbw) + CPPFLAGS="$CPPFLAGS -DLSCREEN" + ;; + 84x48) + ;; + *) + echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2 + exit 1 +esac CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK" CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
--- a/configure.sh Tue Mar 13 18:15:14 2018 +0000 +++ b/configure.sh Wed Mar 14 07:22:05 2018 +0000 @@ -86,9 +86,21 @@ exit 1 esac -# configurable feature settings +# UI config default based on target + +if [ "$TARGET" = c139 -o "$TARGET" = c11x ] +then + UI_CONFIG=84x48 +else + UI_CONFIG=bigcolor +fi + +# display driver configuration DSAMPLE_FULL_COLOR=1 + +# miscellaneous configurable feature settings + SERIAL_DYNAMIC_SWITCH=0 # allow the user to override these defaults @@ -193,7 +205,7 @@ export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO export DISABLE_SLEEP export INIT_blob -export DSAMPLE_FULL_COLOR +export DSAMPLE_FULL_COLOR UI_CONFIG export SERIAL_DYNAMIC_SWITCH SUBDIR=