commit 42b68f30a85a295673fa3ae8aef12c28dfd88c8d
parent fae6cac022521599c420b147b7d4e4c16d55fbc1
Author: rbckman <rob@tarina.org>
Date: Thu, 9 Nov 2023 21:40:49 +0000
HDMI output working, just untitledfilm is no name
Diffstat:
2 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/install.sh b/install.sh
@@ -83,30 +83,13 @@ echo "Tarina configuration seems to be in order in /boot/config.txt"
echo "Adding to /boot/config.txt"
cat <<'EOF' >> /boot/config.txt
#-----Tarina configuration starts here-------
-#tarina-rpi-configuration-1.0
-#Rpi-hd-tft
-dtoverlay=dpi18
-overscan_left=0
-overscan_right=0
-overscan_top=0
-overscan_bottom=0
-framebuffer_width=800
-framebuffer_height=480
-enable_dpi_lcd=1
-display_default_lcd=1
-dpi_group=2
-dpi_mode=87
-dpi_output_format=0x6f015
-hdmi_timings=480 0 16 16 24 800 0 4 2 2 0 0 0 60 0 32000000 6
-dtoverlay=pi3-disable-bt-overlay
-dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23framebuffer_height=480
-display_rotate=3
+#tarina-rpi-configuration-1.1
+#hyperpixel
start_x=1
gpu_mem=256
disable_splash=1
force_turbo=1
boot_delay=1
-dtparam=i2c_arm=on
# dtparam=sd_overclock=90
# Disable the ACT LED.
dtparam=act_led_trigger=none
@@ -114,6 +97,27 @@ dtparam=act_led_activelow=off
# Disable the PWR LED.
dtparam=pwr_led_trigger=none
dtparam=pwr_led_activelow=off
+framebuffer_width=800
+framebuffer_height=480
+#hdmi_force_hotplug=1
+hdmi_group=1
+hdmi_mode=3
+[EDID=N/A-] ##Hyperpixel HD CONFIG
+
+dtoverlay=hyperpixel4
+overscan_left=0
+overscan_right=0
+overscan_top=0
+overscan_bottom=0
+enable_dpi_lcd=1
+display_default_lcd=1
+display_rotate=1
+dpi_group=2
+hdmi_group=2
+dpi_mode=87
+dpi_output_format=0x7f216
+hdmi_timings=480 0 10 16 59 800 0 15 113 15 0 0 0 60 0 32000000 6
+
#--------Tarina configuration end here---------
EOF
elif [ "$screen" = "hyperpixel4" ]
diff --git a/tarina.py b/tarina.py
@@ -538,7 +538,9 @@ def main():
newfilmname = ''
vumetermessage('film already exist!')
logger.info('film already exist!')
- rendermenu = True
+ updatethumb = True
+ loadfilmsettings = True
+ rendermenu = True
#EDIT FILM NAME
elif pressed == 'middle' and menu[selected] == 'TITLE' or filmname == '':
newfilmname = nameyourfilm(filmfolder, filmname, abc, False)
@@ -2479,7 +2481,7 @@ def nameyourfilm(filmfolder, filmname, abc, newfilm):
buttontime = time.time()
holdbutton = ''
abcx = 0
- helpmessage = 'Up, Down (select characters) Right (next). Middle (done), Retake (Cancel)'
+ helpmessage = 'Left (remove), Up, Down (select characters) Right (next). Middle (done), Retake (Cancel)'
vumetermessage('Press enter if you want to leave it untitled')
cursor = '_'
blinking = True
@@ -2491,6 +2493,7 @@ def nameyourfilm(filmfolder, filmname, abc, newfilm):
message = 'Edit film name: ' + filmname
print(term.clear+term.home)
print(message+cursor)
+ print(helpmessage)
writemessage(message + cursor)
vumetermessage(helpmessage)
pressed, buttonpressed, buttontime, holdbutton, event, keydelay = getbutton(pressed, buttonpressed, buttontime, holdbutton)
@@ -2519,6 +2522,8 @@ def nameyourfilm(filmfolder, filmname, abc, newfilm):
filmname = filmname[:-1]
cursor = abc[abcx]
elif pressed == 'middle' or event == 10:
+ if filmname == '':
+ filmname='untitledfilm'
if len(filmname) > 0:
if abc[abcx] != '_':
filmname = filmname + abc[abcx]
@@ -2526,7 +2531,8 @@ def nameyourfilm(filmfolder, filmname, abc, newfilm):
if filmname == oldfilmname:
return oldfilmname
elif filmname in getfilms(filmfolder)[0]:
- helpmessage = 'this filmname is already taken! pick another name!'
+ helpmessage = 'this filmname is already taken! make a sequel!'
+ filmname = filmname+'2'
elif filmname not in getfilms(filmfolder)[0]:
logger.info("New film " + filmname)
return(filmname)
