diff --git a/JoyPixels.ttf b/JoyPixels.ttf deleted file mode 100755 index b4e5e82..0000000 Binary files a/JoyPixels.ttf and /dev/null differ diff --git a/bot.sh b/bot.sh index a6e10dc..37b91bb 100755 --- a/bot.sh +++ b/bot.sh @@ -5,6 +5,7 @@ source .env download_meter=resources/download_meter.png upload_meter=resources/upload_meter.png needle=resources/needle.png +font=resources/CODE_Bold.otf while true; do @@ -149,8 +150,8 @@ echo Weather checked ################################################################################# ################################################################################# -ookla_download_angle=$(echo "scale=2; -118 + ($ookla_download_mbps - 0) / (300 - 0) * (118 - -118)" | bc) -ookla_upload_angle=$(echo "scale=2; -118 + ($ookla_upload_mbps - 0) / (50 - 0) * (118 - -118)" | bc) +ookla_download_angle=$(echo "scale=2; -118 + ($ookla_download_mbps - 0) / ($MAX_DOWNLOAD_SPEED - 0) * (118 - -118)" | bc) +ookla_upload_angle=$(echo "scale=2; -118 + ($ookla_upload_mbps - 0) / ($MAX_UPLOAD_SPEED - 0) * (118 - -118)" | bc) convert $download_meter \ \( $needle -background none \ @@ -158,8 +159,9 @@ convert $download_meter \ -gravity center \ -compose over \ -composite \ - -pointsize 65 \ - -fill white \ + -pointsize 41 \ + -font $font \ + -fill '#f85218' \ -annotate +0+-15 $ookla_download_mbps \ $speedtest_download_meter @@ -169,8 +171,9 @@ convert $upload_meter \ -gravity center \ -compose over \ -composite \ - -pointsize 65 \ - -fill white \ + -pointsize 41 \ + -font $font \ + -fill '#5bb93f' \ -annotate +0+-15 $ookla_download_mbps \ $speedtest_upload_meter diff --git a/env.example b/env.example index dab04f1..3f7289e 100644 --- a/env.example +++ b/env.example @@ -18,5 +18,9 @@ LONGITUDE="73.5092" # Change these as you see fit based on RTSP image resolution -UPLOAD_METER_LOCATION=510 -METER_SCALE=100 +UPLOAD_METER_LOCATION=510 # in px starting from download meter start +METER_SCALE=100 # in percentage + +# Change meter scale in Mbps +MAX_DOWNLOAD_SPEED=300 +MAX_UPLOAD_SPEED=50 diff --git a/resources/CODE_Bold.otf b/resources/CODE_Bold.otf new file mode 100644 index 0000000..50dd77d Binary files /dev/null and b/resources/CODE_Bold.otf differ