From 1afb2d43acfcfb5c6ddb519e81d91ce26049e061 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Mon, 4 Aug 2025 19:15:02 -0400
Subject: [PATCH 01/25] Implementing Start _ Stop for QoS

Implementing Start _ Stop commands for QoS
---
 flexqos.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 5bb426e..7a1116c 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -12,8 +12,8 @@
 # Contributors: @maghuro
 # shellcheck disable=SC1090,SC1091,SC2039,SC2154,SC3043
 # amtm NoMD5check
-version=1.4.8
-release=2025-07-10
+version=1.4.9
+release=2025-08-04
 # Forked from FreshJR_QOS v8.8, written by FreshJR07 https://github.com/FreshJR07/FreshJR_QOS
 # License
 #  FlexQoS is free to use under the GNU General Public License, version 3 (GPL-3.0).
@@ -1091,6 +1091,45 @@ update() {
 	exit
 } # update
 
+qos_stop() {
+    # Stop Adaptive QoS cleanly
+    logmsg "Stopping Adaptive QoS…"
+    service stop_qos
+
+    commit=0
+    cur_enable="$(nvram get qos_enable 2>/dev/null)"
+    if [ -n "${cur_enable}" ] && [ "${cur_enable}" != "0" ]; then
+        nvram set qos_enable=0
+        commit=1
+    fi
+
+    # Only commit if we changed something
+    [ "${commit}" = "1" ] && nvram commit
+    logmsg "Adaptive QoS stopped."
+}
+
+qos_start() {
+    # Start Adaptive QoS (Adaptive = qos_type 1, enable = 1)
+    logmsg "Starting Adaptive QoS…"
+
+    commit=0
+    cur_type="$(nvram get qos_type 2>/dev/null)"
+    if [ -n "${cur_type}" ] && [ "${cur_type}" != "1" ]; then
+        nvram set qos_type=1
+        commit=1
+    fi
+
+    cur_enable="$(nvram get qos_enable 2>/dev/null)"
+    if [ -n "${cur_enable}" ] && [ "${cur_enable}" != "1" ]; then
+        nvram set qos_enable=1
+        commit=1
+    fi
+
+    [ "${commit}" = "1" ] && nvram commit
+    service start_qos
+    logmsg "Adaptive QoS started."
+}
+
 prompt_restart() {
 	# Restart QoS so that FlexQoS changes can take effect.
 	# Possible values for $needrestart:
@@ -1122,14 +1161,20 @@ menu() {
 	clear
 	sed -n '2,10p' "${0}"		# display banner
 	scriptinfo
+    if [ "$(nvram get qos_enable)" = "1" ]; then
+        qos_action="stop"     # show “stop” if QoS is running
+    else
+        qos_action="start"    # show “start” if QoS is stopped
+    fi
 	printf "  (1) about        explain functionality\n"
 	printf "  (2) update       check for updates\n"
 	printf "  (3) debug        traffic control parameters\n"
-	printf "  (4) restart      restart QoS\n"
-	printf "  (5) backup       create settings backup\n"
+	printf "  (4) restart      restart QoS completely\n"
+	printf "  (5) %-12s %s QoS\n" "${qos_action}" "${qos_action}"
+	printf "  (6) backup       create settings backup\n"
 	if [ -f "${ADDON_DIR}/restore_${SCRIPTNAME}_settings.sh" ]; then
-		printf "  (6) restore      restore settings from backup\n"
-		printf "  (7) delete       remove backup\n"
+		printf "  (7) restore      restore settings from backup\n"
+		printf "  (8) delete       remove backup\n"
 	fi
 	printf "\n  (9) uninstall    uninstall script\n"
 	printf "  (e) exit\n"
@@ -1150,16 +1195,23 @@ menu() {
 			prompt_restart
 		;;
 		'5')
-			backup create
+			if [ "${qos_action}" = "stop" ]; then
+				qos_stop
+			else
+				qos_start
+			fi
 		;;
 		'6')
+			backup create
+		;;
+		'7')
 			if [ -f "${ADDON_DIR}/restore_${SCRIPTNAME}_settings.sh" ]; then
 				backup restore
 			else
 				Red "$input is not a valid option!"
 			fi
 		;;
-		'7')
+		'8')
 			if [ -f "${ADDON_DIR}/restore_${SCRIPTNAME}_settings.sh" ]; then
 				backup remove
 			else
@@ -1927,6 +1979,12 @@ case "${arg1}" in
 		remove_webui
 		needrestart=2
 		;;
+	'qosstart')
+		qos_start
+		;;
+	'qosstop')
+		qos_stop
+		;;
 	'backup')
 		backup create force
 		;;

From c322de2b400415e929b62e31b49ff11314f51ef1 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 08:31:46 -0400
Subject: [PATCH 02/25] Adding Menu Options

Adding Menu Options
---
 flexqos.sh | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 204 insertions(+), 9 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 7a1116c..c8abaef 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1093,7 +1093,7 @@ update() {
 
 qos_stop() {
     # Stop Adaptive QoS cleanly
-    logmsg "Stopping Adaptive QoS…"
+    logmsg "Stopping Adaptive QoS..."
     service stop_qos
 
     commit=0
@@ -1110,7 +1110,7 @@ qos_stop() {
 
 qos_start() {
     # Start Adaptive QoS (Adaptive = qos_type 1, enable = 1)
-    logmsg "Starting Adaptive QoS…"
+    logmsg "Starting Adaptive QoS..."
 
     commit=0
     cur_type="$(nvram get qos_type 2>/dev/null)"
@@ -1154,6 +1154,205 @@ prompt_restart() {
 	fi
 } # prompt_restart
 
+##### QoS Disable Window Scheduler (guided + custom) ###########################
+
+QOS_CRON_OFF="${SCRIPTNAME}_qosoff"
+QOS_CRON_ON="${SCRIPTNAME}_qoson"
+
+# --- helpers ---------------------------------------------------------------
+_qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
+_qs_to_dec() { printf "%s" "${1:-0}" | awk '{print $1+0}'; }
+
+_qs_parse_time() {
+    local t h m
+    t="$(_qs_trim "$1")"
+    # Accept HH or HH:MM
+    echo "$t" | grep -Eq '^[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
+
+    h="${t%%:*}"
+    m="${t#*:}"
+    [ "$t" = "$h" ] && m="0"
+
+    # Force base-10
+    h="$(_qs_to_dec "$h")"
+    m="$(_qs_to_dec "$m")"
+
+    # Range checks
+    [ "$h" -ge 0 ] 2>/dev/null && [ "$h" -le 23 ] || return 1
+    [ "$m" -ge 0 ] 2>/dev/null && [ "$m" -le 59 ] || return 1
+
+    printf "%02d %02d" "$h" "$m"
+}
+
+_qs_valid_dow() {
+  # *, single 0-7, ranges, comma lists (BusyBox crond)
+  echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
+}
+
+_qs_human_dow() {
+    case "$1" in
+        "*")   printf "every day" ;;
+        "1-5") printf "weekdays (Mon-Fri)" ;;
+        "0,6"| "6,0") printf "weekends (Sat,Sun)" ;;
+        *)     printf "DOW=%s" "$1" ;;
+    esac
+}
+
+_qs_duration_min() {
+    # args: start "MM HH", end "MM HH" -> echo minutes from start→end wrapping midnight
+    set -- $1; sm="$1"; sh="$2"
+    set -- $2; em="$1"; eh="$2"
+    s=$((sh*60+sm)); e=$((eh*60+em))
+    if [ "$e" -le "$s" ]; then
+        echo $((1440 - (s - e)))
+    else
+        echo $((e - s))
+    fi
+}
+
+_qs_show_current() {
+  local lines
+  lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})#" || true)"
+  [ -z "$lines" ] && printf "  (none)\n" || printf "%s\n" "$lines" | sed 's/^/  /'
+}
+
+_qs_clear_jobs() {
+    cru d "${QOS_CRON_OFF}" 2>/dev/null
+    cru d "${QOS_CRON_ON}"  2>/dev/null
+}
+
+_qs_apply_jobs() {
+    # $1=sh $2=sm $3=eh $4=em $5=dow  (all zero-padded already)
+    local sh sm eh em dow
+    sh="$1"; sm="$2"; eh="$3"; em="$4"; dow="$5"
+    [ -n "$dow" ] || dow="*"
+
+    _qs_clear_jobs
+    cru a "${QOS_CRON_ON}" "${sm} ${sh} * * ${dow} ${SCRIPTPATH} -qosstart"
+    cru a "${QOS_CRON_OFF}"  "${em} ${eh} * * ${dow} ${SCRIPTPATH} -qosstop"
+}
+
+_qs_show_current() {
+    local lines
+    lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})#" || true)"
+    if [ -z "$lines" ]; then
+        printf "  (none)\n"
+    else
+        printf "%s\n" "$lines" | sed 's/^/  /'
+    fi
+}
+
+# --- interactive flows -----------------------------------------------------
+
+_qs_prompt() {
+    # $1=prompt  $2=default (optional)
+    local v
+    while :; do
+        [ -n "$2" ] && printf "%s [%s]: " "$1" "$2" >&2 || printf "%s: " "$1" >&2
+        read -r v || return 1
+        v="$(_qs_trim "$v")"
+        [ -n "$v" ] || v="$2"
+        printf "%s" "$v"
+        return 0
+    done
+}
+
+_qs_guided() {
+    printf "\nConfigure daily QoS window (up to 23h):\n" >&2
+    printf " - QoS ENABLE at START time, DISABLE at END time.\n" >&2
+    printf " - Times: HH or HH:MM (24h).\n\n" >&2
+
+    printf "Days of week:\n  1) Every day (*)\n  2) Weekdays (1-5)\n  3) Weekends (0,6)\n" >&2
+
+    local sel dow
+    while :; do
+        sel="$(_qs_prompt "Select DOW (1-3, or e=exit)" "")" || return 1
+        case "$sel" in
+            e|E|cancel|Cancel) return 1 ;;
+            1) dow="*"   ; break ;;
+            2) dow="1-5" ; break ;;
+            3) dow="0,6" ; break ;;
+            *) printf "Invalid selection.\n" >&2 ;;
+        esac
+    done
+
+    local st et sh sm eh em t
+    while :; do
+      t="$(_qs_prompt "START time to ENABLE QoS" "07:00")" || return 1
+      if out="$(_qs_parse_time "$t")"; then
+        set -- $out; sh="$1"; sm="$2"
+        break
+      fi
+      printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
+    done
+
+    # END time
+    while :; do
+      t="$(_qs_prompt "END time to DISABLE QoS" "20:00")" || return 1
+      if out="$(_qs_parse_time "$t")"; then
+        set -- $out; eh="$1"; em="$2"
+        break
+      fi
+      printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
+    done
+
+    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE : %s:%s\n  Days   : %s\n" "$sh" "$sm" "$eh" "$em" "${dow}"
+    t="$(_qs_prompt "Apply this schedule? (y/n)" "y")" || return 1
+    case "$t" in
+        y|Y) _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"; printf "OK. Schedule applied.\n" >&2 ;;
+        *)   printf "Canceled.\n" >&2; return 1 ;;
+    esac
+}
+
+_qs_custom() {
+    printf "\nCustom cron mode:\n" >&2
+    printf "Enter the custom cron fields below (MIN HOUR DOM MON DOW).\n" >&2
+    printf "Examples: '0 20 * * *' or '0 7 * * 1-5'\n\n" >&2
+
+    local off5 on5
+    printf "Enable (qosstart) schedule> " >&2
+    read -r on5 || return 1
+    on5="$(_qs_trim "$on5")"
+
+    printf "Disable (qosstop) schedule> " >&2
+    read -r off5 || return 1
+    off5="$(_qs_trim "$off5")"
+
+    echo "$on5"  | grep -qE '^([^[:space:]]+[[:space:]]+){4}[^[:space:]]+$' || { printf "Bad enable schedule.\n"  >&2; return 1; }
+    echo "$off5" | grep -qE '^([^[:space:]]+[[:space:]]+){4}[^[:space:]]+$' || { printf "Bad disable schedule.\n" >&2; return 1; }
+
+    _qs_clear_jobs
+    cru a "${QOS_CRON_ON}"  "${on5}  ${SCRIPTPATH} -qosstart"
+    cru a "${QOS_CRON_OFF}" "${off5} ${SCRIPTPATH} -qosstop"
+
+    printf "OK. Custom entries applied.\n" >&2
+    return 0
+}
+
+qos_schedule_menu() {
+    while :; do
+        printf "\n================ QoS Schedule =================\n"
+        printf "Current QoS schedule (if any):\n"
+        _qs_show_current
+        printf "\nChoose an option:\n"
+        printf "  1) Guided setup (start/end + DOW)\n"
+        printf "  2) Custom cron (5 fields)\n"
+        printf "  3) Clear schedule\n"
+        printf "  e) Exit\n"
+        printf "-----------------------------------------------\n"
+        printf "Enter selection: "
+        read -r sel || return
+        case "$sel" in
+            1) _qs_guided ;;
+            2) _qs_custom ;;
+            3) _qs_clear_jobs; printf "Schedule cleared.\n" ;;
+            e|E|exit|Exit) return ;;
+            *) printf "Invalid selection.\n" ;;
+        esac
+    done
+}
+
+
 menu() {
 	# Minimal interactive, menu-driven interface for basic maintenance functions.
 	local yn
@@ -1170,7 +1369,7 @@ menu() {
 	printf "  (2) update       check for updates\n"
 	printf "  (3) debug        traffic control parameters\n"
 	printf "  (4) restart      restart QoS completely\n"
-	printf "  (5) %-12s %s QoS\n" "${qos_action}" "${qos_action}"
+	printf "  (5) schedule     schedule QoS\n"
 	printf "  (6) backup       create settings backup\n"
 	if [ -f "${ADDON_DIR}/restore_${SCRIPTNAME}_settings.sh" ]; then
 		printf "  (7) restore      restore settings from backup\n"
@@ -1195,11 +1394,7 @@ menu() {
 			prompt_restart
 		;;
 		'5')
-			if [ "${qos_action}" = "stop" ]; then
-				qos_stop
-			else
-				qos_start
-			fi
+			qos_schedule_menu
 		;;
 		'6')
 			backup create
@@ -1730,7 +1925,7 @@ startup() {
 	#  auto-remove on unsupported Wi-Fi 7 firmware for firmware upgrades betweem 3004 and 3006
 	if nvram get rc_support | grep -q -w wifi7
 	then
-		logmsg "Wi-Fi 7 router detected – ${SCRIPTNAME_DISPLAY} is unsupported. Initiating automatic uninstall."
+		logmsg "Wi-Fi 7 router detected - ${SCRIPTNAME_DISPLAY} is unsupported. Initiating automatic uninstall."
 		uninstall force
 		return 1        # Abort the rest of startup
 	fi

From fa30b5a0d3439240a4e58138f1e7e17b112d7834 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 09:01:29 -0400
Subject: [PATCH 03/25] More Cleanup

Additional Fine-tuning
---
 flexqos.sh | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index c8abaef..8d5f4e3 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1092,42 +1092,50 @@ update() {
 } # update
 
 qos_stop() {
-    # Stop Adaptive QoS cleanly
+    # Stop Adaptive QoS cleanly (runtime only; no flash writes by default)
+    local cur_enable need_stop
     logmsg "Stopping Adaptive QoS..."
-    service stop_qos
+    need_stop=0
 
-    commit=0
     cur_enable="$(nvram get qos_enable 2>/dev/null)"
     if [ -n "${cur_enable}" ] && [ "${cur_enable}" != "0" ]; then
         nvram set qos_enable=0
-        commit=1
+        need_stop=1
     fi
 
-    # Only commit if we changed something
-    [ "${commit}" = "1" ] && nvram commit
-    logmsg "Adaptive QoS stopped."
+    if [ "${need_stop}" = "1" ]; then
+        service stop_qos
+        # Only persist if explicitly requested
+        logmsg "Adaptive QoS stopped."
+    else
+        logmsg "Adaptive QoS already disabled; nothing to do."
+    fi
 }
 
 qos_start() {
+    local cur_type cur_enable need_start
     # Start Adaptive QoS (Adaptive = qos_type 1, enable = 1)
     logmsg "Starting Adaptive QoS..."
+    need_start=0
 
-    commit=0
     cur_type="$(nvram get qos_type 2>/dev/null)"
     if [ -n "${cur_type}" ] && [ "${cur_type}" != "1" ]; then
         nvram set qos_type=1
-        commit=1
     fi
 
     cur_enable="$(nvram get qos_enable 2>/dev/null)"
     if [ -n "${cur_enable}" ] && [ "${cur_enable}" != "1" ]; then
         nvram set qos_enable=1
-        commit=1
+        need_start=1
     fi
 
-    [ "${commit}" = "1" ] && nvram commit
-    service start_qos
-    logmsg "Adaptive QoS started."
+    if [ "${need_start}" = "1" ]; then
+        service start_qos
+        # Only persist if explicitly requested
+        logmsg "Adaptive QoS started."
+    else
+        logmsg "Adaptive QoS already running; nothing to do."
+    fi
 }
 
 prompt_restart() {
@@ -1210,12 +1218,6 @@ _qs_duration_min() {
     fi
 }
 
-_qs_show_current() {
-  local lines
-  lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})#" || true)"
-  [ -z "$lines" ] && printf "  (none)\n" || printf "%s\n" "$lines" | sed 's/^/  /'
-}
-
 _qs_clear_jobs() {
     cru d "${QOS_CRON_OFF}" 2>/dev/null
     cru d "${QOS_CRON_ON}"  2>/dev/null

From fe469fcfbca9a2bba562ef585eb1122493874706 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 11:20:23 -0400
Subject: [PATCH 04/25] Implementing WebUI Schedule Control

Implementing WebUI Schedule Control
---
 flexqos.asp | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 161 insertions(+), 1 deletion(-)

diff --git a/flexqos.asp b/flexqos.asp
index 5f8e28d..52883c0 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -145,6 +145,19 @@ box-shadow: #2B6692 5px 0px 0px 0px inset;
 td.cat7{
 box-shadow: #6C604F 5px 0px 0px 0px inset;
 }
+#sched_block thead th { 
+color: #fff !important;
+}
+#sched_block .sched-day{
+display: inline-flex;
+align-items: center;
+gap: 4px;
+white-space: nowrap;
+margin: 2px 8px 2px 0;
+}
+#sched_block .sched-daycb{
+margin: 0;
+}
 </style>
 
 <script>
@@ -544,6 +557,115 @@ function draw_conntrack_table() {
 	updateTable();
 }
 
