Bladeren bron

add is_active to grey out old passes on passes list

tags/1.5
Nico Rey 4 jaren geleden
bovenliggende
commit
13e6dc3e25
2 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. +4
    -2
      schedule_meteor.sh
  2. +1
    -1
      schedule_sat.sh

+ 4
- 2
schedule_meteor.sh Bestand weergeven

@@ -18,14 +18,16 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
var3=$(echo "$START_TIME" | cut -d " " -f 2 | cut -d ":" -f 3)
TIMER=$(expr "${var2}" - "${var1}" + "${var3}")
OUTDATE=$(date --date="TZ=\"UTC\" ${START_TIME}" +%Y%m%d-%H%M%S)
PASS_START=$(expr "$5" + 90)
SUN_ELEV=$(python3 "$NOAA_HOME"/sun.py "$PASS_START")

if [ "${MAXELEV}" -gt "${METEOR_MIN_ELEV}" ]; then
if [ "${MAXELEV}" -gt "${METEOR_MIN_ELEV}" ] && [ "${SUN_ELEV}" -gt "${SUN_MIN_ELEV}" ]; then
log "Pass is above ${METEOR_MIN_ELEV}, that is OK for me" "INFO"
SATNAME=$(echo "$1" | sed "s/ //g")
echo "${SATNAME}" "${OUTDATE}" "$MAXELEV"
echo "${NOAA_HOME}/receive_meteor.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/predict/weather.tle \
${var1} ${TIMER} ${MAXELEV}" | at "$(date --date="TZ=\"UTC\" ${START_TIME}" +"%H:%M %D")"
sqlite3 /home/pi/raspberry-noaa/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev) values (\"$SATNAME\",$var1,$var2,$MAXELEV);"
sqlite3 /home/pi/raspberry-noaa/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev,is_active) values (\"$SATNAME\",$var1,$var2,$MAXELEV,1);"
fi
NEXTPREDICT=$(expr "${var2}" + 60)
PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)


+ 1
- 1
schedule_sat.sh Bestand weergeven

@@ -31,7 +31,7 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
echo "${SATNAME}" "${OUTDATE}" "$MAXELEV"
echo "${NOAA_HOME}/receive.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/predict/weather.tle \
${var1} ${TIMER} ${MAXELEV}" | at "$(date --date="TZ=\"UTC\" ${START_TIME}" +"%H:%M %D")"
sqlite3 /home/pi/raspberry-noaa/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev) values (\"$SATNAME\",$var1,$var2,$MAXELEV);"
sqlite3 /home/pi/raspberry-noaa/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev,is_active) values (\"$SATNAME\",$var1,$var2,$MAXELEV, 1);"
fi
NEXTPREDICT=$(expr "${var2}" + 60)
PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)


Laden…
Annuleren
Opslaan