Skip to content

Commit

Permalink
v6.26
Browse files Browse the repository at this point in the history 
+ DietPi-Config | Add RPi4 overclocking profiles: https://dietpi.com/phpbb/viewtopic.php?f=12&t=6225
+ DietPi-Config | Fix RPi2 overclocking profiles showing wrong default SDRAM clock
+ DietPi-Config | RPi4 does not support SDRAM clock
+ DietPi-Config | Coding + visual: Use G_CONFIG_INJECT to apply settings
  • Loading branch information
@MichaIng
MichaIng committed Sep 10, 2019
1 parent c71ecb8 commit e1c5ed2
Showing 1 changed file with 102 additions and 31 deletions.
133 changes: 102 additions & 31 deletions dietpi/dietpi-config
View file
Expand Up @@ -3517,7 +3517,7 @@ Additional benchmarks:

sed -i '/arm_freq=/c\#arm_freq=1500' /DietPi/config.txt
sed -i '/core_freq=/c\#core_freq=500' /DietPi/config.txt
sed -i '/sdram_freq=/c\#sdram_freq=3200' /DietPi/config.txt
sed -i '/sdram_freq=/d' /DietPi/config.txt

elif (( $G_HW_MODEL == 3 )); then

Expand Down Expand Up @@ -3578,7 +3578,7 @@ Additional benchmarks:
local over_voltage_value=$(grep -m1 'over_voltage=' /DietPi/config.txt | tr -d '#over_voltage=')
local arm_freq_value=$(grep -m1 'arm_freq=' /DietPi/config.txt | tr -d '#arm_freq=')
local core_freq_value=$(grep -m1 'core_freq=' /DietPi/config.txt | tr -d '#core_freq=')
local sdram_freq_value=$(grep -m1 'sdram_freq=' /DietPi/config.txt | tr -d '#sdram_freq=')
(( $G_HW_MODEL == 4 )) || local sdram_freq_value=$(grep -m1 'sdram_freq=' /DietPi/config.txt | tr -d '#sdram_freq=')

# Overclocking RPi1
# - Zero
Expand Down Expand Up @@ -3630,8 +3630,8 @@ Additional benchmarks:
'safe')

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=2' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=900' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=2' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=900' /DietPi/config.txt

;;

Expand All @@ -3640,9 +3640,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=4' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=900' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=500' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=4' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=900' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

fi

Expand All @@ -3653,9 +3653,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=6' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=1025' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=500' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=6' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1025' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

fi

Expand All @@ -3670,10 +3670,10 @@ Additional benchmarks:

G_WHIP_MENU_ARRAY=(

'none' ': 900 MHz ARM | 250 MHz core | 450 MHz SDRAM | 0 overvolt'
'low' ': 1000 MHz ARM | 250 MHz core | 450 MHz SDRAM | 3 overvolt'
'med' ': 1000 MHz ARM | 500 MHz core | 450 MHz SDRAM | 5 overvolt'
'extreme' ': 1050 MHz ARM | 500 MHz core | 450 MHz SDRAM | 6 overvolt'
'none' ': 900 MHz ARM | 250 MHz core | 400 MHz SDRAM | 0 overvolt'
'low' ': 1000 MHz ARM | 250 MHz core | 400 MHz SDRAM | 3 overvolt'
'med' ': 1000 MHz ARM | 500 MHz core | 400 MHz SDRAM | 5 overvolt'
'extreme' ': 1050 MHz ARM | 500 MHz core | 400 MHz SDRAM | 6 overvolt'

)

Expand All @@ -3695,8 +3695,8 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=3' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=1000' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=3' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1000' /DietPi/config.txt

fi

Expand All @@ -3707,9 +3707,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=5' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=1000' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=500' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=5' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1000' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

fi

Expand All @@ -3720,9 +3720,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=6' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=1050' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=500' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=6' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1050' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

fi

Expand Down Expand Up @@ -3770,9 +3770,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/arm_freq=/c\arm_freq=1300' /DietPi/config.txt
sed -i '/over_voltage=/c\over_voltage=3' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=400' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=3' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1300' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=400' /DietPi/config.txt

fi

Expand All @@ -3783,9 +3783,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/arm_freq=/c\arm_freq=1325' /DietPi/config.txt
sed -i '/over_voltage=/c\over_voltage=4' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=400' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=4' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1325' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=400' /DietPi/config.txt

fi

Expand All @@ -3796,9 +3796,9 @@ Additional benchmarks:
if Warning_Overclocking; then

Reset_Overclocking
sed -i '/over_voltage=/c\over_voltage=5' /DietPi/config.txt
sed -i '/arm_freq=/c\arm_freq=1350' /DietPi/config.txt
sed -i '/core_freq=/c\core_freq=400' /DietPi/config.txt
G_CONFIG_INJECT 'over_voltage=' 'over_voltage=5' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1350' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=400' /DietPi/config.txt

fi

Expand All @@ -3808,6 +3808,77 @@ Additional benchmarks:

fi

# Overclocking Pi4
elif (( $G_HW_MODEL == 4 )); then

G_WHIP_MENU_ARRAY=(

'energy saving' ': 1500 MHz ARM | 500 MHz core | -2 overvolt'
'default' ': 1500 MHz ARM | 500 MHz core | 0 overvolt'
'safe' ': 1600 MHz ARM | 500 MHz core | 0 overvolt'
'medium GPU' ': 1600 MHz ARM | 600 MHz core | 2 overvolt'
'medium ARM' ': 1750 MHz ARM | 500 MHz core | 2 overvolt'
'high GPU' ': 1750 MHz ARM | 600 MHz core | 4 overvolt'
'high ARM' ': 1900 MHz ARM | 500 MHz core | 4 overvolt'

)

G_WHIP_MENU "Hardware : $G_HW_MODEL_DESCRIPTION\nCurrent: $arm_freq_value MHz ARM | $core_freq_value MHz core | $over_voltage_value overvolt"
if (( $? == 0 )); then

TARGETMENUID=13 # Return to this menu
Reset_Overclocking

case "$G_WHIP_RETURNED_VALUE" in

'energy saving')

G_CONFIG_INJECT 'over_voltage=' 'over_voltage=-2' /DietPi/config.txt

;;

'safe')

G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1600' /DietPi/config.txt

;;

'medium GPU')

G_CONFIG_INJECT 'over_voltage=' 'over_voltage=2' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1600' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=600' /DietPi/config.txt

;;

'medium ARM')

G_CONFIG_INJECT 'over_voltage=' 'over_voltage=2' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1750' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

;;

'high GPU')

G_CONFIG_INJECT 'over_voltage=' 'over_voltage=4' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1750' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=600' /DietPi/config.txt

;;

'high ARM')

G_CONFIG_INJECT 'over_voltage=' 'over_voltage=4' /DietPi/config.txt
G_CONFIG_INJECT 'arm_freq=' 'arm_freq=1900' /DietPi/config.txt
G_CONFIG_INJECT 'core_freq=' 'core_freq=500' /DietPi/config.txt

;;

esac

fi

fi

}
Expand Down

0 comments on commit e1c5ed2

Please sign in to comment.