+// ---- SCHEDULER UI ----
+var SCHED_DAYS = ["Su","Mo","Tu","We","Th","Fr","Sa"];
+
+// One source of truth for UI defaults
+var SCHED_DEFAULT = { days:[1,2,3,4,5], start:"07:00", end:"20:00" };
+
+// Fallback if inputs are blank (used when reading the form)
+var SCHED_INPUT_FALLBACK = { start:"07:00", end:"20:00" };
+
+// Build a <tr> for one schedule window
+function schedRowHtml(win) {
+  var daysHtml = '';
+  for (var d = 0; d < 7; d++) {
+    var checked = (win.days && win.days.indexOf(d) >= 0) ? 'checked' : '';
+    daysHtml += '<label class="sched-day"><input type="checkbox" class="sched-daycb" data-day="'+d+'" '+checked+'> '+SCHED_DAYS[d]+'</label>';
+  }
+
+  win = Object.assign({}, SCHED_DEFAULT, win || {});
+  var start = win.start;
+  var end   = win.end;
+  return (
+    '<tr>' +
+      '<td>'+ daysHtml +'</td>' +
+      '<td><input type="time" class="sched-time sched-start" value="'+start+'"></td>' +
+      '<td><input type="time" class="sched-time sched-end" value="'+end+'"><div class="sched-warn" style="display:none;margin-top:4px;">End must be after start</div></td>' +
+    '</tr>'
+  );
+}
+
+function schedParse(str) {
+  if (typeof str !== 'string' || !str.trim()) return null;
+  var s = (str[0] === '<') ? str.slice(1) : str;
+  var p = s.split('>');
+  if (p.length !== 4) return null;
+  return {
+    enabled: p[0] === '1',
+    days: p[1] ? p[1].split(',').map(function(x){ return +x; }) : [],
+    start: p[2] || SCHED_DEFAULT.start,
+    end:   p[3] || SCHED_DEFAULT.end
+  };
+}
+
+function schedStringify(o) {
+  var enabled = o.enabled ? '1' : '0';
+  var days = (o.days || []).join(',');
+  var start = (o.start && o.start.trim()) ? o.start : SCHED_INPUT_FALLBACK.start;
+  var end   = (o.end   && o.end.trim())   ? o.end   : SCHED_INPUT_FALLBACK.end;
+  return '<' + [enabled, days, start, end].join('>');
+}
+
+function schedAddRow(win) {
+  var tbody = document.getElementById('sched_tbody');
+  tbody.innerHTML = ''; // always a single schedule
+  if (!win) win = SCHED_DEFAULT;
+  var tr = document.createElement('tr');
+  tr.innerHTML = schedRowHtml(win);
+  tbody.appendChild(tr);
+}
+
+// Read one row -> {days:[], start:"HH:MM", end:"HH:MM"}
+function schedReadRow(tr) {
+  var cbs = tr.querySelectorAll('.sched-daycb');
+  var days = [];
+  for (var i=0;i<cbs.length;i++) if (cbs[i].checked) days.push(parseInt(cbs[i].getAttribute('data-day')));
+  var start = tr.querySelector('.sched-start').value || SCHED_INPUT_FALLBACK.start;
+  var end   = tr.querySelector('.sched-end').value   || SCHED_INPUT_FALLBACK.end;
+  return { days: days, start: start, end: end };
+}
+
+function timeToMinutes(hm) {
+  var s = hm.split(':'); return parseInt(s[0],10)*60 + parseInt(s[1],10);
+}
+
+// Validate all rows; returns {ok:boolean, windows:[...]}
+function schedSerialize() {
+  var row = document.querySelector('#sched_tbody tr');
+  var win = schedReadRow(row);
+  var warn = row.querySelector('.sched-warn');
+
+  var valid = (win.days.length > 0) && (timeToMinutes(win.end) > timeToMinutes(win.start));
+  warn.style.display = valid ? 'none' : '';
+  return { ok: valid, win: win };
+}
+
+// Show/Hide block on toggle
+function schedToggleUI() {
+  var on = document.getElementById('sched_enabled').checked;
+  document.getElementById('sched_block').style.display = on ? '' : 'none';
+}
+
+// Populate UI from custom_settings.flexqos_schedule
+function schedPopulateFromSettings() {
+  var parsed = schedParse(custom_settings.flexqos_schedule);
+  var enabled = !!(parsed && parsed.enabled);
+
+  var cb = document.getElementById('sched_enabled');
+  cb.checked = enabled;
+  schedToggleUI();
+
+  var win = parsed ? { days: parsed.days, start: parsed.start, end: parsed.end } : SCHED_DEFAULT;
+  schedAddRow(win);
+}
+
+// Wire events once
+function schedInitOnce() {
+  var cb = document.getElementById('sched_enabled');
+  if (cb) cb.addEventListener('change', schedToggleUI);
+}
+
 function setsort(newfield) {
 	if (newfield != sortfield) {
 		sortdir = 0;
@@ -772,6 +894,7 @@ function initial() {
 	// Setup appdb auto-complete menu
 	autocomplete(document.getElementById("appdb_search_x"), catdb_label_array);
 	build_overhead_presets();
+	schedInitOnce();
 	if (based_modelid == "RT-AX88U_PRO" || based_modelid == "GT-AX11000_PRO" || based_modelid == "GT-AX6000" || based_modelid == "GT-AXE16000" || based_modelid == "RT-AX86U_PRO" || based_modelid == "XT12" )
 		document.getElementById('flexqos_fccontrol_tr').style.display = "";
 }
@@ -2136,6 +2259,8 @@ function set_FlexQoS_mod_vars()
 		document.form.flexqos_outputcls.value = "5";
 	else
 		document.form.flexqos_outputcls.value = custom_settings.flexqos_outputcls;
+	// Restore schedule UI
+	schedPopulateFromSettings();
 }
 
 function FlexQoS_reset_iptables() {
@@ -2282,7 +2407,22 @@ function FlexQoS_mod_apply() {
 	}
 	appdb_rulelist_array += appdb_last_rules;
 
-
+	// ---- Save schedule ----
+	if (document.getElementById('sched_enabled').checked) {
+  	var ser = schedSerialize();
+  	if (!ser.ok) {
+    	alert("Schedule has invalid values.\n• Pick at least one day\n• End time must be after start time");
+    	return;
+  	}
+  	custom_settings.flexqos_schedule = schedStringify({
+    	enabled: true,
+    	days: ser.win.days,
+    	start: ser.win.start,
+    	end:   ser.win.end
+  	});
+	} else {
+  	delete custom_settings.flexqos_schedule;
+	}
 	if (iptables_rulelist_array.length > 2999) {
 		alert("Total iptables rules exceeds 2999 bytes! Please delete or consolidate!");
 		return
@@ -2827,6 +2967,26 @@ function DelCookie(cookiename){
 			<input type="radio" name="flexqos_conntrack" class="input" value="0">No
 		</td>
 	</tr>
+	<tr>
+  		<th>Schedule</th>
+  		<td>
+    		<label>
+      		<input type="checkbox" id="sched_enabled"> Enable
+    		</label>
+    		<div id="sched_block" style="margin-top:8px; display:none;">
+      		<table width="100%" border="1" cellspacing="0" cellpadding="4" class="FormTable_table">
+        		<thead>
+          		<tr>
+            		<th style="width:50%;">Days</th>
+            		<th style="width:25%;">Start</th>
+            		<th style="width:25%;">End</th>
+          		</tr>
+        		</thead>
+        		<tbody id="sched_tbody"></tbody>
+      		</table>
+    		</div>
+  		</td>
+	</tr>
 	<tr>
 		<th><a class="hintstyle" href="javascript:void(0);" onClick="openHint('FlexQoS',4);">Router/VPN Client Outbound Traffic Class</th>
 		<td>

From 8197d8b24709dc515d95695286b0d7665a3af768 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 13:40:34 -0400
Subject: [PATCH 05/25] Connecting WebUI and Shell

Connecting WebUI and Shell
---
 flexqos.asp |  44 +++++++++++++++-
 flexqos.sh  | 142 ++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 163 insertions(+), 23 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index 52883c0..e4f41e1 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -586,14 +586,54 @@ function schedRowHtml(win) {
   );
 }
 
+function parseDaysSpec(spec) {
+  if (typeof spec !== 'string') return [];
+  spec = spec.trim();
+  if (!spec) return [];
+  if (spec === '*') return [0,1,2,3,4,5,6];
+
+  var days = [];
+  var push = function(n){
+    if (n === 7) n = 0;                // 7 == Sunday
+    if (n >= 0 && n <= 6 && days.indexOf(n) < 0) days.push(n);
+  };
+
+  spec.split(',').forEach(function(tok){
+    tok = tok.trim();
+    if (!tok) return;
+    if (tok.indexOf('-') >= 0) {
+      var parts = tok.split('-');
+      var a = parseInt(parts[0], 10), b = parseInt(parts[1], 10);
+      if (!isNaN(a) && !isNaN(b)) {
+        var lo = Math.min(a,b), hi = Math.max(a,b);
+        for (var d = lo; d <= hi; d++) push(d);
+      }
+    } else {
+      var n = parseInt(tok, 10);
+      if (!isNaN(n)) push(n);
+    }
+  });
+
+  days.sort(function(a,b){ return a-b; });
+  return days;
+}
+
+function stringifyDays(days) {
+  var uniq = Array.from(new Set((days || []).map(function(n){ return parseInt(n,10); })))
+                  .filter(function(n){ return n >= 0 && n <= 6; })
+                  .sort(function(a,b){ return a-b; });
+  return (uniq.length === 7) ? '*' : uniq.join(',');
+}
+
 function schedParse(str) {
   if (typeof str !== 'string' || !str.trim()) return null;
   var s = (str[0] === '<') ? str.slice(1) : str;
   var p = s.split('>');
   if (p.length !== 4) return null;
+
   return {
     enabled: p[0] === '1',
-    days: p[1] ? p[1].split(',').map(function(x){ return +x; }) : [],
+    days: parseDaysSpec(p[1]),
     start: p[2] || SCHED_DEFAULT.start,
     end:   p[3] || SCHED_DEFAULT.end
   };
@@ -601,7 +641,7 @@ function schedParse(str) {
 
 function schedStringify(o) {
   var enabled = o.enabled ? '1' : '0';
-  var days = (o.days || []).join(',');
+  var days = stringifyDays(o.days || []);
   var start = (o.start && o.start.trim()) ? o.start : SCHED_INPUT_FALLBACK.start;
   var end   = (o.end   && o.end.trim())   ? o.end   : SCHED_INPUT_FALLBACK.end;
   return '<' + [enabled, days, start, end].join('>');
diff --git a/flexqos.sh b/flexqos.sh
index 8d5f4e3..51e5933 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1166,10 +1166,76 @@ prompt_restart() {
 
 QOS_CRON_OFF="${SCRIPTNAME}_qosoff"
 QOS_CRON_ON="${SCRIPTNAME}_qoson"
+SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
 
 # --- helpers ---------------------------------------------------------------
 _qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
 _qs_to_dec() { printf "%s" "${1:-0}" | awk '{print $1+0}'; }
+_qs_hm() {
+    printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
+}
+
+_qs_settings_set() {
+    # args: enabled(0/1) dow sh sm eh em
+    local en dow sh sm eh em line
+    en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
+    line="<${en}>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
+    am_settings_set "${SCRIPTNAME}"_schedule "$line"
+    SCHEDULE="$line"
+}
+
+_qs_settings_delete() {
+    local file
+    file="/jffs/addons/custom_settings.txt"
+    if [ -f "$file" ]; then
+        # Remove any line that starts with "<script>_schedule "
+        sed -i -e "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
+    fi
+    SCHEDULE=""
+}
+
+_qs_parse_schedule_var() {
+    # in: $SCHEDULE like "<1>*|list|range>HH:MM>HH:MM"
+    # out (echo): en dow sh sm eh em
+    local s en rest dow st et out sh sm eh em
+    s="$(_qs_trim "$SCHEDULE")"
+    [ -n "$s" ] || return 1
+
+    # Validate format without using a `case` pattern (BusyBox ash can choke on < > here)
+    printf "%s" "$s" | grep -Eq '^<[01]>[^>]+>[0-2]?[0-9](:[0-5]?[0-9])?>[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
+
+    en="${s#<}"; en="${en%%>*}"
+    rest="${s#*>}"
+    dow="${rest%%>*}"
+    rest="${rest#*>}"
+    st="${rest%%>*}"
+    et="${rest#*>}"
+
+    [ "$en" = "1" ] || [ "$en" = "0" ] || return 1
+    _qs_valid_dow "$dow" || return 1
+
+    out="$(_qs_parse_time "$st")" || return 1
+    set -- $out; sh="$1"; sm="$2"
+    out="$(_qs_parse_time "$et")" || return 1
+    set -- $out; eh="$1"; em="$2"
+
+    printf "%s %s %s %s %s %s\n" "$en" "$dow" "$sh" "$sm" "$eh" "$em"
+}
+
+qos_schedule_apply_from_config() {
+    [ -n "$SCHEDULE" ] || SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+    if out="$(_qs_parse_schedule_var)"; then
+        set -- $out
+        en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
+        if [ "$en" = "1" ]; then
+            _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"
+        else
+            _qs_clear_jobs
+        fi
+    else
+        _qs_clear_jobs
+    fi
+}
 
 _qs_parse_time() {
     local t h m
@@ -1235,13 +1301,19 @@ _qs_apply_jobs() {
 }
 
 _qs_show_current() {
-    local lines
+    local lines out en dow sh sm eh em
     lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})#" || true)"
     if [ -z "$lines" ]; then
         printf "  (none)\n"
     else
         printf "%s\n" "$lines" | sed 's/^/  /'
     fi
+    if [ -n "$SCHEDULE" ]; then
+        if out="$(_qs_parse_schedule_var)"; then
+            set -- $out
+            en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
+        fi
+    fi
 }
 
 # --- interactive flows -----------------------------------------------------
@@ -1271,37 +1343,35 @@ _qs_guided() {
         sel="$(_qs_prompt "Select DOW (1-3, or e=exit)" "")" || return 1
         case "$sel" in
             e|E|cancel|Cancel) return 1 ;;
-            1) dow="*"   ; break ;;
-            2) dow="1-5" ; break ;;
-            3) dow="0,6" ; break ;;
-            *) printf "Invalid selection.\n" >&2 ;;
+            1) dow="*" ;;
+            2) dow="1-5" ;;
+            3) dow="0,6" ;;
+            *) printf "Invalid selection.\n" >&2; continue ;;
         esac
+        break
     done
 
-    local st et sh sm eh em t
+    local out sh sm eh em t
     while :; do
       t="$(_qs_prompt "START time to ENABLE QoS" "07:00")" || return 1
-      if out="$(_qs_parse_time "$t")"; then
-        set -- $out; sh="$1"; sm="$2"
-        break
-      fi
+      if out="$(_qs_parse_time "$t")"; then set -- $out; sh="$1"; sm="$2"; break; fi
       printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
     done
 
-    # END time
     while :; do
       t="$(_qs_prompt "END time to DISABLE QoS" "20:00")" || return 1
-      if out="$(_qs_parse_time "$t")"; then
-        set -- $out; eh="$1"; em="$2"
-        break
-      fi
+      if out="$(_qs_parse_time "$t")"; then set -- $out; eh="$1"; em="$2"; break; fi
       printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
     done
 
-    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE : %s:%s\n  Days   : %s\n" "$sh" "$sm" "$eh" "$em" "${dow}"
+    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE: %s:%s\n  Days   : %s\n" "$sh" "$sm" "$eh" "$em" "${dow}"
     t="$(_qs_prompt "Apply this schedule? (y/n)" "y")" || return 1
     case "$t" in
-        y|Y) _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"; printf "OK. Schedule applied.\n" >&2 ;;
+        y|Y)
+            _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"
+            _qs_settings_set 1 "$dow" "$sh" "$sm" "$eh" "$em"
+            printf "OK. Schedule applied and saved.\n" >&2
+        ;;
         *)   printf "Canceled.\n" >&2; return 1 ;;
     esac
 }
@@ -1326,12 +1396,38 @@ _qs_custom() {
     _qs_clear_jobs
     cru a "${QOS_CRON_ON}"  "${on5}  ${SCRIPTPATH} -qosstart"
     cru a "${QOS_CRON_OFF}" "${off5} ${SCRIPTPATH} -qosstop"
-
     printf "OK. Custom entries applied.\n" >&2
-    return 0
+
+    # Persist to <en>dow>HH:MM>HH:MM if simple DOW-only with fixed HH:MM
+    local m1 h1 d1 mo1 w1 m2 h2 d2 mo2 w2 ok
+    set -- $on5;  m1="$1"; h1="$2"; d1="$3"; mo1="$4"; w1="$5"
+    set -- $off5; m2="$1"; h2="$2"; d2="$3"; mo2="$4"; w2="$5"
+    ok=1
+    echo "$m1" | grep -Eq '^[0-5]?[0-9]$' || ok=0
+    echo "$h1" | grep -Eq '^[0-2]?[0-9]$' || ok=0
+    echo "$m2" | grep -Eq '^[0-5]?[0-9]$' || ok=0
+    echo "$h2" | grep -Eq '^[0-2]?[0-9]$' || ok=0
+    [ "$d1"  = "*" ] || ok=0
+    [ "$mo1" = "*" ] || ok=0
+    [ "$d2"  = "*" ] || ok=0
+    [ "$mo2" = "*" ] || ok=0
+    [ "$w1" = "$w2" ] || ok=0
+    _qs_valid_dow "$w1" || ok=0
+
+    if [ "$ok" = "1" ]; then
+        m1="$(_qs_to_dec "$m1")"; h1="$(_qs_to_dec "$h1")"
+        m2="$(_qs_to_dec "$m2")"; h2="$(_qs_to_dec "$h2")"
+        _qs_settings_set 1 "$w1" "$(printf "%02d" "$h1")" "$(printf "%02d" "$m1")" "$(printf "%02d" "$h2")" "$(printf "%02d" "$m2")"
+    else
+        printf "Note: Custom expressions aren't DOW-only with fixed HH:MM; not persisted to settings file.\n" >&2
+    fi
 }
 
 qos_schedule_menu() {
+    # Ensure cron is rebuilt from saved settings as soon as the menu opens
+    SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+    qos_schedule_apply_from_config
+
     while :; do
         printf "\n================ QoS Schedule =================\n"
         printf "Current QoS schedule (if any):\n"
@@ -1347,14 +1443,18 @@ qos_schedule_menu() {
         case "$sel" in
             1) _qs_guided ;;
             2) _qs_custom ;;
-            3) _qs_clear_jobs; printf "Schedule cleared.\n" ;;
+            3)
+               _qs_clear_jobs
+               _qs_settings_delete
+               qos_schedule_apply_from_config
+               printf "Schedule cleared.\n"
+            ;;
             e|E|exit|Exit) return ;;
             *) printf "Invalid selection.\n" ;;
         esac
     done
 }
 
-
 menu() {
 	# Minimal interactive, menu-driven interface for basic maintenance functions.
 	local yn

From 6d42111f02a4c3692b256136b0609198c486ac15 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 13:55:54 -0400
Subject: [PATCH 06/25] Additional Cleanup

Additional Cleanup
---
 flexqos.sh | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 51e5933..0fd0d3a 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1170,10 +1170,8 @@ SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
 
 # --- helpers ---------------------------------------------------------------
 _qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
-_qs_to_dec() { printf "%s" "${1:-0}" | awk '{print $1+0}'; }
-_qs_hm() {
-    printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
-}
+_qs_to_dec() { printf '%d' "$((10#${1:-0}))"; }
+_qs_hm() { printf '%02d:%02d' "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"; }
 
 _qs_settings_set() {
     # args: enabled(0/1) dow sh sm eh em
@@ -1185,12 +1183,8 @@ _qs_settings_set() {
 }
 
 _qs_settings_delete() {
-    local file
-    file="/jffs/addons/custom_settings.txt"
-    if [ -f "$file" ]; then
-        # Remove any line that starts with "<script>_schedule "
-        sed -i -e "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
-    fi
+    local file="/jffs/addons/custom_settings.txt"
+    [ -f "$file" ] && sed -i "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
     SCHEDULE=""
 }
 
@@ -1201,15 +1195,11 @@ _qs_parse_schedule_var() {
     s="$(_qs_trim "$SCHEDULE")"
     [ -n "$s" ] || return 1
 
-    # Validate format without using a `case` pattern (BusyBox ash can choke on < > here)
-    printf "%s" "$s" | grep -Eq '^<[01]>[^>]+>[0-2]?[0-9](:[0-5]?[0-9])?>[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
-
-    en="${s#<}"; en="${en%%>*}"
-    rest="${s#*>}"
-    dow="${rest%%>*}"
-    rest="${rest#*>}"
-    st="${rest%%>*}"
-    et="${rest#*>}"
+    # Split without regex validation; validate components after
+    s="${s#<}"
+    en="${s%%>*}"; s="${s#*>}"
+    dow="${s%%>*}"; s="${s#*>}"
+    st="${s%%>*}";  et="${s#*>}"
 
     [ "$en" = "1" ] || [ "$en" = "0" ] || return 1
     _qs_valid_dow "$dow" || return 1
@@ -1238,24 +1228,22 @@ qos_schedule_apply_from_config() {
 }
 
 _qs_parse_time() {
+    # Accept HH or HH:MM
     local t h m
     t="$(_qs_trim "$1")"
-    # Accept HH or HH:MM
-    echo "$t" | grep -Eq '^[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
 
-    h="${t%%:*}"
-    m="${t#*:}"
-    [ "$t" = "$h" ] && m="0"
+    case "$t" in
+        *:*) h="${t%%:*}"; m="${t#*:}" ;;
+        *)   h="$t"; m="0" ;;
+    esac
 
-    # Force base-10
     h="$(_qs_to_dec "$h")"
     m="$(_qs_to_dec "$m")"
 
-    # Range checks
     [ "$h" -ge 0 ] 2>/dev/null && [ "$h" -le 23 ] || return 1
     [ "$m" -ge 0 ] 2>/dev/null && [ "$m" -le 59 ] || return 1
 
-    printf "%02d %02d" "$h" "$m"
+    printf '%02d %02d' "$h" "$m"
 }
 
 _qs_valid_dow() {

From d8a104c5148587ec0286278e4dd4157777075724 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 5 Aug 2025 14:04:30 -0400
Subject: [PATCH 07/25] Adding Missing Startup Entry

Adding Missing Startup Entry
---
 flexqos.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flexqos.sh b/flexqos.sh
index 0fd0d3a..0acdfca 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -2028,6 +2028,7 @@ startup() {
 	install_webui mount
 	generate_bwdpi_arrays
 	get_config
+	qos_schedule_apply_from_config
 
 	case "$(uname -r)" in
 	4.19.*)

From 9a03626def22fd642c9d77b4f63f5eeefb6dbdd0 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Wed, 6 Aug 2025 00:02:18 -0400
Subject: [PATCH 08/25] Fine Tuning

Fine Tuning
---
 flexqos.sh | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 0acdfca..921c525 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1170,8 +1170,10 @@ SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
 
 # --- helpers ---------------------------------------------------------------
 _qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
-_qs_to_dec() { printf '%d' "$((10#${1:-0}))"; }
-_qs_hm() { printf '%02d:%02d' "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"; }
+_qs_to_dec() { printf "%s" "${1:-0}" | awk '{print $1+0}'; }
+_qs_hm() {
+    printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
+}
 
 _qs_settings_set() {
     # args: enabled(0/1) dow sh sm eh em
@@ -1185,7 +1187,6 @@ _qs_settings_set() {
 _qs_settings_delete() {
     local file="/jffs/addons/custom_settings.txt"
     [ -f "$file" ] && sed -i "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
-    SCHEDULE=""
 }
 
 _qs_parse_schedule_var() {
@@ -1195,11 +1196,15 @@ _qs_parse_schedule_var() {
     s="$(_qs_trim "$SCHEDULE")"
     [ -n "$s" ] || return 1
 
-    # Split without regex validation; validate components after
-    s="${s#<}"
-    en="${s%%>*}"; s="${s#*>}"
-    dow="${s%%>*}"; s="${s#*>}"
-    st="${s%%>*}";  et="${s#*>}"
+    # Validate format without using a `case` pattern (BusyBox ash can choke on < > here)
+    printf "%s" "$s" | grep -Eq '^<[01]>[^>]+>[0-2]?[0-9](:[0-5]?[0-9])?>[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
+
+    en="${s#<}"; en="${en%%>*}"
+    rest="${s#*>}"
+    dow="${rest%%>*}"
+    rest="${rest#*>}"
+    st="${rest%%>*}"
+    et="${rest#*>}"
 
     [ "$en" = "1" ] || [ "$en" = "0" ] || return 1
     _qs_valid_dow "$dow" || return 1
@@ -1228,14 +1233,14 @@ qos_schedule_apply_from_config() {
 }
 
 _qs_parse_time() {
-    # Accept HH or HH:MM
     local t h m
     t="$(_qs_trim "$1")"
+    # Accept HH or HH:MM
+    echo "$t" | grep -Eq '^[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
 
-    case "$t" in
-        *:*) h="${t%%:*}"; m="${t#*:}" ;;
-        *)   h="$t"; m="0" ;;
-    esac
+    h="${t%%:*}"
+    m="${t#*:}"
+    [ "$t" = "$h" ] && m="0"
 
     h="$(_qs_to_dec "$h")"
     m="$(_qs_to_dec "$m")"
@@ -1243,7 +1248,7 @@ _qs_parse_time() {
     [ "$h" -ge 0 ] 2>/dev/null && [ "$h" -le 23 ] || return 1
     [ "$m" -ge 0 ] 2>/dev/null && [ "$m" -le 59 ] || return 1
 
-    printf '%02d %02d' "$h" "$m"
+    printf "%02d %02d" "$h" "$m"
 }
 
 _qs_valid_dow() {

From 2f7436a3206d80a6a819d150d31f0689f359799a Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Wed, 6 Aug 2025 00:09:03 -0400
Subject: [PATCH 09/25] Fixing Bug/Typo

Fixing Bug/Typo
---
 flexqos.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flexqos.sh b/flexqos.sh
index 921c525..c42a476 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1187,6 +1187,7 @@ _qs_settings_set() {
 _qs_settings_delete() {
     local file="/jffs/addons/custom_settings.txt"
     [ -f "$file" ] && sed -i "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
+    SCHEDULE=""
 }
 
 _qs_parse_schedule_var() {

From a855e57ac76459ef520f0504eba847c7b7975c2f Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Wed, 6 Aug 2025 01:20:59 -0400
Subject: [PATCH 10/25] Bug Fix

Bug Fix
---
 flexqos.asp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index e4f41e1..24511e0 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -618,11 +618,12 @@ function parseDaysSpec(spec) {
   return days;
 }
 
-function stringifyDays(days) {
+ function stringifyDays(days) {
   var uniq = Array.from(new Set((days || []).map(function(n){ return parseInt(n,10); })))
                   .filter(function(n){ return n >= 0 && n <= 6; })
                   .sort(function(a,b){ return a-b; });
-  return (uniq.length === 7) ? '*' : uniq.join(',');
+  // Avoid '*' because ASUSWRT cru will glob-expand it in a subshell
+  return (uniq.length === 7) ? '0-6' : uniq.join(',');
 }
 
 function schedParse(str) {

From 387dc393d7d16ff689b6692412275ccf51a02197 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Thu, 7 Aug 2025 08:25:40 -0400
Subject: [PATCH 11/25] Immediately Trigger for  Past Due Schedules

Immediately Trigger for  Past Due Schedules
---
 flexqos.sh | 82 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 17 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index c42a476..409d0c9 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1170,10 +1170,11 @@ SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
 
 # --- helpers ---------------------------------------------------------------
 _qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
-_qs_to_dec() { printf "%s" "${1:-0}" | awk '{print $1+0}'; }
+_qs_to_dec() { printf '%s\n' "${1:-0}" | awk '{print $1+0}'; }
 _qs_hm() {
     printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
 }
+_qs_int() { _qs_to_dec "$1"; } 
 
 _qs_settings_set() {
     # args: enabled(0/1) dow sh sm eh em
@@ -1236,20 +1237,54 @@ qos_schedule_apply_from_config() {
 _qs_parse_time() {
     local t h m
     t="$(_qs_trim "$1")"
-    # Accept HH or HH:MM
-    echo "$t" | grep -Eq '^[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
 
-    h="${t%%:*}"
-    m="${t#*:}"
-    [ "$t" = "$h" ] && m="0"
+    h="${t%%:*}"          # chars before first “:”
+    m="${t#*:}"           # chars after  first “:”
+    [ "$t" = "$h" ] && m="0"   # no “:MM” → default 0
 
+    # SAFE decimal cast – BusyBox ash chokes on “10#…”, so use the
+    # existing helper (_qs_to_dec prints “value+0” via awk)
     h="$(_qs_to_dec "$h")"
     m="$(_qs_to_dec "$m")"
 
-    [ "$h" -ge 0 ] 2>/dev/null && [ "$h" -le 23 ] || return 1
-    [ "$m" -ge 0 ] 2>/dev/null && [ "$m" -le 59 ] || return 1
+    printf '%02d %02d' "$h" "$m"
+}
+
+_qs_now_in_window() {
+    # (sh sm eh em dow)
+    local sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
+    local eh=$(_qs_to_dec "$3"); em=$(_qs_to_dec "$4")
+    local dow="$5" day ok part s e now start end
+    dow="$5"
+
+    # --- precalc the window in minutes
+    start=$(( sh * 60 + sm ))
+    end=$(( eh * 60 + em ))
+
+    # ----- DOW filter -----
+    if [ "$dow" != "*" ]; then
+        day="$(date +%w)"; ok=0
+        IFS=','; for part in $dow; do
+            if echo "$part" | grep -q -- '-'; then
+                s="${part%-*}" ; e="${part#*-}"
+                [ "$day" -ge "$s" ] && [ "$day" -le "$e" ] && { ok=1; break; }
+            else
+                [ "$day" = "$part" ] && { ok=1; break; }
+            fi
+        done; IFS=' '
+        [ "$ok" = 1 ] || return 1
+    fi
 
-    printf "%02d %02d" "$h" "$m"
+    # ---------- 2.  Minute-of-day match ----------
+    now_h=$(_qs_to_dec "$(date +%H)")
+    now_m=$(_qs_to_dec "$(date +%M)")
+    now=$(( now_h * 60 + now_m ))
+
+    if [ "$start" -le "$end" ]; then
+        [ "$now" -ge "$start" ] && [ "$now" -lt "$end" ]
+    else
+        [ "$now" -ge "$start" ] || [ "$now" -lt "$end" ]
+    fi
 }
 
 _qs_valid_dow() {
@@ -1267,10 +1302,16 @@ _qs_human_dow() {
 }
 
 _qs_duration_min() {
-    # args: start "MM HH", end "MM HH" -> echo minutes from start→end wrapping midnight
+    # args: start "MM HH", end "MM HH" → echo minutes from start→end (wraps midnight)
     set -- $1; sm="$1"; sh="$2"
     set -- $2; em="$1"; eh="$2"
-    s=$((sh*60+sm)); e=$((eh*60+em))
+
+   # cast each field safely to decimal before arithmetic
+   sh=$(_qs_to_dec "$sh"); sm=$(_qs_to_dec "$sm")
+   eh=$(_qs_to_dec "$eh"); em=$(_qs_to_dec "$em")
+   s=$(( sh * 60 + sm ))
+   e=$(( eh * 60 + em ))
+
     if [ "$e" -le "$s" ]; then
         echo $((1440 - (s - e)))
     else
@@ -1284,14 +1325,21 @@ _qs_clear_jobs() {
 }
 
 _qs_apply_jobs() {
-    # $1=sh $2=sm $3=eh $4=em $5=dow  (all zero-padded already)
-    local sh sm eh em dow
-    sh="$1"; sm="$2"; eh="$3"; em="$4"; dow="$5"
-    [ -n "$dow" ] || dow="*"
+    # (sh sm eh em dow)
+    local sh="$(_qs_int "$1")" sm="$(_qs_int "$2")"
+    local eh="$(_qs_int "$3")" em="$(_qs_int "$4")"
+    local dow="${5:-*}"
 
     _qs_clear_jobs
-    cru a "${QOS_CRON_ON}" "${sm} ${sh} * * ${dow} ${SCRIPTPATH} -qosstart"
-    cru a "${QOS_CRON_OFF}"  "${em} ${eh} * * ${dow} ${SCRIPTPATH} -qosstop"
+    cru a "${QOS_CRON_ON}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
+    cru a "${QOS_CRON_OFF}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
+
+    # Immediate alignment
+    if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then
+        qos_start
+    else
+        qos_stop
+    fi
 }
 
 _qs_show_current() {

From d7d37eed13512edf9c3fa1e2812d436b808a1de9 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Fri, 8 Aug 2025 08:44:08 -0400
Subject: [PATCH 12/25] Allow Custom Cron Jobs

Allow Custom Cron Jobs
---
 flexqos.asp | 273 ++++++++++++++++++++++++++++++++--------------------
 flexqos.sh  | 270 ++++++++++++++++++++++-----------------------------
 2 files changed, 287 insertions(+), 256 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index 24511e0..f1d946c 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -567,144 +567,219 @@ var SCHED_DEFAULT = { days:[1,2,3,4,5], start:"07:00", end:"20:00" };
 var SCHED_INPUT_FALLBACK = { start:"07:00", end:"20:00" };
 
 // Build a <tr> for one schedule window
-function schedRowHtml(win) {
-  var daysHtml = '';
-  for (var d = 0; d < 7; d++) {
-    var checked = (win.days && win.days.indexOf(d) >= 0) ? 'checked' : '';
+function schedRowHtml(win, idx){
+  win = Object.assign({}, SCHED_DEFAULT, win || {});
+  var daysHtml = "";
+  for (var d = 0; d < 7; d++){
+    var checked = (win.days.indexOf(d) >= 0) ? "checked" : "";
     daysHtml += '<label class="sched-day"><input type="checkbox" class="sched-daycb" data-day="'+d+'" '+checked+'> '+SCHED_DAYS[d]+'</label>';
   }
 
-  win = Object.assign({}, SCHED_DEFAULT, win || {});
-  var start = win.start;
-  var end   = win.end;
+  /* keep four visible cells so columns stay aligned            *
+   * – row-0 shows only Start                                  *
+   * – row-1 shows only End                                    */
+  var startCell, endCell;
+  if (idx === 0){                    /* Start row */
+      startCell = '<td><input type="time" class="sched-time sched-start" value="'+win.start+'"></td>';
+      /* blank cell but keep hidden value for serializer */
+      endCell   = '<td>&nbsp;<input type="hidden" class="sched-time sched-end" value="'+win.end+'"></td>';
+  }else{                             /* End row   */
+      /* blank cell but keep hidden value for serializer */
+      startCell = '<td>&nbsp;<input type="hidden" class="sched-time sched-start" value="'+win.start+'"></td>';
+      endCell   = '<td><input type="time" class="sched-time sched-end" value="'+win.end+'"></td>';
+  }
+
+  /* the last <td> kept only for layout — no minus button */
   return (
-    '<tr>' +
+    '<tr data-row="'+idx+'">' +
       '<td>'+ daysHtml +'</td>' +
-      '<td><input type="time" class="sched-time sched-start" value="'+start+'"></td>' +
-      '<td><input type="time" class="sched-time sched-end" value="'+end+'"><div class="sched-warn" style="display:none;margin-top:4px;">End must be after start</div></td>' +
+      startCell + endCell +
     '</tr>'
   );
 }
 
-function parseDaysSpec(spec) {
-  if (typeof spec !== 'string') return [];
-  spec = spec.trim();
-  if (!spec) return [];
-  if (spec === '*') return [0,1,2,3,4,5,6];
+function parseDaysSpec(spec){
+  if (typeof spec !== "string") return [];
+  spec = spec.trim(); if (!spec) return [];
+  if (spec === "*") return [0,1,2,3,4,5,6];
 
-  var days = [];
-  var push = function(n){
-    if (n === 7) n = 0;                // 7 == Sunday
+  var days = [], push = function(n){
+    if (n === 7) n = 0;
     if (n >= 0 && n <= 6 && days.indexOf(n) < 0) days.push(n);
   };
 
-  spec.split(',').forEach(function(tok){
-    tok = tok.trim();
-    if (!tok) return;
-    if (tok.indexOf('-') >= 0) {
-      var parts = tok.split('-');
-      var a = parseInt(parts[0], 10), b = parseInt(parts[1], 10);
-      if (!isNaN(a) && !isNaN(b)) {
+  spec.split(",").forEach(function(tok){
+    tok = tok.trim(); if (!tok) return;
+    if (tok.indexOf("-") >= 0){
+      var p = tok.split("-"), a = parseInt(p[0],10), b = parseInt(p[1],10);
+      if (!isNaN(a) && !isNaN(b)){
         var lo = Math.min(a,b), hi = Math.max(a,b);
         for (var d = lo; d <= hi; d++) push(d);
       }
-    } else {
-      var n = parseInt(tok, 10);
-      if (!isNaN(n)) push(n);
+    }else{
+      var n = parseInt(tok,10); if (!isNaN(n)) push(n);
     }
   });
-
-  days.sort(function(a,b){ return a-b; });
-  return days;
+  return days.sort(function(a,b){ return a - b; });
 }
 
- function stringifyDays(days) {
-  var uniq = Array.from(new Set((days || []).map(function(n){ return parseInt(n,10); })))
-                  .filter(function(n){ return n >= 0 && n <= 6; })
-                  .sort(function(a,b){ return a-b; });
-  // Avoid '*' because ASUSWRT cru will glob-expand it in a subshell
-  return (uniq.length === 7) ? '0-6' : uniq.join(',');
+function stringifyDays(days){
+  var uniq = Array.from(new Set((days||[]).map(function(n){ return parseInt(n,10); })))
+                   .filter(function(n){ return n >= 0 && n <= 6; })
+                   .sort(function(a,b){ return a - b; });
+  return (uniq.length === 7) ? "0-6" : uniq.join(",");
 }
 
-function schedParse(str) {
-  if (typeof str !== 'string' || !str.trim()) return null;
-  var s = (str[0] === '<') ? str.slice(1) : str;
-  var p = s.split('>');
-  if (p.length !== 4) return null;
+function schedParse(str){
+  if (typeof str !== "string" || !str.trim()) return null;
+
+  const p = str.replace(/^</,"").replace(/>$/,"").split(">");  // drop wrappers
+  if (p.length < 3 || p.length > 4) return null;               // guard rails
 
-  return {
-    enabled: p[0] === '1',
-    days: parseDaysSpec(p[1]),
-    start: p[2] || SCHED_DEFAULT.start,
-    end:   p[3] || SCHED_DEFAULT.end
+  const obj = {
+    enabled : (p[0] === "1"),
+    days    : parseDaysSpec(p[1])
   };
+
+  if (p.length === 3){                 // <1>{days}{time}
+    // Decide whether this is a start-only or end-only record
+    // We treat 00:00 or blank on purpose as “start”.
+    obj.start = p[2];
+  }else{                               // <1>{days}{start}{end}
+    obj.start = p[2];
+    obj.end   = p[3];
+  }
+  return obj;
 }
 
-function schedStringify(o) {
-  var enabled = o.enabled ? '1' : '0';
-  var days = stringifyDays(o.days || []);
-  var start = (o.start && o.start.trim()) ? o.start : SCHED_INPUT_FALLBACK.start;
-  var end   = (o.end   && o.end.trim())   ? o.end   : SCHED_INPUT_FALLBACK.end;
-  return '<' + [enabled, days, start, end].join('>');
+function schedStringify(o){
+  const enabled = o.enabled ? "1" : "0";
+  const days    = stringifyDays(o.days || []);
+
+  const parts = [enabled, days];          // always these two
+
+  if (o.hasOwnProperty("start")) parts.push(o.start || "");
+  if (o.hasOwnProperty("end"))   parts.push(o.end   || "");
+
+  return "<" + parts.join(">") + ">";
 }
 
-function schedAddRow(win) {
-  var tbody = document.getElementById('sched_tbody');
-  tbody.innerHTML = ''; // always a single schedule
-  if (!win) win = SCHED_DEFAULT;
-  var tr = document.createElement('tr');
-  tr.innerHTML = schedRowHtml(win);
-  tbody.appendChild(tr);
+function schedAddRow(win){
+   var tbody = document.getElementById("sched_tbody");
+
+   /* two rows (Start & End) are already present → nothing to add */
+   /* stop somewhere sensible – six windows = 12 rows */
+   if (tbody.children.length >= 12) return;
+
+   var idx   = tbody.children.length;
+   var tmp   = document.createElement("tbody");
+   tmp.innerHTML = schedRowHtml(win, idx);
+   tbody.appendChild(tmp.firstElementChild);
+
+  /* The old “+” button is gone; guard against null */
+  if (tbody.children.length >= 2){
+    var plus = document.getElementById("sched_add_btn");
+    if (plus) plus.disabled = true;
+  }
 }
 
-// Read one row -> {days:[], start:"HH:MM", end:"HH:MM"}
-function schedReadRow(tr) {
-  var cbs = tr.querySelectorAll('.sched-daycb');
+function schedReadRow(tr){
   var days = [];
-  for (var i=0;i<cbs.length;i++) if (cbs[i].checked) days.push(parseInt(cbs[i].getAttribute('data-day')));
-  var start = tr.querySelector('.sched-start').value || SCHED_INPUT_FALLBACK.start;
-  var end   = tr.querySelector('.sched-end').value   || SCHED_INPUT_FALLBACK.end;
-  return { days: days, start: start, end: end };
+  tr.querySelectorAll(".sched-daycb").forEach(function(cb){
+    if (cb.checked) days.push(parseInt(cb.getAttribute("data-day"),10));
+  });
+  var start = tr.querySelector(".sched-start").value || SCHED_FALLBACK.start;
+  var end   = tr.querySelector(".sched-end").value   || SCHED_FALLBACK.end;
+  return { days:days, start:start, end:end, enabled:true };
 }
 
-function timeToMinutes(hm) {
-  var s = hm.split(':'); return parseInt(s[0],10)*60 + parseInt(s[1],10);
+function timeToMinutes(hm){
+  var s = hm.split(":"); return parseInt(s[0],10)*60 + parseInt(s[1],10);
 }
 
 // Validate all rows; returns {ok:boolean, windows:[...]}
-function schedSerialize() {
-  var row = document.querySelector('#sched_tbody tr');
-  var win = schedReadRow(row);
-  var warn = row.querySelector('.sched-warn');
+function schedSerialize () {
+  const rows = document.querySelectorAll("#sched_tbody tr");
+  if (rows.length % 2 !== 0){
+    return { ok:false, err:"Start/End rows must be in pairs", str:"" };
+  }
+
+  const blocks = [];
+
+  for (let i = 0; i < rows.length; i += 2){
+    const s = schedReadRow(rows[i]);       // start-row
+    const e = schedReadRow(rows[i+1]);     // end-row
+
+    if (!s.days.length || !e.days.length){
+      return { ok:false,
+               err:"Each window needs days ticked on BOTH rows",
+               str:"" };
+    }
+
+    blocks.push( schedStringify({
+      enabled : true,
+      days    : s.days,
+      start   : s.start          // end intentionally omitted
+    }));
+
+    blocks.push( schedStringify({
+      enabled : true,
+      days    : e.days,
+      end     : e.end            // start intentionally omitted
+    }));
+  }
 
-  var valid = (win.days.length > 0) && (timeToMinutes(win.end) > timeToMinutes(win.start));
-  warn.style.display = valid ? 'none' : '';
-  return { ok: valid, win: win };
+  return { ok:true, err:"", str:blocks.join("|") };
 }
 
 // Show/Hide block on toggle
-function schedToggleUI() {
-  var on = document.getElementById('sched_enabled').checked;
-  document.getElementById('sched_block').style.display = on ? '' : 'none';
+function schedToggleUI(){
+  const on = document.getElementById("sched_enabled").checked;
+  document.getElementById("sched_block").style.display = on ? "" : "none";
+
+  /* —---- Auto-seed one default window (Mo-Fr 07:00-20:00) ----- */
+  if (on &&
+      !document.getElementById("sched_tbody").children.length &&
+      !(custom_settings.flexqos_schedule || "").trim()            // <-- new
+  ){
+      // row 0  → Start   (07:00)
+      schedAddRow({ days:[1,2,3,4,5], start:"07:00" });
+      // row 1  → End     (20:00)
+      schedAddRow({ days:[1,2,3,4,5], end  :"20:00" });
+  }
 }
 
 // Populate UI from custom_settings.flexqos_schedule
-function schedPopulateFromSettings() {
-  var parsed = schedParse(custom_settings.flexqos_schedule);
-  var enabled = !!(parsed && parsed.enabled);
+function schedPopulateFromSettings(){
+  const raw = (custom_settings.flexqos_schedule || "").trim();
+  if (!raw) return;                       // nothing stored yet
 
-  var cb = document.getElementById('sched_enabled');
-  cb.checked = enabled;
+  document.getElementById("sched_enabled").checked = true;
   schedToggleUI();
 
-  var win = parsed ? { days: parsed.days, start: parsed.start, end: parsed.end } : SCHED_DEFAULT;
-  schedAddRow(win);
+  raw.split("|").forEach(part => {
+    const win = schedParse(part);
+    if (!win) return;
+
+    /* decide which cell (Start / End) this record belongs to */
+    if (win.start && !win.end){
+      schedAddRow({ days:win.days, start:win.start });
+    }else if (win.end && !win.start){
+      schedAddRow({ days:win.days, end:win.end   });
+    }else{
+      /* a fully-specified record: show both halves */
+      schedAddRow({ days:win.days, start:win.start });
+      schedAddRow({ days:win.days, end  :win.end   });
+    }
+  });
 }
 
 // Wire events once
-function schedInitOnce() {
-  var cb = document.getElementById('sched_enabled');
-  if (cb) cb.addEventListener('change', schedToggleUI);
+function schedInitOnce(){
+  var cb = document.getElementById("sched_enabled");
+  if (cb) cb.addEventListener("change", schedToggleUI);
+  /* no extra rows → hide the “add” button altogether */
+  // leave the button visible – every click adds another Start/End pair
 }
 
 function setsort(newfield) {
@@ -2449,20 +2524,12 @@ function FlexQoS_mod_apply() {
 	appdb_rulelist_array += appdb_last_rules;
 
 	// ---- Save schedule ----
-	if (document.getElementById('sched_enabled').checked) {
-  	var ser = schedSerialize();
-  	if (!ser.ok) {
-    	alert("Schedule has invalid values.\n• Pick at least one day\n• End time must be after start time");
-    	return;
-  	}
-  	custom_settings.flexqos_schedule = schedStringify({
-    	enabled: true,
-    	days: ser.win.days,
-    	start: ser.win.start,
-    	end:   ser.win.end
-  	});
-	} else {
-  	delete custom_settings.flexqos_schedule;
+	if (document.getElementById('sched_enabled').checked){
+		var ser = schedSerialize();
+		if (!ser.ok){ alert("Schedule error: " + ser.err); return; }
+		custom_settings.flexqos_schedule = ser.str;     // pipe-separated list
+	}else{
+		delete custom_settings.flexqos_schedule;
 	}
 	if (iptables_rulelist_array.length > 2999) {
 		alert("Total iptables rules exceeds 2999 bytes! Please delete or consolidate!");
diff --git a/flexqos.sh b/flexqos.sh
index 409d0c9..bf2e426 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1174,7 +1174,6 @@ _qs_to_dec() { printf '%s\n' "${1:-0}" | awk '{print $1+0}'; }
 _qs_hm() {
     printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
 }
-_qs_int() { _qs_to_dec "$1"; } 
 
 _qs_settings_set() {
     # args: enabled(0/1) dow sh sm eh em
@@ -1191,49 +1190,6 @@ _qs_settings_delete() {
     SCHEDULE=""
 }
 
-_qs_parse_schedule_var() {
-    # in: $SCHEDULE like "<1>*|list|range>HH:MM>HH:MM"
-    # out (echo): en dow sh sm eh em
-    local s en rest dow st et out sh sm eh em
-    s="$(_qs_trim "$SCHEDULE")"
-    [ -n "$s" ] || return 1
-
-    # Validate format without using a `case` pattern (BusyBox ash can choke on < > here)
-    printf "%s" "$s" | grep -Eq '^<[01]>[^>]+>[0-2]?[0-9](:[0-5]?[0-9])?>[0-2]?[0-9](:[0-5]?[0-9])?$' || return 1
-
-    en="${s#<}"; en="${en%%>*}"
-    rest="${s#*>}"
-    dow="${rest%%>*}"
-    rest="${rest#*>}"
-    st="${rest%%>*}"
-    et="${rest#*>}"
-
-    [ "$en" = "1" ] || [ "$en" = "0" ] || return 1
-    _qs_valid_dow "$dow" || return 1
-
-    out="$(_qs_parse_time "$st")" || return 1
-    set -- $out; sh="$1"; sm="$2"
-    out="$(_qs_parse_time "$et")" || return 1
-    set -- $out; eh="$1"; em="$2"
-
-    printf "%s %s %s %s %s %s\n" "$en" "$dow" "$sh" "$sm" "$eh" "$em"
-}
-
-qos_schedule_apply_from_config() {
-    [ -n "$SCHEDULE" ] || SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
-    if out="$(_qs_parse_schedule_var)"; then
-        set -- $out
-        en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
-        if [ "$en" = "1" ]; then
-            _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"
-        else
-            _qs_clear_jobs
-        fi
-    else
-        _qs_clear_jobs
-    fi
-}
-
 _qs_parse_time() {
     local t h m
     t="$(_qs_trim "$1")"
@@ -1250,112 +1206,90 @@ _qs_parse_time() {
     printf '%02d %02d' "$h" "$m"
 }
 
-_qs_now_in_window() {
-    # (sh sm eh em dow)
-    local sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
-    local eh=$(_qs_to_dec "$3"); em=$(_qs_to_dec "$4")
-    local dow="$5" day ok part s e now start end
-    dow="$5"
-
-    # --- precalc the window in minutes
-    start=$(( sh * 60 + sm ))
-    end=$(( eh * 60 + em ))
-
-    # ----- DOW filter -----
-    if [ "$dow" != "*" ]; then
-        day="$(date +%w)"; ok=0
-        IFS=','; for part in $dow; do
-            if echo "$part" | grep -q -- '-'; then
-                s="${part%-*}" ; e="${part#*-}"
-                [ "$day" -ge "$s" ] && [ "$day" -le "$e" ] && { ok=1; break; }
-            else
-                [ "$day" = "$part" ] && { ok=1; break; }
-            fi
-        done; IFS=' '
-        [ "$ok" = 1 ] || return 1
-    fi
-
-    # ---------- 2.  Minute-of-day match ----------
-    now_h=$(_qs_to_dec "$(date +%H)")
-    now_m=$(_qs_to_dec "$(date +%M)")
-    now=$(( now_h * 60 + now_m ))
-
-    if [ "$start" -le "$end" ]; then
-        [ "$now" -ge "$start" ] && [ "$now" -lt "$end" ]
-    else
-        [ "$now" -ge "$start" ] || [ "$now" -lt "$end" ]
-    fi
-}
-
 _qs_valid_dow() {
-  # *, single 0-7, ranges, comma lists (BusyBox crond)
+  # “*”, single 0-7, ranges, comma lists  (BusyBox crond syntax)
   echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
 }
 
-_qs_human_dow() {
-    case "$1" in
-        "*")   printf "every day" ;;
-        "1-5") printf "weekdays (Mon-Fri)" ;;
-        "0,6"| "6,0") printf "weekends (Sat,Sun)" ;;
-        *)     printf "DOW=%s" "$1" ;;
-    esac
-}
-
-_qs_duration_min() {
-    # args: start "MM HH", end "MM HH" → echo minutes from start→end (wraps midnight)
-    set -- $1; sm="$1"; sh="$2"
-    set -- $2; em="$1"; eh="$2"
-
-   # cast each field safely to decimal before arithmetic
-   sh=$(_qs_to_dec "$sh"); sm=$(_qs_to_dec "$sm")
-   eh=$(_qs_to_dec "$eh"); em=$(_qs_to_dec "$em")
-   s=$(( sh * 60 + sm ))
-   e=$(( eh * 60 + em ))
-
-    if [ "$e" -le "$s" ]; then
-        echo $((1440 - (s - e)))
-    else
-        echo $((e - s))
-    fi
+_qs_clear_jobs() {
+    cru l |                       \
+    awk -v on="$QOS_CRON_ON"      \
+        -v off="$QOS_CRON_OFF" '
+        {
+            # job-id is the penultimate “#field#”
+            n = split($0, a, "#")
+            id = a[n-1]
+
+            # match flexqos_qos(on|off) and optional “_NN”
+            if (id ~ ("^" on "(_[0-9]+)?$") || id ~ ("^" off "(_[0-9]+)?$")) {
+                system("cru d " id)
+            }
+        }'
 }
 
-_qs_clear_jobs() {
-    cru d "${QOS_CRON_OFF}" 2>/dev/null
-    cru d "${QOS_CRON_ON}"  2>/dev/null
+_qs_each_record() {
+    [ -z "$SCHEDULE" ] && return
+    printf '%s\n' "$SCHEDULE" | tr '|' '\n' |
+    while read -r rec; do
+        rec="${rec#<}"            # drop leading  '<'
+        rec="${rec%>}"            # drop trailing '>'
+        # split at every '>'
+        en="${rec%%>*}"           ; rest="${rec#*>}"
+        dow="${rest%%>*}"         ; rest="${rest#*>}"
+        st="${rest%%>*}"
+        et=""
+        case "$rest" in
+            *'>'*) et="${rest#*>}" ;;
+        esac
+        printf '%s %s %s %s\n' "$en" "$dow" "$st" "$et"
+    done
 }
 
 _qs_apply_jobs() {
-    # (sh sm eh em dow)
-    local sh="$(_qs_int "$1")" sm="$(_qs_int "$2")"
-    local eh="$(_qs_int "$3")" em="$(_qs_int "$4")"
-    local dow="${5:-*}"
-
     _qs_clear_jobs
-    cru a "${QOS_CRON_ON}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
-    cru a "${QOS_CRON_OFF}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
+    local n=0 sh sm eh em job
+
+    _qs_each_record | while read -r en dow st et; do
+        [ "$en" = "1" ] || continue          # only enabled windows
+
+        # ---------- START ----------
+        if [ -n "$st" ]; then
+            set -- $(_qs_parse_time "$st")
+            sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
+            n=$((n+1)); job="${QOS_CRON_ON}_${n}"
+            cru a "$job" "$(printf '%d %d * * %s %s -qosstart' \
+                            "$sm" "$sh" "$dow" "$SCRIPTPATH")"
+        fi
 
-    # Immediate alignment
-    if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then
-        qos_start
+        # ---------- STOP -----------
+        if [ -n "$et" ]; then
+            set -- $(_qs_parse_time "$et")
+            eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2")
+            n=$((n+1)); job="${QOS_CRON_OFF}_${n}"
+            cru a "$job" "$(printf '%d %d * * %s %s -qosstop' \
+                            "$em" "$eh" "$dow" "$SCRIPTPATH")"
+        fi
+    done
+}
+
+qos_schedule_apply_from_config() {
+    [ -n "$SCHEDULE" ] || SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+    if [ -n "$SCHEDULE" ]; then
+        _qs_apply_jobs
     else
-        qos_stop
+        _qs_clear_jobs
     fi
 }
 
 _qs_show_current() {
-    local lines out en dow sh sm eh em
-    lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})#" || true)"
+    local lines
+    # include optional _NN suffix so numbered jobs are shown
+    lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})(_[0-9]+)?#" || true)"
     if [ -z "$lines" ]; then
         printf "  (none)\n"
     else
         printf "%s\n" "$lines" | sed 's/^/  /'
     fi
-    if [ -n "$SCHEDULE" ]; then
-        if out="$(_qs_parse_schedule_var)"; then
-            set -- $out
-            en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
-        fi
-    fi
 }
 
 # --- interactive flows -----------------------------------------------------
@@ -1374,47 +1308,54 @@ _qs_prompt() {
 }
 
 _qs_guided() {
-    printf "\nConfigure daily QoS window (up to 23h):\n" >&2
+    printf "\nConfigure daily QoS window (up to 23 h):\n" >&2
     printf " - QoS ENABLE at START time, DISABLE at END time.\n" >&2
     printf " - Times: HH or HH:MM (24h).\n\n" >&2
 
-    printf "Days of week:\n  1) Every day (*)\n  2) Weekdays (1-5)\n  3) Weekends (0,6)\n" >&2
+    printf "Days of week:\n  1) Every day (*)\n" >&2
+    printf "  2) Weekdays (1-5)\n  3) Weekends (0,6)\n" >&2
 
-    local sel dow
+    local sel dow sh sm eh em out t
     while :; do
-        sel="$(_qs_prompt "Select DOW (1-3, or e=exit)" "")" || return 1
+        sel="$(_qs_prompt 'Select DOW (1-3, or e=exit)' '')" || return 1
         case "$sel" in
-            e|E|cancel|Cancel) return 1 ;;
-            1) dow="*" ;;
-            2) dow="1-5" ;;
-            3) dow="0,6" ;;
-            *) printf "Invalid selection.\n" >&2; continue ;;
+            e|E|cancel|Cancel)  return 1 ;;
+            1)  dow="*"   ;;
+            2)  dow="1-5" ;;
+            3)  dow="0,6" ;;
+            *)  printf "Invalid selection.\n" >&2; continue ;;
         esac
         break
     done
 
-    local out sh sm eh em t
     while :; do
-      t="$(_qs_prompt "START time to ENABLE QoS" "07:00")" || return 1
-      if out="$(_qs_parse_time "$t")"; then set -- $out; sh="$1"; sm="$2"; break; fi
-      printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
+        t="$(_qs_prompt 'START time to ENABLE QoS' '07:00')" || return 1
+        if out="$(_qs_parse_time "$t")"; then set -- $out; sh=$1; sm=$2; break; fi
+        printf "Invalid time. Use HH or HH:MM.\n" >&2
     done
 
     while :; do
-      t="$(_qs_prompt "END time to DISABLE QoS" "20:00")" || return 1
-      if out="$(_qs_parse_time "$t")"; then set -- $out; eh="$1"; em="$2"; break; fi
-      printf "Invalid time. Use HH or HH:MM (00-23 for hours, 00-59 for minutes).\n" >&2
+        t="$(_qs_prompt 'END time to DISABLE QoS' '20:00')" || return 1
+        if out="$(_qs_parse_time "$t")"; then set -- $out; eh=$1; em=$2; break; fi
+        printf "Invalid time. Use HH or HH:MM.\n" >&2
     done
 
-    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE: %s:%s\n  Days   : %s\n" "$sh" "$sm" "$eh" "$em" "${dow}"
-    t="$(_qs_prompt "Apply this schedule? (y/n)" "y")" || return 1
+    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE: %s:%s\n  Days   : %s\n" \
+           "$sh" "$sm" "$eh" "$em" "$dow" >&2
+    t="$(_qs_prompt 'Apply this schedule? (y/n)' 'y')" || return 1
     case "$t" in
         y|Y)
-            _qs_apply_jobs "$sh" "$sm" "$eh" "$em" "$dow"
-            _qs_settings_set 1 "$dow" "$sh" "$sm" "$eh" "$em"
+            # ── build TWO records ─────────────────────────────────────────
+            local new_sched
+            new_sched="<1>${dow}>$(_qs_hm "$sh" "$sm")>|<1>${dow}>$(_qs_hm "$eh" "$em")>"
+
+            am_settings_set "${SCRIPTNAME}_schedule" "$new_sched"
+            SCHEDULE="$new_sched"
+
+            _qs_apply_jobs
             printf "OK. Schedule applied and saved.\n" >&2
-        ;;
-        *)   printf "Canceled.\n" >&2; return 1 ;;
+            ;;
+        *)  printf "Canceled.\n" >&2 ;;
     esac
 }
 
@@ -1442,8 +1383,10 @@ _qs_custom() {
 
     # Persist to <en>dow>HH:MM>HH:MM if simple DOW-only with fixed HH:MM
     local m1 h1 d1 mo1 w1 m2 h2 d2 mo2 w2 ok
+    set -f
     set -- $on5;  m1="$1"; h1="$2"; d1="$3"; mo1="$4"; w1="$5"
     set -- $off5; m2="$1"; h2="$2"; d2="$3"; mo2="$4"; w2="$5"
+    set +f
     ok=1
     echo "$m1" | grep -Eq '^[0-5]?[0-9]$' || ok=0
     echo "$h1" | grep -Eq '^[0-2]?[0-9]$' || ok=0
@@ -1457,11 +1400,32 @@ _qs_custom() {
     _qs_valid_dow "$w1" || ok=0
 
     if [ "$ok" = "1" ]; then
+        # same-DOW → single record
         m1="$(_qs_to_dec "$m1")"; h1="$(_qs_to_dec "$h1")"
         m2="$(_qs_to_dec "$m2")"; h2="$(_qs_to_dec "$h2")"
-        _qs_settings_set 1 "$w1" "$(printf "%02d" "$h1")" "$(printf "%02d" "$m1")" "$(printf "%02d" "$h2")" "$(printf "%02d" "$m2")"
+        _qs_settings_set 1 "$w1" "$(printf "%02d" "$h1")" "$(printf "%02d" "$m1")" \
+                              "$(printf "%02d" "$h2")" "$(printf "%02d" "$m2")"
     else
-        printf "Note: Custom expressions aren't DOW-only with fixed HH:MM; not persisted to settings file.\n" >&2
+        # different DOW sets → build START-only and/or END-only records
+        new_sched=""
+
+        if [ "$d1" = "*" ] && [ "$mo1" = "*" ] && _qs_valid_dow "$w1"; then
+            m1="$(_qs_to_dec "$m1")"; h1="$(_qs_to_dec "$h1")"
+            new_sched="<1>${w1}>$(_qs_hm "$h1" "$m1")>"
+        fi
+
+        if [ "$d2" = "*" ] && [ "$mo2" = "*" ] && _qs_valid_dow "$w2"; then
+            m2="$(_qs_to_dec "$m2")"; h2="$(_qs_to_dec "$h2")"
+            rec2="<1>${w2}>$(_qs_hm "$h2" "$m2")>"
+            [ -n "$new_sched" ] && new_sched="${new_sched}|${rec2}" || new_sched="${rec2}"
+        fi
+
+        if [ -n "$new_sched" ]; then
+            am_settings_set "${SCRIPTNAME}_schedule" "$new_sched"
+            SCHEDULE="$new_sched"
+        else
+            printf "Note: Custom expressions couldn't be converted to settings format; not persisted.\n" >&2
+        fi
     fi
 }
 

From 0673a97ae3ac4880498afc277974247ab1961e7b Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Fri, 8 Aug 2025 08:58:49 -0400
Subject: [PATCH 13/25] Fix Input Validators and Re-Implement Immediate Trigger
 for Past Due Schedules

Fix Input Validators and Re-Implement Immediate Trigger for Past Due Schedules
---
 flexqos.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index bf2e426..fb6fba1 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1174,6 +1174,17 @@ _qs_to_dec() { printf '%s\n' "${1:-0}" | awk '{print $1+0}'; }
 _qs_hm() {
     printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
 }
+_qs_int() { printf '%d' "$(_qs_to_dec "$1")"; }
+
+_qs_duration_min() {
+    set -- $1;  local sm=$(_qs_int "$1") sh=$(_qs_int "$2")
+    set -- $2;  local em=$(_qs_int "$1") eh=$(_qs_int "$2")
+
+    local s=$(( sh * 60 + sm ))
+    local e=$(( eh * 60 + em ))
+
+    [ "$e" -le "$s" ] && echo $(( 1440 - (s - e) )) || echo $(( e - s ))
+}
 
 _qs_settings_set() {
     # args: enabled(0/1) dow sh sm eh em
@@ -1198,14 +1209,51 @@ _qs_parse_time() {
     m="${t#*:}"           # chars after  first “:”
     [ "$t" = "$h" ] && m="0"   # no “:MM” → default 0
 
-    # SAFE decimal cast – BusyBox ash chokes on “10#…”, so use the
+    # SAFE decimal cast - BusyBox ash chokes on “10#…”, so use the
     # existing helper (_qs_to_dec prints “value+0” via awk)
     h="$(_qs_to_dec "$h")"
     m="$(_qs_to_dec "$m")"
 
+    # ----- range check -----
+    [ "$h" -ge 0 ] && [ "$h" -le 23 ] && \
+    [ "$m" -ge 0 ] && [ "$m" -le 59 ] || return 1
+
     printf '%02d %02d' "$h" "$m"
 }
 
+_qs_now_in_window() {
+    local sh=$(_qs_int "$1") sm=$(_qs_int "$2")
+    local eh=$(_qs_int "$3") em=$(_qs_int "$4")
+    local dow="${5:-*}"
+
+    # -------- 1. DOW match --------
+    if [ "$dow" != "*" ]; then
+        local today="$(date +%w)" ok=0 part s e
+        IFS=','; for part in $dow; do
+            if echo "$part" | grep -q -- '-'; then
+                s="${part%-*}" ; e="${part#*-}"
+                [ "$today" -ge "$s" ] && [ "$today" -le "$e" ] && { ok=1; break; }
+            else
+                [ "$today" = "$part" ] && { ok=1; break; }
+            fi
+        done; IFS=' '
+        [ "$ok" = 1 ] || return 1            # not a matching day
+    fi
+
+    # -------- 2. Minute-of-day match --------
+    local now_h=$(_qs_int "$(date +%H)")
+    local now_m=$(_qs_int "$(date +%M)")
+    local now=$(( now_h * 60 + now_m ))
+    local start=$(( sh * 60 + sm ))
+    local end=$(( eh * 60 + em ))
+
+    if [ "$start" -le "$end" ]; then
+        [ "$now" -ge "$start" ] && [ "$now" -lt "$end" ]
+    else                                # window crosses midnight
+        [ "$now" -ge "$start" ] || [ "$now" -lt "$end" ]
+    fi
+}
+
 _qs_valid_dow() {
   # “*”, single 0-7, ranges, comma lists  (BusyBox crond syntax)
   echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
@@ -1248,8 +1296,10 @@ _qs_each_record() {
 _qs_apply_jobs() {
     _qs_clear_jobs
     local n=0 sh sm eh em job
+    local aligned=0
 
-    _qs_each_record | while read -r en dow st et; do
+    # read records without spawning a subshell so we can update “aligned”
+    while read -r en dow st et; do
         [ "$en" = "1" ] || continue          # only enabled windows
 
         # ---------- START ----------
@@ -1269,7 +1319,15 @@ _qs_apply_jobs() {
             cru a "$job" "$(printf '%d %d * * %s %s -qosstop' \
                             "$em" "$eh" "$dow" "$SCRIPTPATH")"
         fi
-    done
+        # ---------- Immediate alignment ----------
+        if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then
+            aligned=1
+        fi
+    done <<EOF
+$(_qs_each_record)
+EOF
+
+    [ "$aligned" = 1 ] && qos_start || qos_stop
 }
 
 qos_schedule_apply_from_config() {
@@ -1330,14 +1388,18 @@ _qs_guided() {
 
     while :; do
         t="$(_qs_prompt 'START time to ENABLE QoS' '07:00')" || return 1
-        if out="$(_qs_parse_time "$t")"; then set -- $out; sh=$1; sm=$2; break; fi
-        printf "Invalid time. Use HH or HH:MM.\n" >&2
+        if out="$(_qs_parse_time "$t")"; then
+            set -- $out; sh=$1; sm=$2; break
+        fi
+        printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
     done
 
     while :; do
         t="$(_qs_prompt 'END time to DISABLE QoS' '20:00')" || return 1
-        if out="$(_qs_parse_time "$t")"; then set -- $out; eh=$1; em=$2; break; fi
-        printf "Invalid time. Use HH or HH:MM.\n" >&2
+        if out="$(_qs_parse_time "$t")"; then
+            set -- $out; eh=$1; em=$2; break
+        fi
+        printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
     done
 
     printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE: %s:%s\n  Days   : %s\n" \

From a6116a1168c45bfcad8711de6e74e0c2ee2a2532 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Fri, 8 Aug 2025 09:05:50 -0400
Subject: [PATCH 14/25] Cleanup

Cleanup
---
 flexqos.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index fb6fba1..ba6c8a9 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1530,11 +1530,6 @@ menu() {
 	clear
 	sed -n '2,10p' "${0}"		# display banner
 	scriptinfo
-    if [ "$(nvram get qos_enable)" = "1" ]; then
-        qos_action="stop"     # show “stop” if QoS is running
-    else
-        qos_action="start"    # show “start” if QoS is stopped
-    fi
 	printf "  (1) about        explain functionality\n"
 	printf "  (2) update       check for updates\n"
 	printf "  (3) debug        traffic control parameters\n"

From b071d9f93cf1d5a98cafa33037a0d751fd164ce7 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Sun, 10 Aug 2025 11:29:37 -0400
Subject: [PATCH 15/25] Restart Firewall and Flush Conntrack

Restart Firewall and Flush Conntrack
---
 flexqos.sh | 86 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index ba6c8a9..184b2ae 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1091,6 +1091,46 @@ update() {
 	exit
 } # update
 
+_flush_conntrack_{
+	if ! validate_iptables_rules; then
+		write_iptables_rules
+		iptables_static_rules 2>&1 | logger -t "${SCRIPTNAME_DISPLAY}"
+		if [ -s "/tmp/${SCRIPTNAME}_iprules" ]; then
+			logmsg "Applying iptables custom rules"
+			. "/tmp/${SCRIPTNAME}_iprules" 2>&1 | logger -t "${SCRIPTNAME_DISPLAY}"
+			if [ "$(am_settings_get "${SCRIPTNAME}"_conntrack)" != "0" ]; then
+				# Flush conntrack table so that existing connections will be processed by new iptables rules
+				logmsg "Flushing conntrack table"
+				/usr/sbin/conntrack -F conntrack >/dev/null 2>&1
+			fi
+		fi
+	fi
+}
+
+prompt_restart() {
+	# Restart QoS so that FlexQoS changes can take effect.
+	# Possible values for $needrestart:
+	#  0: No restart needed (initialized in main)
+	#  1: Restart needed, but prompt user if interactive session
+	#  2: Restart needed, do not prompt (force)
+	local yn
+	if [ "${needrestart}" -gt "0" ]; then
+		if [ "${mode}" = "interactive" ]; then
+			if [ "${needrestart}" = "1" ]; then
+				printf "\nWould you like to restart QoS for modifications to take effect? [1=Yes 2=No]: "
+				read -r yn
+				if [ "${yn}" = "2" ]; then
+					needrestart=0
+					return
+				fi
+			fi
+		fi
+		printf "Restarting QoS and firewall...\n"
+		service "restart_qos;restart_firewall"
+		needrestart=0
+	fi
+} # prompt_restart
+
 qos_stop() {
     # Stop Adaptive QoS cleanly (runtime only; no flash writes by default)
     local cur_enable need_stop
@@ -1105,6 +1145,8 @@ qos_stop() {
 
     if [ "${need_stop}" = "1" ]; then
         service stop_qos
+        prompt_restart
+        _flush_conntrack_
         # Only persist if explicitly requested
         logmsg "Adaptive QoS stopped."
     else
@@ -1131,6 +1173,8 @@ qos_start() {
 
     if [ "${need_start}" = "1" ]; then
         service start_qos
+        prompt_restart
+        _flush_conntrack_
         # Only persist if explicitly requested
         logmsg "Adaptive QoS started."
     else
@@ -1138,30 +1182,6 @@ qos_start() {
     fi
 }
 
-prompt_restart() {
-	# Restart QoS so that FlexQoS changes can take effect.
-	# Possible values for $needrestart:
-	#  0: No restart needed (initialized in main)
-	#  1: Restart needed, but prompt user if interactive session
-	#  2: Restart needed, do not prompt (force)
-	local yn
-	if [ "${needrestart}" -gt "0" ]; then
-		if [ "${mode}" = "interactive" ]; then
-			if [ "${needrestart}" = "1" ]; then
-				printf "\nWould you like to restart QoS for modifications to take effect? [1=Yes 2=No]: "
-				read -r yn
-				if [ "${yn}" = "2" ]; then
-					needrestart=0
-					return
-				fi
-			fi
-		fi
-		printf "Restarting QoS and firewall...\n"
-		service "restart_qos;restart_firewall"
-		needrestart=0
-	fi
-} # prompt_restart
-
 ##### QoS Disable Window Scheduler (guided + custom) ###########################
 
 QOS_CRON_OFF="${SCRIPTNAME}_qosoff"
@@ -1171,9 +1191,7 @@ SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
 # --- helpers ---------------------------------------------------------------
 _qs_trim() { printf "%s" "$1" | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' | tr -d '\r'; }
 _qs_to_dec() { printf '%s\n' "${1:-0}" | awk '{print $1+0}'; }
-_qs_hm() {
-    printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"
-}
+_qs_hm() { printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"; }
 _qs_int() { printf '%d' "$(_qs_to_dec "$1")"; }
 
 _qs_duration_min() {
@@ -2128,19 +2146,7 @@ startup() {
 		;;
 	esac
 
-	if ! validate_iptables_rules; then
-		write_iptables_rules
-		iptables_static_rules 2>&1 | logger -t "${SCRIPTNAME_DISPLAY}"
-		if [ -s "/tmp/${SCRIPTNAME}_iprules" ]; then
-			logmsg "Applying iptables custom rules"
-			. "/tmp/${SCRIPTNAME}_iprules" 2>&1 | logger -t "${SCRIPTNAME_DISPLAY}"
-			if [ "$(am_settings_get "${SCRIPTNAME}"_conntrack)" != "0" ]; then
-				# Flush conntrack table so that existing connections will be processed by new iptables rules
-				logmsg "Flushing conntrack table"
-				/usr/sbin/conntrack -F conntrack >/dev/null 2>&1
-			fi
-		fi
-	fi
+	_flush_conntrack_
 
 	cru d "${SCRIPTNAME}"_5min 2>/dev/null
 	sleepdelay=0

From 64e8ba842d883222d4dbc9bb9b765ed72fed7861 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 16:57:48 +0000
Subject: [PATCH 16/25] Bump actions/checkout from 4.2.2 to 4.3.0 in the
 all-actions group

Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 4.2.2 to 4.3.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.2.2...v4.3.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Create-NewReleases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml
index fc8f9bf..9fe455a 100644
--- a/.github/workflows/Create-NewReleases.yml
+++ b/.github/workflows/Create-NewReleases.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       # 1--- Check out master so we tag the exact merge commit
       - name: Checkout source code
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.3.0
         with:
           fetch-depth: 0
           ref: 'master'

From 1a253c83fe39ab7bf7d48fd27fb13b3e38548a08 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Fri, 15 Aug 2025 09:04:43 -0400
Subject: [PATCH 17/25] Allow Multiple Schedules

Allow Multiple Schedules
---
 flexqos.asp | 398 ++++++++++++++++++++++++++++------------------------
 flexqos.sh  | 336 ++++++++++++++++++++++----------------------
 2 files changed, 383 insertions(+), 351 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index f1d946c..62bc4b4 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -557,46 +557,16 @@ function draw_conntrack_table() {
 	updateTable();
 }
 
-// ---- SCHEDULER UI ----
+// ---- SCHEDULER UI (AppDB-like add/edit/remove) ----
 var SCHED_DAYS = ["Su","Mo","Tu","We","Th","Fr","Sa"];
-
-// One source of truth for UI defaults
 var SCHED_DEFAULT = { days:[1,2,3,4,5], start:"07:00", end:"20:00" };
+var SCHED_MAX = 6;
 
-// Fallback if inputs are blank (used when reading the form)
-var SCHED_INPUT_FALLBACK = { start:"07:00", end:"20:00" };
-
-// Build a <tr> for one schedule window
-function schedRowHtml(win, idx){
-  win = Object.assign({}, SCHED_DEFAULT, win || {});
-  var daysHtml = "";
-  for (var d = 0; d < 7; d++){
-    var checked = (win.days.indexOf(d) >= 0) ? "checked" : "";
-    daysHtml += '<label class="sched-day"><input type="checkbox" class="sched-daycb" data-day="'+d+'" '+checked+'> '+SCHED_DAYS[d]+'</label>';
-  }
-
-  /* keep four visible cells so columns stay aligned            *
-   * – row-0 shows only Start                                  *
-   * – row-1 shows only End                                    */
-  var startCell, endCell;
-  if (idx === 0){                    /* Start row */
-      startCell = '<td><input type="time" class="sched-time sched-start" value="'+win.start+'"></td>';
-      /* blank cell but keep hidden value for serializer */
-      endCell   = '<td>&nbsp;<input type="hidden" class="sched-time sched-end" value="'+win.end+'"></td>';
-  }else{                             /* End row   */
-      /* blank cell but keep hidden value for serializer */
-      startCell = '<td>&nbsp;<input type="hidden" class="sched-time sched-start" value="'+win.start+'"></td>';
-      endCell   = '<td><input type="time" class="sched-time sched-end" value="'+win.end+'"></td>';
-  }
+// Internal array of windows: [{days:[0-6], start:"HH:MM", end:"HH:MM"}]
+var SCHED = [];
 
-  /* the last <td> kept only for layout — no minus button */
-  return (
-    '<tr data-row="'+idx+'">' +
-      '<td>'+ daysHtml +'</td>' +
-      startCell + endCell +
-    '</tr>'
-  );
-}
+// ---------- helpers ----------
+function _sched_trim(s){ return (s||"").toString().trim(); }
 
 function parseDaysSpec(spec){
   if (typeof spec !== "string") return [];
@@ -627,159 +597,188 @@ function stringifyDays(days){
   var uniq = Array.from(new Set((days||[]).map(function(n){ return parseInt(n,10); })))
                    .filter(function(n){ return n >= 0 && n <= 6; })
                    .sort(function(a,b){ return a - b; });
-  return (uniq.length === 7) ? "0-6" : uniq.join(",");
+  if (uniq.length === 7) return "0-6";
+  return uniq.join(",");
 }
 
-function schedParse(str){
-  if (typeof str !== "string" || !str.trim()) return null;
-
-  const p = str.replace(/^</,"").replace(/>$/,"").split(">");  // drop wrappers
-  if (p.length < 3 || p.length > 4) return null;               // guard rails
-
-  const obj = {
-    enabled : (p[0] === "1"),
-    days    : parseDaysSpec(p[1])
-  };
-
-  if (p.length === 3){                 // <1>{days}{time}
-    // Decide whether this is a start-only or end-only record
-    // We treat 00:00 or blank on purpose as “start”.
-    obj.start = p[2];
-  }else{                               // <1>{days}{start}{end}
-    obj.start = p[2];
-    obj.end   = p[3];
-  }
-  return obj;
+function labelDays(days){
+  var a = (days||[]).slice().sort(function(x,y){return x-y;});
+  var all = "Every day", wk = [1,2,3,4,5].toString(), we = [0,6].toString();
+  if (a.length === 7) return all;
+  if (a.toString() === wk) return "Weekdays (Mo–Fr)";
+  if (a.toString() === we) return "Weekends (Su,Sa)";
+  return a.map(function(d){ return SCHED_DAYS[d]; }).join(", ");
 }
 
-function schedStringify(o){
-  const enabled = o.enabled ? "1" : "0";
-  const days    = stringifyDays(o.days || []);
-
-  const parts = [enabled, days];          // always these two
-
-  if (o.hasOwnProperty("start")) parts.push(o.start || "");
-  if (o.hasOwnProperty("end"))   parts.push(o.end   || "");
-
-  return "<" + parts.join(">") + ">";
+function timeValid(hm){
+  return /^[0-2]\d:[0-5]\d$/.test(hm) && parseInt(hm.substr(0,2),10) < 24;
 }
 
-function schedAddRow(win){
-   var tbody = document.getElementById("sched_tbody");
-
-   /* two rows (Start & End) are already present → nothing to add */
-   /* stop somewhere sensible – six windows = 12 rows */
-   if (tbody.children.length >= 12) return;
-
-   var idx   = tbody.children.length;
-   var tmp   = document.createElement("tbody");
-   tmp.innerHTML = schedRowHtml(win, idx);
-   tbody.appendChild(tmp.firstElementChild);
-
-  /* The old “+” button is gone; guard against null */
-  if (tbody.children.length >= 2){
-    var plus = document.getElementById("sched_add_btn");
-    if (plus) plus.disabled = true;
+// Parse one record string (“<1>DOW>HH:MM>HH:MM” or 3-part)
+function schedParse(str){
+  if (typeof str !== "string" || !str.trim()) return null;
+  var s = str.replace(/^</,"").replace(/>$/,"").split(">");
+  if (s.length < 3 || s.length > 4) return null;
+  var en = (s[0] === "1");
+  var days = parseDaysSpec(s[1]);
+  var o = { enabled: en, days: days };
+  if (s.length === 4){ o.start = s[2]; o.end = s[3]; }
+  else { // 3-part, treat as start-only (“start” OR “end”)
+    // Decide by position we saved in the past; to be safe, accept either:
+    if (timeValid(s[2])) o.start = s[2]; else o.end = s[2];
   }
+  return o;
 }
 
-function schedReadRow(tr){
-  var days = [];
-  tr.querySelectorAll(".sched-daycb").forEach(function(cb){
-    if (cb.checked) days.push(parseInt(cb.getAttribute("data-day"),10));
-  });
-  var start = tr.querySelector(".sched-start").value || SCHED_FALLBACK.start;
-  var end   = tr.querySelector(".sched-end").value   || SCHED_FALLBACK.end;
-  return { days:days, start:start, end:end, enabled:true };
+// Stringify one full window record
+function schedStringify(win){
+  return "<1>" + stringifyDays(win.days) + ">" + (win.start||"") + ">" + (win.end||"");
 }
 
-function timeToMinutes(hm){
-  var s = hm.split(":"); return parseInt(s[0],10)*60 + parseInt(s[1],10);
+// ---------- UI readers/writers ----------
+function sched_read_add_form(){
+  var days = [];
+  for (var d = 0; d <= 6; d++)
+    if (document.getElementById("sched_new_day_"+d).checked) days.push(d);
+
+  var start = _sched_trim(document.getElementById("sched_new_start").value || "07:00");
+  var end   = _sched_trim(document.getElementById("sched_new_end").value   || "20:00");
+
+  return { days: days, start: start, end: end };
+}
+
+function sched_clear_add_form(){
+  // don’t reset times (nice UX); just clear days
+  for (var d = 0; d <= 6; d++)
+    document.getElementById("sched_new_day_"+d).checked = false;
+}
+
+// ---------- CRUD ----------
+function sched_add_window(){
+  if (SCHED.length >= SCHED_MAX) { alert("This table only allows " + SCHED_MAX + " items!"); return; }
+
+  var win = sched_read_add_form();
+  if (!win.days.length) { alert("Please select at least one day."); return; }
+  if (!timeValid(win.start) || !timeValid(win.end)) { alert("Please enter valid HH:MM times."); return; }
+
+  SCHED.push(win);
+  sched_render_rules();
+  sched_clear_add_form();
+}
+
+function sched_remove_row(btn){
+  var i = btn.parentNode.parentNode.rowIndex; // header is row 0
+  // Adjust because we render into an inner table; resolve index robustly:
+  var tr = btn.closest("tr");
+  var idx = parseInt(tr.getAttribute("data-idx"), 10);
+  if (!isNaN(idx)) { SCHED.splice(idx,1); sched_render_rules(); }
+}
+
+function sched_edit_row(btn){
+  var tr  = btn.closest("tr");
+  var idx = parseInt(tr.getAttribute("data-idx"), 10);
+  if (isNaN(idx)) return;
+  var win = SCHED[idx];
+
+  // Fill the “add row” with values
+  for (var d = 0; d <= 6; d++)
+    document.getElementById("sched_new_day_"+d).checked = (win.days.indexOf(d) >= 0);
+  document.getElementById("sched_new_start").value = win.start;
+  document.getElementById("sched_new_end").value   = win.end;
+
+  // Remove current row (same as AppDB edit UX)
+  SCHED.splice(idx,1);
+  sched_render_rules();
+}
+
+// ---------- rendering ----------
+function sched_render_rules(){
+  var code = '<table width="100%" border="1" cellspacing="0" cellpadding="4" class="list_table" id="sched_rulelist_table">';
+  if (!SCHED.length){
+    code += '<tr><td style="color:#FFCC00;" colspan="4">No schedules defined</td></tr>';
+  }else{
+    for (var i=0; i<SCHED.length; i++){
+      var w = SCHED[i];
+      code += '<tr data-idx="'+i+'">';
+      code +=   '<td width="50%">'+ labelDays(w.days) +'</td>';
+      code +=   '<td width="16%">'+ w.start +'</td>';
+      code +=   '<td width="16%">'+ w.end   +'</td>';
+      code +=   '<td width="18%"><input class="edit_btn"   onclick="sched_edit_row(this);" value=""/>';
+      code +=                     '<input class="remove_btn" onclick="sched_remove_row(this);" value=""/></td>';
+      code += '</tr>';
+    }
+  }
+  code += '</table>';
+  document.getElementById("sched_rules_block").innerHTML = code;
 }
 
-// Validate all rows; returns {ok:boolean, windows:[...]}
-function schedSerialize () {
-  const rows = document.querySelectorAll("#sched_tbody tr");
-  if (rows.length % 2 !== 0){
-    return { ok:false, err:"Start/End rows must be in pairs", str:"" };
-  }
+// ---------- enable/seed ----------
+function schedToggleUI(){
+  var cb    = document.getElementById("sched_enabled");
+  var block = document.getElementById("sched_block");
+  if (!cb || !block) return;             // guards
 
-  const blocks = [];
+  block.style.display = cb.checked ? "" : "none";
 
-  for (let i = 0; i < rows.length; i += 2){
-    const s = schedReadRow(rows[i]);       // start-row
-    const e = schedReadRow(rows[i+1]);     // end-row
+  // Auto-seed a default entry only for the new AppDB-style UI
+  if (cb.checked){
+    if (typeof SCHED !== "undefined" &&
+        Array.isArray(SCHED) &&
+        SCHED.length === 0 &&
+        !( (custom_settings.flexqos_schedule || "").trim() ) ) {
 
-    if (!s.days.length || !e.days.length){
-      return { ok:false,
-               err:"Each window needs days ticked on BOTH rows",
-               str:"" };
+      SCHED.push({ days:[1,2,3,4,5], start:"07:00", end:"20:00" });
+      if (typeof sched_render_rules === "function") sched_render_rules();
     }
-
-    blocks.push( schedStringify({
-      enabled : true,
-      days    : s.days,
-      start   : s.start          // end intentionally omitted
-    }));
-
-    blocks.push( schedStringify({
-      enabled : true,
-      days    : e.days,
-      end     : e.end            // start intentionally omitted
-    }));
   }
-
-  return { ok:true, err:"", str:blocks.join("|") };
 }
 
-// Show/Hide block on toggle
-function schedToggleUI(){
-  const on = document.getElementById("sched_enabled").checked;
-  document.getElementById("sched_block").style.display = on ? "" : "none";
-
-  /* —---- Auto-seed one default window (Mo-Fr 07:00-20:00) ----- */
-  if (on &&
-      !document.getElementById("sched_tbody").children.length &&
-      !(custom_settings.flexqos_schedule || "").trim()            // <-- new
-  ){
-      // row 0  → Start   (07:00)
-      schedAddRow({ days:[1,2,3,4,5], start:"07:00" });
-      // row 1  → End     (20:00)
-      schedAddRow({ days:[1,2,3,4,5], end  :"20:00" });
-  }
+function schedInitOnce(){
+  var cb = document.getElementById("sched_enabled");
+  if (cb) cb.addEventListener("change", schedToggleUI);
 }
 
-// Populate UI from custom_settings.flexqos_schedule
+// Load from saved settings into SCHED and render
 function schedPopulateFromSettings(){
-  const raw = (custom_settings.flexqos_schedule || "").trim();
-  if (!raw) return;                       // nothing stored yet
-
-  document.getElementById("sched_enabled").checked = true;
-  schedToggleUI();
-
-  raw.split("|").forEach(part => {
-    const win = schedParse(part);
-    if (!win) return;
+  SCHED = [];
+  var raw = _sched_trim(custom_settings.flexqos_schedule || "");
+  if (raw){
+    // Accept both 4-part windows and old paired 3-part records
+    var parts = raw.split("|");
+    var pairmap = Object.create(null); // key: days-spec → {start?, end?}
+    parts.forEach(function(p){
+      var rec = schedParse(p);
+      if (!rec || !rec.enabled) return;
+      var key = stringifyDays(rec.days);
+      if (rec.start && rec.end){
+        SCHED.push({days:rec.days, start:rec.start, end:rec.end});
+      }else{
+        pairmap[key] = pairmap[key] || {days:rec.days};
+        if (rec.start) pairmap[key].start = rec.start;
+        if (rec.end)   pairmap[key].end   = rec.end;
+      }
+    });
+    Object.keys(pairmap).forEach(function(k){
+      var r = pairmap[k];
+      if (r.start || r.end){
+        SCHED.push({days:r.days, start:r.start || "00:00", end:r.end || "00:00"});
+      }
+    });
 
-    /* decide which cell (Start / End) this record belongs to */
-    if (win.start && !win.end){
-      schedAddRow({ days:win.days, start:win.start });
-    }else if (win.end && !win.start){
-      schedAddRow({ days:win.days, end:win.end   });
-    }else{
-      /* a fully-specified record: show both halves */
-      schedAddRow({ days:win.days, start:win.start });
-      schedAddRow({ days:win.days, end  :win.end   });
-    }
-  });
+    document.getElementById("sched_enabled").checked = true;
+    schedToggleUI();
+  }
+  sched_render_rules();
 }
 
-// Wire events once
-function schedInitOnce(){
-  var cb = document.getElementById("sched_enabled");
-  if (cb) cb.addEventListener("change", schedToggleUI);
-  /* no extra rows → hide the “add” button altogether */
-  // leave the button visible – every click adds another Start/End pair
+// Serialize SCHED for saving
+function schedSerialize(){
+  if (!SCHED.length) return "";
+  var out = [];
+  for (var i=0;i<SCHED.length;i++){
+    out.push( schedStringify(SCHED[i]) );
+  }
+  return out.join("|");
 }
 
 function setsort(newfield) {
@@ -2525,11 +2524,11 @@ function FlexQoS_mod_apply() {
 
 	// ---- Save schedule ----
 	if (document.getElementById('sched_enabled').checked){
-		var ser = schedSerialize();
-		if (!ser.ok){ alert("Schedule error: " + ser.err); return; }
-		custom_settings.flexqos_schedule = ser.str;     // pipe-separated list
+  		var ser = schedSerialize(); // returns pipe-separated "<1>DOW>HH:MM>HH:MM"
+  		if (!ser){ alert("No schedules defined."); return; }
+  		custom_settings.flexqos_schedule = ser;
 	}else{
-		delete custom_settings.flexqos_schedule;
+  		delete custom_settings.flexqos_schedule;
 	}
 	if (iptables_rulelist_array.length > 2999) {
 		alert("Total iptables rules exceeds 2999 bytes! Please delete or consolidate!");
@@ -3076,24 +3075,53 @@ function DelCookie(cookiename){
 		</td>
 	</tr>
 	<tr>
-  		<th>Schedule</th>
-  		<td>
-    		<label>
-      		<input type="checkbox" id="sched_enabled"> Enable
-    		</label>
-    		<div id="sched_block" style="margin-top:8px; display:none;">
-      		<table width="100%" border="1" cellspacing="0" cellpadding="4" class="FormTable_table">
-        		<thead>
-          		<tr>
-            		<th style="width:50%;">Days</th>
-            		<th style="width:25%;">Start</th>
-            		<th style="width:25%;">End</th>
-          		</tr>
-        		</thead>
-        		<tbody id="sched_tbody"></tbody>
-      		</table>
-    		</div>
-  		</td>
+  	<th>Schedule</th>
+  	<td>
+    	<label>
+      	<input type="checkbox" id="sched_enabled"> Enable
+    	</label>
+
+    	<div id="sched_block" style="margin-top:8px; display:none;">
+
+      	<!-- Add Row -->
+      	<table width="100%" border="1" cellspacing="0" cellpadding="4" class="FormTable_table">
+        	<thead>
+          	<tr>
+            	<td colspan="4">Schedules&nbsp;(Max Limit : 6)</td>
+          	</tr>
+        	</thead>
+        	<tbody>
+          	<tr>
+            	<th width="50%">Days</th>
+            	<th width="16%">Start</th>
+            	<th width="16%">End</th>
+            	<th width="18%">Edit</th>
+          	</tr>
+          	<tr>
+            	<td>
+              	<div class="sched-day">
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_0"> Su</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_1"> Mo</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_2"> Tu</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_3"> We</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_4"> Th</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_5"> Fr</label>
+                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_6"> Sa</label>
+              	</div>
+            	</td>
+            	<td><input id="sched_new_start" type="time" class="input_6_table" value="07:00"></td>
+            	<td><input id="sched_new_end"   type="time" class="input_6_table" value="20:00"></td>
+            	<td>
+              	<div><input type="button" id="sched_add_btn" class="add_btn" onclick="sched_add_window();" value=""></div>
+            	</td>
+          	</tr>
+        	</tbody>
+      	</table>
+
+      	<!-- Existing windows list -->
+      	<div id="sched_rules_block" style="margin-top:8px;"></div>
+    	</div>
+  	</td>
 	</tr>
 	<tr>
 		<th><a class="hintstyle" href="javascript:void(0);" onClick="openHint('FlexQoS',4);">Router/VPN Client Outbound Traffic Class</th>
diff --git a/flexqos.sh b/flexqos.sh
index 184b2ae..7bd9794 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1091,7 +1091,7 @@ update() {
 	exit
 } # update
 
-_flush_conntrack_{
+_flush_conntrack_(){
 	if ! validate_iptables_rules; then
 		write_iptables_rules
 		iptables_static_rules 2>&1 | logger -t "${SCRIPTNAME_DISPLAY}"
@@ -1204,13 +1204,22 @@ _qs_duration_min() {
     [ "$e" -le "$s" ] && echo $(( 1440 - (s - e) )) || echo $(( e - s ))
 }
 
-_qs_settings_set() {
-    # args: enabled(0/1) dow sh sm eh em
-    local en dow sh sm eh em line
-    en="$1"; dow="$2"; sh="$3"; sm="$4"; eh="$5"; em="$6"
-    line="<${en}>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
-    am_settings_set "${SCRIPTNAME}"_schedule "$line"
-    SCHEDULE="$line"
+_qs_settings_set_all() {
+	# Replace all records with the provided string (properly formed)
+	SCHEDULE="$1"
+	am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
+}
+
+_qs_settings_append() {
+	# args: enabled dow sh sm eh em  → append as a new record
+	local en="$1" dow="$2" sh="$3" sm="$4" eh="$5" em="$6" rec
+	rec="<${en}>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
+	if [ -n "$SCHEDULE" ]; then
+		SCHEDULE="${SCHEDULE}|${rec}"
+	else
+		SCHEDULE="${rec}"
+	fi
+	am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
 }
 
 _qs_settings_delete() {
@@ -1227,7 +1236,6 @@ _qs_parse_time() {
     m="${t#*:}"           # chars after  first “:”
     [ "$t" = "$h" ] && m="0"   # no “:MM” → default 0
 
-    # SAFE decimal cast - BusyBox ash chokes on “10#…”, so use the
     # existing helper (_qs_to_dec prints “value+0” via awk)
     h="$(_qs_to_dec "$h")"
     m="$(_qs_to_dec "$m")"
@@ -1252,8 +1260,10 @@ _qs_now_in_window() {
                 s="${part%-*}" ; e="${part#*-}"
                 [ "$today" -ge "$s" ] && [ "$today" -le "$e" ] && { ok=1; break; }
             else
-                [ "$today" = "$part" ] && { ok=1; break; }
-            fi
+				# treat 7 as 0 for Sunday
+				[ "$part" = "7" ] && part="0"
+				[ "$today" = "$part" ] && { ok=1; break; }
+			fi
         done; IFS=' '
         [ "$ok" = 1 ] || return 1            # not a matching day
     fi
@@ -1273,8 +1283,8 @@ _qs_now_in_window() {
 }
 
 _qs_valid_dow() {
-  # “*”, single 0-7, ranges, comma lists  (BusyBox crond syntax)
-  echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
+	# “*”, single 0-7 (0/7=Sun), ranges, comma lists
+	echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
 }
 
 _qs_clear_jobs() {
@@ -1313,31 +1323,47 @@ _qs_each_record() {
 
 _qs_apply_jobs() {
     _qs_clear_jobs
-    local n=0 sh sm eh em job
+    local n=0
     local aligned=0
 
-    # read records without spawning a subshell so we can update “aligned”
+    # process each record independently
     while read -r en dow st et; do
         [ "$en" = "1" ] || continue          # only enabled windows
 
-        # ---------- START ----------
+        # ---- parse times for THIS record safely ----
+        local sh sm eh em out ok=1
+
         if [ -n "$st" ]; then
-            set -- $(_qs_parse_time "$st")
-            sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
-            n=$((n+1)); job="${QOS_CRON_ON}_${n}"
-            cru a "$job" "$(printf '%d %d * * %s %s -qosstart' \
-                            "$sm" "$sh" "$dow" "$SCRIPTPATH")"
+            out="$(_qs_parse_time "$st")" || out=""
+            if [ -n "$out" ]; then
+                set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
+            else
+                ok=0
+            fi
+        else
+            ok=0
         fi
 
-        # ---------- STOP -----------
         if [ -n "$et" ]; then
-            set -- $(_qs_parse_time "$et")
-            eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2")
-            n=$((n+1)); job="${QOS_CRON_OFF}_${n}"
-            cru a "$job" "$(printf '%d %d * * %s %s -qosstop' \
-                            "$em" "$eh" "$dow" "$SCRIPTPATH")"
+            out="$(_qs_parse_time "$et")" || out=""
+            if [ -n "$out" ]; then
+                set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2")
+            else
+                ok=0
+            fi
+        else
+            ok=0
         fi
-        # ---------- Immediate alignment ----------
+
+        [ "$ok" = "1" ] || continue
+
+        # ---- schedule cron jobs ----
+        n=$((n+1))
+        cru a "${QOS_CRON_ON}_${n}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
+        n=$((n+1))
+        cru a "${QOS_CRON_OFF}_${n}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
+
+        # ---- alignment for THIS record ----
         if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then
             aligned=1
         fi
@@ -1345,6 +1371,7 @@ _qs_apply_jobs() {
 $(_qs_each_record)
 EOF
 
+    # If ANY window is currently active → QoS ON; otherwise OFF
     [ "$aligned" = 1 ] && qos_start || qos_stop
 }
 
@@ -1383,162 +1410,139 @@ _qs_prompt() {
     done
 }
 
-_qs_guided() {
-    printf "\nConfigure daily QoS window (up to 23 h):\n" >&2
-    printf " - QoS ENABLE at START time, DISABLE at END time.\n" >&2
-    printf " - Times: HH or HH:MM (24h).\n\n" >&2
+_qs_prompt_count() {
+	# Ask how many schedules to create (1..6 default 2)
+	local c
+	while :; do
+		c="$(_qs_prompt 'How many schedules would you like to create? (1-6)' '2')" || return 1
+		c="$(_qs_to_dec "$c")"
+		if [ "$c" -ge 1 ] && [ "$c" -le 6 ]; then
+			printf "%d" "$c"
+			return 0
+		fi
+		printf "Please enter a number between 1 and 6.\n" >&2
+	done
+}
 
-    printf "Days of week:\n  1) Every day (*)\n" >&2
-    printf "  2) Weekdays (1-5)\n  3) Weekends (0,6)\n" >&2
+_qs_prompt_dow() {
+	# Returns a valid DOW expression in stdout
+	printf "\nDays of week for this schedule:\n" >&2
+	printf "  1) Every day (*)\n" >&2
+	printf "  2) Weekdays (1-5)\n" >&2
+	printf "  3) Weekends (0,6)\n" >&2
+	printf "  4) Custom (e.g., 1,3,5 or 0-2 or *)\n" >&2
+	local sel dow
+	while :; do
+		sel="$(_qs_prompt 'Select option (1-4, or e=exit)' '')" || return 1
+		case "$sel" in
+			e|E|cancel|Cancel)  return 1 ;;
+			1)  dow="*" ;;
+			2)  dow="1-5" ;;
+			3)  dow="0,6" ;;
+			4)
+				while :; do
+					dow="$(_qs_prompt 'Enter DOW (Day of Week)' '*')" || return 1
+					_qs_valid_dow "$dow" && break
+					printf "Invalid DOW; try again.\n" >&2
+				done
+				;;
+			*)  printf "Invalid selection.\n" >&2; continue ;;
+		esac
+		printf "%s" "$dow"
+		return 0
+	done
+}
 
-    local sel dow sh sm eh em out t
-    while :; do
-        sel="$(_qs_prompt 'Select DOW (1-3, or e=exit)' '')" || return 1
-        case "$sel" in
-            e|E|cancel|Cancel)  return 1 ;;
-            1)  dow="*"   ;;
-            2)  dow="1-5" ;;
-            3)  dow="0,6" ;;
-            *)  printf "Invalid selection.\n" >&2; continue ;;
-        esac
-        break
-    done
+_qs_guided_multi() {
+    printf "\nGuided setup: create schedules\n" >&2
+    printf " - QoS ENABLE at START time, DISABLE at END time for each schedule.\n" >&2
+    printf " - Times accept HH or HH:MM (24h).\n\n" >&2
 
-    while :; do
-        t="$(_qs_prompt 'START time to ENABLE QoS' '07:00')" || return 1
-        if out="$(_qs_parse_time "$t")"; then
-            set -- $out; sh=$1; sm=$2; break
-        fi
-        printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
-    done
+    local count i dow sh sm eh em out t new_sched=""
+    local def_start="07:00" def_end="20:00"
 
-    while :; do
-        t="$(_qs_prompt 'END time to DISABLE QoS' '20:00')" || return 1
-        if out="$(_qs_parse_time "$t")"; then
-            set -- $out; eh=$1; em=$2; break
-        fi
-        printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
-    done
+    count="$(_qs_prompt_count)" || return 1
 
-    printf "\nSummary:\n  ENABLE: %s:%s\n  DISABLE: %s:%s\n  Days   : %s\n" \
-           "$sh" "$sm" "$eh" "$em" "$dow" >&2
-    t="$(_qs_prompt 'Apply this schedule? (y/n)' 'y')" || return 1
-    case "$t" in
-        y|Y)
-            # ── build TWO records ─────────────────────────────────────────
-            local new_sched
-            new_sched="<1>${dow}>$(_qs_hm "$sh" "$sm")>|<1>${dow}>$(_qs_hm "$eh" "$em")>"
+    i=1
+    while [ "$i" -le "$count" ]; do
+        printf "\n--- Schedule %d of %d ---\n" "$i" "$count" >&2
 
-            am_settings_set "${SCRIPTNAME}_schedule" "$new_sched"
-            SCHEDULE="$new_sched"
+        dow="$(_qs_prompt_dow)" || { printf "Canceled.\n" >&2; return 1; }
 
-            _qs_apply_jobs
-            printf "OK. Schedule applied and saved.\n" >&2
-            ;;
-        *)  printf "Canceled.\n" >&2 ;;
-    esac
-}
+        while :; do
+            t="$(_qs_prompt 'START time to ENABLE QoS' "$def_start")" || return 1
+            if out="$(_qs_parse_time "$t")"; then set -- $out; sh=$1; sm=$2; break; fi
+            printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
+        done
 
-_qs_custom() {
-    printf "\nCustom cron mode:\n" >&2
-    printf "Enter the custom cron fields below (MIN HOUR DOM MON DOW).\n" >&2
-    printf "Examples: '0 20 * * *' or '0 7 * * 1-5'\n\n" >&2
+        while :; do
+            t="$(_qs_prompt 'END time to DISABLE QoS' "$def_end")" || return 1
+            if out="$(_qs_parse_time "$t")"; then set -- $out; eh=$1; em=$2; break; fi
+            printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
+        done
 
-    local off5 on5
-    printf "Enable (qosstart) schedule> " >&2
-    read -r on5 || return 1
-    on5="$(_qs_trim "$on5")"
+        # carry last used values as next defaults
+        def_start="$(_qs_hm "$sh" "$sm")"
+        def_end="$(_qs_hm "$eh" "$em")"
 
-    printf "Disable (qosstop) schedule> " >&2
-    read -r off5 || return 1
-    off5="$(_qs_trim "$off5")"
+        rec="<1>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
+        [ -n "$new_sched" ] && new_sched="${new_sched}|${rec}" || new_sched="${rec}"
 
-    echo "$on5"  | grep -qE '^([^[:space:]]+[[:space:]]+){4}[^[:space:]]+$' || { printf "Bad enable schedule.\n"  >&2; return 1; }
-    echo "$off5" | grep -qE '^([^[:space:]]+[[:space:]]+){4}[^[:space:]]+$' || { printf "Bad disable schedule.\n" >&2; return 1; }
+        i=$(( i + 1 ))
+    done
 
-    _qs_clear_jobs
-    cru a "${QOS_CRON_ON}"  "${on5}  ${SCRIPTPATH} -qosstart"
-    cru a "${QOS_CRON_OFF}" "${off5} ${SCRIPTPATH} -qosstop"
-    printf "OK. Custom entries applied.\n" >&2
-
-    # Persist to <en>dow>HH:MM>HH:MM if simple DOW-only with fixed HH:MM
-    local m1 h1 d1 mo1 w1 m2 h2 d2 mo2 w2 ok
-    set -f
-    set -- $on5;  m1="$1"; h1="$2"; d1="$3"; mo1="$4"; w1="$5"
-    set -- $off5; m2="$1"; h2="$2"; d2="$3"; mo2="$4"; w2="$5"
-    set +f
-    ok=1
-    echo "$m1" | grep -Eq '^[0-5]?[0-9]$' || ok=0
-    echo "$h1" | grep -Eq '^[0-2]?[0-9]$' || ok=0
-    echo "$m2" | grep -Eq '^[0-5]?[0-9]$' || ok=0
-    echo "$h2" | grep -Eq '^[0-2]?[0-9]$' || ok=0
-    [ "$d1"  = "*" ] || ok=0
-    [ "$mo1" = "*" ] || ok=0
-    [ "$d2"  = "*" ] || ok=0
-    [ "$mo2" = "*" ] || ok=0
-    [ "$w1" = "$w2" ] || ok=0
-    _qs_valid_dow "$w1" || ok=0
-
-    if [ "$ok" = "1" ]; then
-        # same-DOW → single record
-        m1="$(_qs_to_dec "$m1")"; h1="$(_qs_to_dec "$h1")"
-        m2="$(_qs_to_dec "$m2")"; h2="$(_qs_to_dec "$h2")"
-        _qs_settings_set 1 "$w1" "$(printf "%02d" "$h1")" "$(printf "%02d" "$m1")" \
-                              "$(printf "%02d" "$h2")" "$(printf "%02d" "$m2")"
+    printf "\nSummary of schedules to apply:\n" >&2
+    if [ -n "$new_sched" ]; then
+        echo "$new_sched" | tr '|' '\n' | sed 's/^/  /' >&2
     else
-        # different DOW sets → build START-only and/or END-only records
-        new_sched=""
-
-        if [ "$d1" = "*" ] && [ "$mo1" = "*" ] && _qs_valid_dow "$w1"; then
-            m1="$(_qs_to_dec "$m1")"; h1="$(_qs_to_dec "$h1")"
-            new_sched="<1>${w1}>$(_qs_hm "$h1" "$m1")>"
-        fi
-
-        if [ "$d2" = "*" ] && [ "$mo2" = "*" ] && _qs_valid_dow "$w2"; then
-            m2="$(_qs_to_dec "$m2")"; h2="$(_qs_to_dec "$h2")"
-            rec2="<1>${w2}>$(_qs_hm "$h2" "$m2")>"
-            [ -n "$new_sched" ] && new_sched="${new_sched}|${rec2}" || new_sched="${rec2}"
-        fi
-
-        if [ -n "$new_sched" ]; then
-            am_settings_set "${SCRIPTNAME}_schedule" "$new_sched"
-            SCHEDULE="$new_sched"
-        else
-            printf "Note: Custom expressions couldn't be converted to settings format; not persisted.\n" >&2
-        fi
+        printf "  (none)\n" >&2
     fi
+
+    t="$(_qs_prompt 'Apply these schedules? (y/n)' 'y')" || return 1
+    case "$t" in
+        y|Y)
+            _qs_settings_set_all "$new_sched"
+            _qs_apply_jobs
+            printf "OK. Schedules applied and saved.\n" >&2
+            ;;
+        *)  printf "Canceled.\n" >&2 ;;
+    esac
 }
 
 qos_schedule_menu() {
-    # Ensure cron is rebuilt from saved settings as soon as the menu opens
-    SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
-    qos_schedule_apply_from_config
+	# Rebuild cron from saved settings as soon as the menu opens
+	SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+	qos_schedule_apply_from_config
 
-    while :; do
-        printf "\n================ QoS Schedule =================\n"
-        printf "Current QoS schedule (if any):\n"
-        _qs_show_current
-        printf "\nChoose an option:\n"
-        printf "  1) Guided setup (start/end + DOW)\n"
-        printf "  2) Custom cron (5 fields)\n"
-        printf "  3) Clear schedule\n"
-        printf "  e) Exit\n"
-        printf "-----------------------------------------------\n"
-        printf "Enter selection: "
-        read -r sel || return
-        case "$sel" in
-            1) _qs_guided ;;
-            2) _qs_custom ;;
-            3)
-               _qs_clear_jobs
-               _qs_settings_delete
-               qos_schedule_apply_from_config
-               printf "Schedule cleared.\n"
-            ;;
-            e|E|exit|Exit) return ;;
-            *) printf "Invalid selection.\n" ;;
-        esac
-    done
+	while :; do
+		printf "\n================ QoS Schedule =================\n"
+		printf "Saved schedule records:\n"
+		if [ -n "$SCHEDULE" ]; then
+			printf "  %s\n" "$SCHEDULE"
+		else
+			printf "  (none)\n"
+		fi
+		printf "\nActive cron entries (if any):\n"
+		_qs_show_current
+		printf "\nChoose an option:\n"
+		printf "  1) Create schedules\n"
+		printf "  2) Clear schedule\n"
+		printf "  e) Exit\n"
+		printf "-----------------------------------------------\n"
+		printf "Enter selection: "
+		read -r sel || return
+		case "$sel" in
+			1) _qs_guided_multi ;;
+			2)
+			   _qs_clear_jobs
+			   _qs_settings_delete
+			   qos_schedule_apply_from_config
+			   printf "Schedule cleared.\n"
+			;;
+			e|E|exit|Exit) return ;;
+			*) printf "Invalid selection.\n" ;;
+		esac
+	done
 }
 
 menu() {

From 630bdecc2220e6ea18a4a52445667aec2666df21 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Sun, 24 Aug 2025 14:00:31 -0400
Subject: [PATCH 18/25] Allow Edits of Single Schedules

Allow Edits of Single Schedules
---
 flexqos.sh | 543 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 303 insertions(+), 240 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 7bd9794..d703e28 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1194,56 +1194,12 @@ _qs_to_dec() { printf '%s\n' "${1:-0}" | awk '{print $1+0}'; }
 _qs_hm() { printf "%02d:%02d" "$(_qs_to_dec "$1")" "$(_qs_to_dec "$2")"; }
 _qs_int() { printf '%d' "$(_qs_to_dec "$1")"; }
 
-_qs_duration_min() {
-    set -- $1;  local sm=$(_qs_int "$1") sh=$(_qs_int "$2")
-    set -- $2;  local em=$(_qs_int "$1") eh=$(_qs_int "$2")
-
-    local s=$(( sh * 60 + sm ))
-    local e=$(( eh * 60 + em ))
-
-    [ "$e" -le "$s" ] && echo $(( 1440 - (s - e) )) || echo $(( e - s ))
-}
-
-_qs_settings_set_all() {
-	# Replace all records with the provided string (properly formed)
-	SCHEDULE="$1"
-	am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
-}
-
-_qs_settings_append() {
-	# args: enabled dow sh sm eh em  → append as a new record
-	local en="$1" dow="$2" sh="$3" sm="$4" eh="$5" em="$6" rec
-	rec="<${en}>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
-	if [ -n "$SCHEDULE" ]; then
-		SCHEDULE="${SCHEDULE}|${rec}"
-	else
-		SCHEDULE="${rec}"
-	fi
-	am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
-}
-
-_qs_settings_delete() {
-    local file="/jffs/addons/custom_settings.txt"
-    [ -f "$file" ] && sed -i "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"
-    SCHEDULE=""
-}
-
 _qs_parse_time() {
     local t h m
     t="$(_qs_trim "$1")"
-
-    h="${t%%:*}"          # chars before first “:”
-    m="${t#*:}"           # chars after  first “:”
-    [ "$t" = "$h" ] && m="0"   # no “:MM” → default 0
-
-    # existing helper (_qs_to_dec prints “value+0” via awk)
-    h="$(_qs_to_dec "$h")"
-    m="$(_qs_to_dec "$m")"
-
-    # ----- range check -----
-    [ "$h" -ge 0 ] && [ "$h" -le 23 ] && \
-    [ "$m" -ge 0 ] && [ "$m" -le 59 ] || return 1
-
+    h="${t%%:*}"; m="${t#*:}"; [ "$t" = "$h" ] && m="0"
+    h="$(_qs_to_dec "$h")"; m="$(_qs_to_dec "$m")"
+    [ "$h" -ge 0 ] && [ "$h" -le 23 ] && [ "$m" -ge 0 ] && [ "$m" -le 59 ] || return 1
     printf '%02d %02d' "$h" "$m"
 }
 
@@ -1252,7 +1208,7 @@ _qs_now_in_window() {
     local eh=$(_qs_int "$3") em=$(_qs_int "$4")
     local dow="${5:-*}"
 
-    # -------- 1. DOW match --------
+    # DOW check
     if [ "$dow" != "*" ]; then
         local today="$(date +%w)" ok=0 part s e
         IFS=','; for part in $dow; do
@@ -1260,15 +1216,14 @@ _qs_now_in_window() {
                 s="${part%-*}" ; e="${part#*-}"
                 [ "$today" -ge "$s" ] && [ "$today" -le "$e" ] && { ok=1; break; }
             else
-				# treat 7 as 0 for Sunday
-				[ "$part" = "7" ] && part="0"
-				[ "$today" = "$part" ] && { ok=1; break; }
-			fi
+                [ "$part" = "7" ] && part="0"
+                [ "$today" = "$part" ] && { ok=1; break; }
+            fi
         done; IFS=' '
-        [ "$ok" = 1 ] || return 1            # not a matching day
+        [ "$ok" = 1 ] || return 1
     fi
 
-    # -------- 2. Minute-of-day match --------
+    # Minute-of-day check
     local now_h=$(_qs_int "$(date +%H)")
     local now_m=$(_qs_int "$(date +%M)")
     local now=$(( now_h * 60 + now_m ))
@@ -1277,125 +1232,94 @@ _qs_now_in_window() {
 
     if [ "$start" -le "$end" ]; then
         [ "$now" -ge "$start" ] && [ "$now" -lt "$end" ]
-    else                                # window crosses midnight
+    else
         [ "$now" -ge "$start" ] || [ "$now" -lt "$end" ]
     fi
 }
 
 _qs_valid_dow() {
-	# “*”, single 0-7 (0/7=Sun), ranges, comma lists
-	echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
+    echo "$1" | grep -Eq '^(\*|([0-7](-[0-7])?)(,([0-7](-[0-7])?))*)$'
 }
 
 _qs_clear_jobs() {
-    cru l |                       \
-    awk -v on="$QOS_CRON_ON"      \
-        -v off="$QOS_CRON_OFF" '
-        {
-            # job-id is the penultimate “#field#”
-            n = split($0, a, "#")
-            id = a[n-1]
-
-            # match flexqos_qos(on|off) and optional “_NN”
-            if (id ~ ("^" on "(_[0-9]+)?$") || id ~ ("^" off "(_[0-9]+)?$")) {
-                system("cru d " id)
-            }
-        }'
-}
-
-_qs_each_record() {
-    [ -z "$SCHEDULE" ] && return
-    printf '%s\n' "$SCHEDULE" | tr '|' '\n' |
-    while read -r rec; do
-        rec="${rec#<}"            # drop leading  '<'
-        rec="${rec%>}"            # drop trailing '>'
-        # split at every '>'
-        en="${rec%%>*}"           ; rest="${rec#*>}"
-        dow="${rest%%>*}"         ; rest="${rest#*>}"
-        st="${rest%%>*}"
-        et=""
-        case "$rest" in
-            *'>'*) et="${rest#*>}" ;;
-        esac
-        printf '%s %s %s %s\n' "$en" "$dow" "$st" "$et"
-    done
+    cru l | awk -v on="$QOS_CRON_ON" -v off="$QOS_CRON_OFF" '
+        { n=split($0,a,"#"); id=a[n-1];
+          if (id ~ ("^" on "(_[0-9]+)?$") || id ~ ("^" off "(_[0-9]+)?$")) system("cru d " id) }'
 }
 
 _qs_apply_jobs() {
     _qs_clear_jobs
-    local n=0
-    local aligned=0
-
-    # process each record independently
-    while read -r en dow st et; do
-        [ "$en" = "1" ] || continue          # only enabled windows
-
-        # ---- parse times for THIS record safely ----
-        local sh sm eh em out ok=1
-
-        if [ -n "$st" ]; then
-            out="$(_qs_parse_time "$st")" || out=""
-            if [ -n "$out" ]; then
-                set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2")
-            else
-                ok=0
-            fi
-        else
-            ok=0
-        fi
-
-        if [ -n "$et" ]; then
-            out="$(_qs_parse_time "$et")" || out=""
-            if [ -n "$out" ]; then
-                set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2")
-            else
-                ok=0
-            fi
-        else
-            ok=0
-        fi
-
-        [ "$ok" = "1" ] || continue
-
-        # ---- schedule cron jobs ----
-        n=$((n+1))
-        cru a "${QOS_CRON_ON}_${n}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
-        n=$((n+1))
-        cru a "${QOS_CRON_OFF}_${n}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
-
-        # ---- alignment for THIS record ----
-        if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then
-            aligned=1
-        fi
-    done <<EOF
-$(_qs_each_record)
-EOF
+    local n=0 aligned=0 rec en rest dow st et sh sm eh em out ok
+    [ -n "$SCHEDULE" ] || { [ "$aligned" = 1 ] && qos_start || qos_stop; return; }
+
+    local OLDIFS="$IFS"; IFS='|'
+    for rec in $SCHEDULE; do
+        rec="${rec#<}"; rec="${rec%>}"
+        en="${rec%%>*}"; rest="${rec#*>}"
+        dow="${rest%%>*}"; rest="${rest#*>}"
+        st="${rest%%>*}"; et=""; case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+        [ "$en" = "1" ] || continue
+
+        ok=1
+        out="$(_qs_parse_time "$st")" || ok=0
+        [ "$ok" = 1 ] && { set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2"); }
+        out="$(_qs_parse_time "$et")" || ok=0
+        [ "$ok" = 1 ] && { set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2"); }
+        [ "$ok" = 1 ] || continue
+
+        n=$((n+1)); cru a "${QOS_CRON_ON}_${n}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
+        n=$((n+1)); cru a "${QOS_CRON_OFF}_${n}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
+
+        if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then aligned=1; fi
+    done
+    IFS="$OLDIFS"
 
-    # If ANY window is currently active → QoS ON; otherwise OFF
     [ "$aligned" = 1 ] && qos_start || qos_stop
 }
 
 qos_schedule_apply_from_config() {
     [ -n "$SCHEDULE" ] || SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
-    if [ -n "$SCHEDULE" ]; then
-        _qs_apply_jobs
-    else
-        _qs_clear_jobs
-    fi
+    if [ -n "$SCHEDULE" ]; then _qs_apply_jobs; else _qs_clear_jobs; fi
+}
+
+_qs_count() {
+    [ -z "$SCHEDULE" ] && { printf '0'; return; }
+    printf '%s\n' "$SCHEDULE" | tr '|' '\n' | awk 'NF{n++} END{print n+0}'
 }
 
-_qs_show_current() {
-    local lines
-    # include optional _NN suffix so numbered jobs are shown
-    lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})(_[0-9]+)?#" || true)"
-    if [ -z "$lines" ]; then
+_qs_parse_record_str() {
+    # "<1>1-5>07:00>20:00" → "en dow st et"
+    local rec="$1" en rest dow st et
+    rec="${rec#<}"; rec="${rec%>}"
+    en="${rec%%>*}"; rest="${rec#*>}"
+    dow="${rest%%>*}"; rest="${rest#*>}"
+    st="${rest%%>*}"; et=""
+    case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+    printf '%s %s %s %s' "$en" "$dow" "$st" "$et"
+}
+
+_qs_list() {
+    if [ "$(_qs_count)" -eq 0 ]; then
         printf "  (none)\n"
-    else
-        printf "%s\n" "$lines" | sed 's/^/  /'
+        return
     fi
-}
 
-# --- interactive flows -----------------------------------------------------
+    local n=1 rec en rest dow st et status
+    local IFS_SAVE="$IFS"
+    IFS='|'
+    for rec in $SCHEDULE; do
+        # parse safely (no globbing)
+        rec="${rec#<}"; rec="${rec%>}"
+        en="${rec%%>*}"; rest="${rec#*>}"
+        dow="${rest%%>*}"; rest="${rest#*>}"
+        st="${rest%%>*}"; et=""; case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+
+        status="OFF"; [ "$en" = "1" ] && status="ON"
+        printf "  %d) [%s] DOW=%s  %s -> %s\n" "$n" "$status" "$dow" "$st" "$et"
+        n=$((n+1))
+    done
+    IFS="$IFS_SAVE"
+}
 
 _qs_prompt() {
     # $1=prompt  $2=default (optional)
@@ -1410,47 +1334,53 @@ _qs_prompt() {
     done
 }
 
-_qs_prompt_count() {
-	# Ask how many schedules to create (1..6 default 2)
-	local c
-	while :; do
-		c="$(_qs_prompt 'How many schedules would you like to create? (1-6)' '2')" || return 1
-		c="$(_qs_to_dec "$c")"
-		if [ "$c" -ge 1 ] && [ "$c" -le 6 ]; then
-			printf "%d" "$c"
-			return 0
-		fi
-		printf "Please enter a number between 1 and 6.\n" >&2
-	done
+_qs_prompt_dow() {
+    printf "\nDays of week for this schedule:\n" >&2
+    printf "  1) Every day (*)\n  2) Weekdays (1-5)\n  3) Weekends (0,6)\n  4) Custom (e.g., 1,3,5 or 0-2 or *)\n" >&2
+    local sel dow
+    while :; do
+        sel="$(_qs_prompt 'Select option (1-4, or e=exit)' '')" || return 1
+        case "$sel" in
+            e|E|cancel|Cancel)  return 1 ;;
+            1)  dow="*" ;;
+            2)  dow="1-5" ;;
+            3)  dow="0,6" ;;
+            4)
+                while :; do
+                    dow="$(_qs_prompt 'Enter DOW (Day of Week)' '*')" || return 1
+                    _qs_valid_dow "$dow" && break
+                    printf "Invalid DOW; try again.\n" >&2
+                done
+                ;;
+            *)  printf "Invalid selection.\n" >&2; continue ;;
+        esac
+        printf "%s" "$dow"
+        return 0
+    done
 }
 
-_qs_prompt_dow() {
-	# Returns a valid DOW expression in stdout
-	printf "\nDays of week for this schedule:\n" >&2
-	printf "  1) Every day (*)\n" >&2
-	printf "  2) Weekdays (1-5)\n" >&2
-	printf "  3) Weekends (0,6)\n" >&2
-	printf "  4) Custom (e.g., 1,3,5 or 0-2 or *)\n" >&2
-	local sel dow
-	while :; do
-		sel="$(_qs_prompt 'Select option (1-4, or e=exit)' '')" || return 1
-		case "$sel" in
-			e|E|cancel|Cancel)  return 1 ;;
-			1)  dow="*" ;;
-			2)  dow="1-5" ;;
-			3)  dow="0,6" ;;
-			4)
-				while :; do
-					dow="$(_qs_prompt 'Enter DOW (Day of Week)' '*')" || return 1
-					_qs_valid_dow "$dow" && break
-					printf "Invalid DOW; try again.\n" >&2
-				done
-				;;
-			*)  printf "Invalid selection.\n" >&2; continue ;;
-		esac
-		printf "%s" "$dow"
-		return 0
-	done
+_qs_prompt_idx() {
+    local max idx raw
+    max="$(_qs_count)"
+    [ "$max" -gt 0 ] || { printf "No saved schedules.\n" >&2; return 1; }
+
+    # Print list to STDERR so it doesn't get captured by command substitution.
+    _qs_list >&2
+
+    while :; do
+        raw="$(_qs_prompt "Pick schedule # (1-$max, or e=exit)" '')" || return 1
+        case "$raw" in
+            e|E|exit) return 1 ;;
+            *)
+                idx="$(_qs_to_dec "$raw")"
+                if [ "$idx" -ge 1 ] && [ "$idx" -le "$max" ]; then
+                    printf "%d" "$idx"
+                    return 0
+                fi
+                printf "Invalid selection.\n" >&2
+            ;;
+        esac
+    done
 }
 
 _qs_guided_multi() {
@@ -1458,15 +1388,18 @@ _qs_guided_multi() {
     printf " - QoS ENABLE at START time, DISABLE at END time for each schedule.\n" >&2
     printf " - Times accept HH or HH:MM (24h).\n\n" >&2
 
-    local count i dow sh sm eh em out t new_sched=""
-    local def_start="07:00" def_end="20:00"
-
-    count="$(_qs_prompt_count)" || return 1
+    local count c
+    while :; do
+        c="$(_qs_prompt 'How many schedules would you like to create? (1-6)' '2')" || return 1
+        count="$(_qs_to_dec "$c")"
+        if [ "$count" -ge 1 ] && [ "$count" -le 6 ]; then break; fi
+        printf "Please enter a number between 1 and 6.\n" >&2
+    done
 
+    local i dow sh sm eh em out t new_sched="" def_start="07:00" def_end="20:00"
     i=1
     while [ "$i" -le "$count" ]; do
         printf "\n--- Schedule %d of %d ---\n" "$i" "$count" >&2
-
         dow="$(_qs_prompt_dow)" || { printf "Canceled.\n" >&2; return 1; }
 
         while :; do
@@ -1474,75 +1407,205 @@ _qs_guided_multi() {
             if out="$(_qs_parse_time "$t")"; then set -- $out; sh=$1; sm=$2; break; fi
             printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
         done
-
         while :; do
             t="$(_qs_prompt 'END time to DISABLE QoS' "$def_end")" || return 1
             if out="$(_qs_parse_time "$t")"; then set -- $out; eh=$1; em=$2; break; fi
             printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
         done
 
-        # carry last used values as next defaults
-        def_start="$(_qs_hm "$sh" "$sm")"
-        def_end="$(_qs_hm "$eh" "$em")"
-
+        def_start="$(_qs_hm "$sh" "$sm")"; def_end="$(_qs_hm "$eh" "$em")"
         rec="<1>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
         [ -n "$new_sched" ] && new_sched="${new_sched}|${rec}" || new_sched="${rec}"
-
         i=$(( i + 1 ))
     done
 
     printf "\nSummary of schedules to apply:\n" >&2
-    if [ -n "$new_sched" ]; then
-        echo "$new_sched" | tr '|' '\n' | sed 's/^/  /' >&2
-    else
-        printf "  (none)\n" >&2
-    fi
-
+    [ -n "$new_sched" ] && echo "$new_sched" | tr '|' '\n' | sed 's/^/  /' >&2 || printf "  (none)\n" >&2
     t="$(_qs_prompt 'Apply these schedules? (y/n)' 'y')" || return 1
     case "$t" in
         y|Y)
-            _qs_settings_set_all "$new_sched"
+            SCHEDULE="$new_sched"
+            am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
             _qs_apply_jobs
             printf "OK. Schedules applied and saved.\n" >&2
-            ;;
+        ;;
         *)  printf "Canceled.\n" >&2 ;;
     esac
 }
 
+_qs_add_single() {
+    printf "\nAdd a schedule\n" >&2
+    local dow sh sm eh em out t rec
+    dow="$(_qs_prompt_dow)" || { printf "Canceled.\n" >&2; return 1; }
+
+    while :; do
+        t="$(_qs_prompt 'START time to ENABLE QoS' '07:00')" || return 1
+        if out="$(_qs_parse_time "$t")"; then set -- $out; sh=$1; sm=$2; break; fi
+        printf "Invalid time.\n" >&2
+    done
+    while :; do
+        t="$(_qs_prompt 'END time to DISABLE QoS' '20:00')" || return 1
+        if out="$(_qs_parse_time "$t")"; then set -- $out; eh=$1; em=$2; break; fi
+        printf "Invalid time.\n" >&2
+    done
+
+    rec="<1>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
+    if [ -n "$SCHEDULE" ]; then SCHEDULE="${SCHEDULE}|${rec}"; else SCHEDULE="${rec}"; fi
+    am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
+    _qs_apply_jobs
+    printf "Added and applied.\n" >&2
+}
+
+_qs_edit_single() {
+    local idx rec en rest dow st et out sh sm eh em v new newlist r i IFS_SAVE
+
+    idx="$(_qs_prompt_idx)" || return 1
+    idx="$(_qs_to_dec "$idx")"   # sanitize to integer
+
+    # --- grab the selected record safely (no globbing) ---
+    IFS_SAVE="$IFS"; IFS='|'; i=0
+    for r in $SCHEDULE; do
+        i=$((i+1))
+        if [ "$i" -eq "$idx" ]; then rec="$r"; break; fi
+    done
+    IFS="$IFS_SAVE"
+    [ -n "$rec" ] || { printf "Not found.\n" >&2; return 1; }
+
+    # --- parse fields ---
+    rec="${rec#<}"; rec="${rec%>}"
+    en="${rec%%>*}"; rest="${rec#*>}"
+    dow="${rest%%>*}"; rest="${rest#*>}"
+    st="${rest%%>*}"; et=""; case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+
+    printf "\nEditing schedule #%d\n" "$idx" >&2
+
+    v="$(_qs_prompt 'Enable? (1=yes,0=no)' "$en")" || return 1
+    [ "$v" = "0" ] || [ "$v" = "1" ] || { printf "Invalid (must be 0 or 1).\n" >&2; return 1; }
+    en="$v"
+
+    while :; do
+        v="$(_qs_prompt 'Days of week (e.g., *,1-5,0,6)' "$dow")" || return 1
+        _qs_valid_dow "$v" && { dow="$v"; break; }
+        printf "Invalid DOW.\n" >&2
+    done
+    while :; do
+        v="$(_qs_prompt 'START time (HH or HH:MM)' "$st")" || return 1
+        if out="$(_qs_parse_time "$v")"; then set -- $out; sh=$1; sm=$2; break; fi
+        printf "Invalid time.\n" >&2
+    done
+    while :; do
+        v="$(_qs_prompt 'END time (HH or HH:MM)' "$et")" || return 1
+        if out="$(_qs_parse_time "$v")"; then set -- $out; eh=$1; em=$2; break; fi
+        printf "Invalid time.\n" >&2
+    done
+
+    new="<${en}>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
+
+    # --- rebuild SCHEDULE with the replacement ---
+    IFS_SAVE="$IFS"; IFS='|'; i=0; newlist=""
+    for r in $SCHEDULE; do
+        i=$((i+1))
+        if [ "$i" -eq "$idx" ]; then
+            rec="$new"
+        else
+            rec="$r"
+        fi
+        [ -n "$newlist" ] && newlist="${newlist}|${rec}" || newlist="${rec}"
+    done
+    IFS="$IFS_SAVE"
+
+    SCHEDULE="$newlist"
+    am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
+
+    _qs_apply_jobs
+    printf "Updated and applied.\n" >&2
+}
+
+_qs_delete_single() {
+    local idx new rec i IFS_SAVE
+    idx="$(_qs_prompt_idx)" || return 1
+    idx="$(_qs_to_dec "$idx")"   # sanitize to integer
+
+    IFS_SAVE="$IFS"; IFS='|'
+    new=""; i=0
+    for rec in $SCHEDULE; do
+        i=$((i+1))
+        [ "$i" -eq "$idx" ] && continue
+        [ -n "$new" ] && new="${new}|${rec}" || new="${rec}"
+    done
+    IFS="$IFS_SAVE"
+
+    SCHEDULE="$new"
+    am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
+
+    _qs_apply_jobs
+    printf "Deleted and applied.\n" >&2
+}
+
+# --- interactive menu ------------------------------------------------------
+
 qos_schedule_menu() {
-	# Rebuild cron from saved settings as soon as the menu opens
-	SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
-	qos_schedule_apply_from_config
+    # Initial apply once on open
+    SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+    qos_schedule_apply_from_config
 
-	while :; do
-		printf "\n================ QoS Schedule =================\n"
-		printf "Saved schedule records:\n"
-		if [ -n "$SCHEDULE" ]; then
-			printf "  %s\n" "$SCHEDULE"
-		else
-			printf "  (none)\n"
-		fi
-		printf "\nActive cron entries (if any):\n"
-		_qs_show_current
-		printf "\nChoose an option:\n"
-		printf "  1) Create schedules\n"
-		printf "  2) Clear schedule\n"
-		printf "  e) Exit\n"
-		printf "-----------------------------------------------\n"
-		printf "Enter selection: "
-		read -r sel || return
-		case "$sel" in
-			1) _qs_guided_multi ;;
-			2)
-			   _qs_clear_jobs
-			   _qs_settings_delete
-			   qos_schedule_apply_from_config
-			   printf "Schedule cleared.\n"
-			;;
-			e|E|exit|Exit) return ;;
-			*) printf "Invalid selection.\n" ;;
-		esac
-	done
+    while :; do
+        # Re-sync from storage so UI always reflects the latest truth
+        SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)"
+
+        local count has_any sel lines
+        count="$(_qs_count)"; [ "$count" -gt 0 ] && has_any=1 || has_any=0
+
+        printf "\n================ QoS Schedule =================\n"
+        printf "Saved schedule records:\n"
+        if [ "$has_any" -eq 1 ]; then _qs_list; else printf "  (none)\n"; fi
+
+        printf "\nActive cron entries (if any):\n"
+        lines="$(cru l | grep -E "#(${QOS_CRON_ON}|${QOS_CRON_OFF})(_[0-9]+)?#" || true)"
+        if [ -z "$lines" ]; then printf "  (none)\n"; else printf "%s\n" "$lines" | sed 's/^/  /'; fi
+
+        printf "\nChoose an option:\n"
+        printf "  1) Create schedules (guided)\n"
+        if [ "$has_any" -eq 1 ]; then
+            printf "  2) Add a schedule\n"
+            printf "  3) Edit a schedule\n"
+            printf "  4) Delete a schedule\n"
+            printf "  5) Clear ALL schedules\n"
+        fi
+        printf "  e) Exit\n"
+        printf "-----------------------------------------------\n"
+        printf "Enter selection: "
+        read -r sel || return
+
+        case "$sel" in
+            1) _qs_guided_multi ;;
+            2)
+               if [ "$has_any" -eq 1 ]; then _qs_add_single
+               else printf "Invalid selection. No schedules yet; use 'Create schedules (guided)' first.\n"; fi
+            ;;
+            3)
+               if [ "$has_any" -eq 1 ]; then _qs_edit_single
+               else printf "Invalid selection. No schedules to edit.\n"; fi
+            ;;
+            4)
+               if [ "$has_any" -eq 1 ]; then _qs_delete_single
+               else printf "Invalid selection. No schedules to delete.\n"; fi
+            ;;
+            5)
+               if [ "$has_any" -eq 1 ]; then
+                   _qs_clear_jobs
+                   { file="/jffs/addons/custom_settings.txt"; [ -f "$file" ] && sed -i "/^${SCRIPTNAME}_schedule[[:space:]]/d" "$file"; }
+                   SCHEDULE=""
+                   qos_schedule_apply_from_config
+                   printf "All schedules cleared.\n"
+               else
+                   printf "Invalid selection. Nothing to clear.\n"
+               fi
+            ;;
+            e|E|exit|Exit) return ;;
+            *) printf "Invalid selection.\n" ;;
+        esac
+    done
 }
 
 menu() {

From 7a9829b666bb7b70d74ffd588bc7eafb833b9f15 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Sun, 24 Aug 2025 14:33:54 -0400
Subject: [PATCH 19/25] Remove Default Schedule

Remove Default Schedule
---
 flexqos.asp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index 62bc4b4..f54d3ee 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -716,21 +716,10 @@ function sched_render_rules(){
 function schedToggleUI(){
   var cb    = document.getElementById("sched_enabled");
   var block = document.getElementById("sched_block");
-  if (!cb || !block) return;             // guards
+  if (!cb || !block) return;
 
   block.style.display = cb.checked ? "" : "none";
-
-  // Auto-seed a default entry only for the new AppDB-style UI
-  if (cb.checked){
-    if (typeof SCHED !== "undefined" &&
-        Array.isArray(SCHED) &&
-        SCHED.length === 0 &&
-        !( (custom_settings.flexqos_schedule || "").trim() ) ) {
-
-      SCHED.push({ days:[1,2,3,4,5], start:"07:00", end:"20:00" });
-      if (typeof sched_render_rules === "function") sched_render_rules();
-    }
-  }
+  if (typeof sched_render_rules === "function") sched_render_rules();
 }
 
 function schedInitOnce(){

From 1c6b21236c03002381ee2b3314e11cd5bc2361cc Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Sun, 24 Aug 2025 14:48:02 -0400
Subject: [PATCH 20/25] Keep Schedule Enabled On Single Delete

Keep Schedule Enabled On Single Delete
---
 flexqos.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index d703e28..8ea4258 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1250,21 +1250,28 @@ _qs_clear_jobs() {
 _qs_apply_jobs() {
     _qs_clear_jobs
     local n=0 aligned=0 rec en rest dow st et sh sm eh em out ok
-    [ -n "$SCHEDULE" ] || { [ "$aligned" = 1 ] && qos_start || qos_stop; return; }
+
+    # If there are no schedules, just clear cron and LEAVE QoS AS-IS.
+    # (Prevents unexpected qos_stop when the last schedule is deleted.)
+    if [ -z "$SCHEDULE" ]; then
+        # Optional: logmsg "No QoS schedules configured; leaving QoS state unchanged."
+        return 0
+    fi
 
     local OLDIFS="$IFS"; IFS='|'
     for rec in $SCHEDULE; do
         rec="${rec#<}"; rec="${rec%>}"
         en="${rec%%>*}"; rest="${rec#*>}"
         dow="${rest%%>*}"; rest="${rest#*>}"
-        st="${rest%%>*}"; et=""; case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+        st="${rest%%>*}"; et=""
+        case "$rest" in *'>'*) et="${rest#*>}" ;; esac
         [ "$en" = "1" ] || continue
 
         ok=1
         out="$(_qs_parse_time "$st")" || ok=0
-        [ "$ok" = 1 ] && { set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2"); }
+        if [ "$ok" = 1 ]; then set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2"); fi
         out="$(_qs_parse_time "$et")" || ok=0
-        [ "$ok" = 1 ] && { set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2"); }
+        if [ "$ok" = 1 ]; then set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2"); fi
         [ "$ok" = 1 ] || continue
 
         n=$((n+1)); cru a "${QOS_CRON_ON}_${n}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
@@ -1274,6 +1281,7 @@ _qs_apply_jobs() {
     done
     IFS="$OLDIFS"
 
+    # Apply immediate state based on whether we are currently in any active window.
     [ "$aligned" = 1 ] && qos_start || qos_stop
 }
 
@@ -1538,7 +1546,7 @@ _qs_delete_single() {
     SCHEDULE="$new"
     am_settings_set "${SCRIPTNAME}"_schedule "$SCHEDULE"
 
-    _qs_apply_jobs
+    qos_schedule_apply_from_config
     printf "Deleted and applied.\n" >&2
 }
 

From 5d029bd4cdbdca86061d081cb1e29a0eac83b407 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Sun, 24 Aug 2025 14:56:41 -0400
Subject: [PATCH 21/25] Cleanup

Cleanup
---
 flexqos.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flexqos.sh b/flexqos.sh
index 8ea4258..3a23dfd 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1254,7 +1254,6 @@ _qs_apply_jobs() {
     # If there are no schedules, just clear cron and LEAVE QoS AS-IS.
     # (Prevents unexpected qos_stop when the last schedule is deleted.)
     if [ -z "$SCHEDULE" ]; then
-        # Optional: logmsg "No QoS schedules configured; leaving QoS state unchanged."
         return 0
     fi
 

From d94a3435c072fdbb9c8b2aca0c44e2826846c0cb Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Mon, 25 Aug 2025 14:20:28 -0400
Subject: [PATCH 22/25] Change Schedule Location

Change Schedule Location
---
 flexqos.asp | 126 +++++++++++++++++++++++++++++-----------------------
 flexqos.sh  |   4 +-
 2 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/flexqos.asp b/flexqos.asp
index f54d3ee..8c5a25c 100644
--- a/flexqos.asp
+++ b/flexqos.asp
@@ -701,9 +701,9 @@ function sched_render_rules(){
       var w = SCHED[i];
       code += '<tr data-idx="'+i+'">';
       code +=   '<td width="50%">'+ labelDays(w.days) +'</td>';
-      code +=   '<td width="16%">'+ w.start +'</td>';
-      code +=   '<td width="16%">'+ w.end   +'</td>';
-      code +=   '<td width="18%"><input class="edit_btn"   onclick="sched_edit_row(this);" value=""/>';
+      code +=   '<td width="18%">'+ w.start +'</td>';
+      code +=   '<td width="18%">'+ w.end   +'</td>';
+      code +=   '<td width="14%"><input class="edit_btn"   onclick="sched_edit_row(this);" value=""/>';
       code +=                     '<input class="remove_btn" onclick="sched_remove_row(this);" value=""/></td>';
       code += '</tr>';
     }
@@ -714,11 +714,14 @@ function sched_render_rules(){
 
 // ---------- enable/seed ----------
 function schedToggleUI(){
-  var cb    = document.getElementById("sched_enabled");
-  var block = document.getElementById("sched_block");
-  if (!cb || !block) return;
+  var cb = document.getElementById("sched_enabled");
+  var block = document.getElementById("sched_block");        // legacy container (may not exist)
+  var row   = document.getElementById("sched_block_row");    // new full-width row
+  var on = cb && cb.checked;
+
+  if (block) block.style.display = on ? "" : "none";
+  if (row)   row.style.display   = on ? "" : "none";
 
-  block.style.display = cb.checked ? "" : "none";
   if (typeof sched_render_rules === "function") sched_render_rules();
 }
 
@@ -3063,55 +3066,6 @@ function DelCookie(cookiename){
 			<input type="radio" name="flexqos_conntrack" class="input" value="0">No
 		</td>
 	</tr>
-	<tr>
-  	<th>Schedule</th>
-  	<td>
-    	<label>
-      	<input type="checkbox" id="sched_enabled"> Enable
-    	</label>
-
-    	<div id="sched_block" style="margin-top:8px; display:none;">
-
-      	<!-- Add Row -->
-      	<table width="100%" border="1" cellspacing="0" cellpadding="4" class="FormTable_table">
-        	<thead>
-          	<tr>
-            	<td colspan="4">Schedules&nbsp;(Max Limit : 6)</td>
-          	</tr>
-        	</thead>
-        	<tbody>
-          	<tr>
-            	<th width="50%">Days</th>
-            	<th width="16%">Start</th>
-            	<th width="16%">End</th>
-            	<th width="18%">Edit</th>
-          	</tr>
-          	<tr>
-            	<td>
-              	<div class="sched-day">
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_0"> Su</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_1"> Mo</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_2"> Tu</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_3"> We</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_4"> Th</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_5"> Fr</label>
-                	<label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_6"> Sa</label>
-              	</div>
-            	</td>
-            	<td><input id="sched_new_start" type="time" class="input_6_table" value="07:00"></td>
-            	<td><input id="sched_new_end"   type="time" class="input_6_table" value="20:00"></td>
-            	<td>
-              	<div><input type="button" id="sched_add_btn" class="add_btn" onclick="sched_add_window();" value=""></div>
-            	</td>
-          	</tr>
-        	</tbody>
-      	</table>
-
-      	<!-- Existing windows list -->
-      	<div id="sched_rules_block" style="margin-top:8px;"></div>
-    	</div>
-  	</td>
-	</tr>
 	<tr>
 		<th><a class="hintstyle" href="javascript:void(0);" onClick="openHint('FlexQoS',4);">Router/VPN Client Outbound Traffic Class</th>
 		<td>
@@ -3128,6 +3082,66 @@ function DelCookie(cookiename){
 		</td>
 	</tr>
 </table>
+<!-- Schedules (full-width section) -->
+<table width="100%" border="1" align="center" cellpadding="4" cellspacing="0"
+       class="FormTable_table" id="sched_section" style="margin-top:10px;">
+  <thead>
+    <tr>
+      <td colspan="4">
+        QoS Schedules&nbsp;(Max Limit : 6)
+        <span style="float:right; font-weight:normal;">
+          <label style="cursor:pointer;">
+            <input type="checkbox" id="sched_enabled"> Enable
+          </label>
+        </span>
+      </td>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id="sched_block_row" style="display:none;">
+      <td colspan="4">
+        <!-- Add Row -->
+        <table width="100%" border="1" cellspacing="0" cellpadding="4" class="FormTable_table">
+          <thead>
+            <tr>
+              <td colspan="4">Add schedule window</td>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <th width="50%">Days</th>
+              <th width="18%">Start</th>
+              <th width="18%">End</th>
+              <th width="14%">Edit</th>
+            </tr>
+            <tr>
+              <td>
+                <div class="sched-day">
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_0"> Su</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_1"> Mo</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_2"> Tu</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_3"> We</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_4"> Th</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_5"> Fr</label>
+                  <label class="sched-day"><input type="checkbox" class="sched-daycb" id="sched_new_day_6"> Sa</label>
+                </div>
+              </td>
+              <td><input id="sched_new_start" type="time" class="input_6_table" value="07:00" style="width: 100px; margin-left: 10px;"></td>
+              <td><input id="sched_new_end"   type="time" class="input_6_table" value="20:00" style="width: 100px; margin-left: 10px;"></td>
+              <td>
+                <div><input type="button" id="sched_add_btn" class="add_btn" onclick="sched_add_window();" value=""></div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+
+        <!-- Existing windows list -->
+        <div id="sched_rules_block" style="margin-top:10px;"></div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
 <div id="iptables_rules_block"></div>
 
 <table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" class="FormTable_table">
diff --git a/flexqos.sh b/flexqos.sh
index 3a23dfd..8fc85af 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1572,7 +1572,7 @@ qos_schedule_menu() {
         if [ -z "$lines" ]; then printf "  (none)\n"; else printf "%s\n" "$lines" | sed 's/^/  /'; fi
 
         printf "\nChoose an option:\n"
-        printf "  1) Create schedules (guided)\n"
+        printf "  1) Create schedules (Guided)\n"
         if [ "$has_any" -eq 1 ]; then
             printf "  2) Add a schedule\n"
             printf "  3) Edit a schedule\n"
@@ -1588,7 +1588,7 @@ qos_schedule_menu() {
             1) _qs_guided_multi ;;
             2)
                if [ "$has_any" -eq 1 ]; then _qs_add_single
-               else printf "Invalid selection. No schedules yet; use 'Create schedules (guided)' first.\n"; fi
+               else printf "Invalid selection. No schedules yet; use 'Create schedules (Guided)' first.\n"; fi
             ;;
             3)
                if [ "$has_any" -eq 1 ]; then _qs_edit_single

From 7cf0032d4b4b7f6ed793a1ce30c0dbaf12bb73f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:04:48 +0000
Subject: [PATCH 23/25] Bump actions/checkout from 4.3.0 to 5.0.0 in the
 all-actions group

Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 4.3.0 to 5.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.3.0...v5.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Create-NewReleases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml
index 9fe455a..b9c40d4 100644
--- a/.github/workflows/Create-NewReleases.yml
+++ b/.github/workflows/Create-NewReleases.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       # 1--- Check out master so we tag the exact merge commit
       - name: Checkout source code
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@v5.0.0
         with:
           fetch-depth: 0
           ref: 'master'

From 7b4cdd9edd0fd9629fa874ba41a1668cb59325cf Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Tue, 26 Aug 2025 07:34:12 -0400
Subject: [PATCH 24/25] Fixing Code for Minute Parsing

Fixing Code for Minute Parsing
---
 flexqos.sh | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/flexqos.sh b/flexqos.sh
index 8fc85af..f4dd4e2 100644
--- a/flexqos.sh
+++ b/flexqos.sh
@@ -1249,38 +1249,49 @@ _qs_clear_jobs() {
 
 _qs_apply_jobs() {
     _qs_clear_jobs
-    local n=0 aligned=0 rec en rest dow st et sh sm eh em out ok
+    local n=0 aligned=0 rec en rest dow st et sh sm eh em sh_s sm_s eh_s em_s out ok
 
-    # If there are no schedules, just clear cron and LEAVE QoS AS-IS.
-    # (Prevents unexpected qos_stop when the last schedule is deleted.)
-    if [ -z "$SCHEDULE" ]; then
-        return 0
-    fi
+    # No schedules? Clear cron and LEAVE QoS state as-is.
+    [ -z "$SCHEDULE" ] && return 0
 
     local OLDIFS="$IFS"; IFS='|'
     for rec in $SCHEDULE; do
         rec="${rec#<}"; rec="${rec%>}"
+
         en="${rec%%>*}"; rest="${rec#*>}"
         dow="${rest%%>*}"; rest="${rest#*>}"
-        st="${rest%%>*}"; et=""
-        case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+        st="${rest%%>*}"; et=""; case "$rest" in *'>'*) et="${rest#*>}" ;; esac
+
         [ "$en" = "1" ] || continue
 
+        # Validate times using the parser, but build the actual cron fields
+        # from the raw HH:MM strings to avoid any numeric re-interpretation.
         ok=1
         out="$(_qs_parse_time "$st")" || ok=0
-        if [ "$ok" = 1 ]; then set -- $out; sh=$(_qs_to_dec "$1"); sm=$(_qs_to_dec "$2"); fi
         out="$(_qs_parse_time "$et")" || ok=0
-        if [ "$ok" = 1 ]; then set -- $out; eh=$(_qs_to_dec "$1"); em=$(_qs_to_dec "$2"); fi
         [ "$ok" = 1 ] || continue
 
-        n=$((n+1)); cru a "${QOS_CRON_ON}_${n}"  "$(printf '%d %d * * %s %s -qosstart' "$sm" "$sh" "$dow" "$SCRIPTPATH")"
-        n=$((n+1)); cru a "${QOS_CRON_OFF}_${n}" "$(printf '%d %d * * %s %s -qosstop'  "$em" "$eh" "$dow" "$SCRIPTPATH")"
+        # Raw split (keeps "07" vs "7" exactly as entered)
+        sh_s="${st%%:*}"; sm_s="${st#*:}"; [ "$st" = "$sh_s" ] && sm_s="0"
+        eh_s="${et%%:*}"; em_s="${et#*:}"; [ "$et" = "$eh_s" ] && em_s="0"
 
+        # Trim any whitespace/CR just in case
+        sh_s="$(_qs_trim "$sh_s")"; sm_s="$(_qs_trim "$sm_s")"
+        eh_s="$(_qs_trim "$eh_s")"; em_s="$(_qs_trim "$em_s")"
+
+        # Numeric forms for comparisons (no base-8 surprises)
+        sh="$(_qs_to_dec "$sh_s")"; sm="$(_qs_to_dec "$sm_s")"
+        eh="$(_qs_to_dec "$eh_s")"; em="$(_qs_to_dec "$em_s")"
+
+        # Add cron jobs using *separate arguments* (most robust with cru)
+        n=$((n+1)); cru a "${QOS_CRON_ON}_${n}"  "$sm" "$sh" "*" "*" "$dow" "$SCRIPTPATH" -qosstart
+        n=$((n+1)); cru a "${QOS_CRON_OFF}_${n}" "$em" "$eh" "*" "*" "$dow" "$SCRIPTPATH" -qosstop
+
+        # Align immediate state
         if _qs_now_in_window "$sh" "$sm" "$eh" "$em" "$dow"; then aligned=1; fi
     done
     IFS="$OLDIFS"
 
-    # Apply immediate state based on whether we are currently in any active window.
     [ "$aligned" = 1 ] && qos_start || qos_stop
 }
 
@@ -1398,9 +1409,10 @@ _qs_guided_multi() {
     local count c
     while :; do
         c="$(_qs_prompt 'How many schedules would you like to create? (1-6)' '2')" || return 1
-        count="$(_qs_to_dec "$c")"
-        if [ "$count" -ge 1 ] && [ "$count" -le 6 ]; then break; fi
-        printf "Please enter a number between 1 and 6.\n" >&2
+        case "$c" in
+            1|2|3|4|5|6) count="$c"; break ;;
+            *)           printf "Please enter a number between 1 and 6.\n" >&2 ;;
+        esac
     done
 
     local i dow sh sm eh em out t new_sched="" def_start="07:00" def_end="20:00"
@@ -1420,7 +1432,8 @@ _qs_guided_multi() {
             printf "Invalid time - hours 0-23, minutes 0-59.\n" >&2
         done
 
-        def_start="$(_qs_hm "$sh" "$sm")"; def_end="$(_qs_hm "$eh" "$em")"
+        def_start="$(_qs_hm "$sh" "$sm")"
+        def_end="$(_qs_hm "$eh" "$em")"
         rec="<1>${dow}>$(_qs_hm "$sh" "$sm")>$(_qs_hm "$eh" "$em")"
         [ -n "$new_sched" ] && new_sched="${new_sched}|${rec}" || new_sched="${rec}"
         i=$(( i + 1 ))

From 43de764850e682754914adebcd22c10e429e8b54 Mon Sep 17 00:00:00 2001
From: ExtremeFiretop <joel.samson@hotmail.com>
Date: Thu, 4 Sep 2025 10:19:38 -0400
Subject: [PATCH 25/25] Update readme

Update readme
---
 Changelog.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index cc99340..7c738cf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
+v1.4.9 (04-Sep-2025)
+  - NEW: Includes Flexible/Dynamic Scheduling of the QoS system on ASUS routers. As requested here: https://www.snbforums.com/threads/flexqos-1-4-8-flexible-qos-enhancement-script-for-adaptive-qos.94976/post-964632
+
 v1.4.8 (18-May-2025)
   - CHANGED: Changed Soft Warning for Hard Block on WiFi 7 devices as per dave and RMerlin conversation here: https://www.snbforums.com/threads/asuswrt-merlin-3006-102-5-beta-is-now-available.95115/post-961105
-  - CHANGED: Added a force uninstall for routers with FlexQoS installed on BE devixes while rebooting/startup.
+  - CHANGED: Added a force uninstall for routers with FlexQoS installed on BE devices while rebooting/startup.
 
 v1.4.7 (15-June-2025)
   - CHANGED: Re-enable develop branch for script development.