Beta3 Map shows all stations from day on, not last 24 hours, like configured in Retention Days Settings
William Tracy
I think the houskeeping_loop function is working to run at startup and every hour,
but the Map Web page displays all
stations from day 1, not the last 24 hours like what i have configured
in Setting Retention (days) 1.
I've deleted cache for Firefox and also from Chrome browsers.
here is output from ~/config/direwolf-dashboard/config.yaml and sqlite3. and also a screenshot of Map
I've also deleted the entire packets.db and started over.
the .db packets has today's packets (last 24 Hours), the .db stations has all stations from day one.
I sorted the packets and stations in descending order.
```
async def _housekeeping_loop(retention_days: int) -> None:
"""Periodic housekeeping — runs on startup and every hour."""
while True:
try:
if state.storage:
deleted = await state.storage.housekeep(retention_days)
if deleted:
LOG.info(f"Housekeeping deleted {deleted} old packets")
except asyncio.CancelledError:
break
except Exception as e:
LOG.error(f"Housekeeping error: {e}")
await asyncio.sleep(3600) # Every hour
Last login: Fri May 8 07:37:00 on ttys001
wptracy@Williams-Mac-mini ~ % ssh p...@10.0.0.232
p...@10.0.0.232's password:
pi@digipi:~/config/direwolf-dashboard $ cat config.yaml
station:
latitude: 39.7907
longitude: -104.7473
zoom: 8
my_position:
type: null
callsign: null
latitude: null
longitude: null
direwolf:
agw_host: localhost
agw_port: 8000
log_file: /run/direwolf.log
server:
host: 0.0.0.0
port: 8088
storage:
db_path: /home/pi/.local/share/direwolf-dashboard/packets.db
retention_days: 1
tiles:
cache_dir: /home/pi/.local/share/direwolf-dashboard/tiles
cache_mode: lazy
tile_url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
max_cache_mb: 5
display:
show_route_distances: true
pi@digipi:~/config/direwolf-dashboard $
Welcome to DigiPi!
Run 'sudo remount' to make the filesystem writeable.
pi@digipi:~ $ cd local/share/direwolf-dashboard/
pi@digipi:~/local/share/direwolf-dashboard $ ls
packets.db packets.db-shm packets.db-wal retain_1day.sh tiles
pi@digipi:~/local/share/direwolf-dashboard
$ sqlite3 -header -column $HOME/local/share/direwolf-dashboard/packets.db "
PRAGMA table_info(packets);
"
cid name type notnull dflt_value pk
--- ------------ ------- ------- ---------- --
0 id INTEGER 0 1
1 timestamp REAL 1 0
2 type TEXT 1 0
3 tx BOOLEAN 1 0
4 from_call TEXT 1 0
5 to_call TEXT 1 0
6 path TEXT 0 0
7 msg_no TEXT 0 0
8 latitude REAL 0 0
9 longitude REAL 0 0
10 symbol TEXT 0 0
11 symbol_table TEXT 0 0
12 human_info TEXT 0 0
13 comment TEXT 0 0
14 audio_level INTEGER 0 0
15 raw_log TEXT 0 0
16 compact_log TEXT 0 0
17 raw_packet TEXT 0 0
pi@digipi:~/local/share/direwolf-dashboard $
sqlite3 -header -column $HOME/local/share/direwolf-dashboard/packets.db "
PRAGMA table_info(stations);
"
cid name type notnull dflt_value pk
--- ------------ ------- ------- ---------- --
0 callsign TEXT 0 1
1 last_seen REAL 1 0
2 latitude REAL 0 0
3 longitude REAL 0 0
4 symbol TEXT 0 0
5 symbol_table TEXT 0 0
6 last_comment TEXT 0 0
7 packet_count INTEGER 0 1 0
pi@digipi:~/local/share/direwolf-dashboard $
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3
$HOME/local/share/direwolf-dashboard/packets.db "SELECT COUNT(*) FROM
stations;"
117
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3
$HOME/local/share/direwolf-dashboard/packets.db "SELECT COUNT(*) FROM
packets;"
48
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3
/run/.local/share/direwolf-dashboard/packets.db "SELECT COUNT(*) FROM
stations;"
117
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3
/run/.local/share/direwolf-dashboard/packets.db "SELECT COUNT(*) FROM
packets;"
48
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3 -header -column $HOME/local/share/direwolf-dashboard/packets.db "
SELECT
from_call,
to_call,
timestamp,
datetime(timestamp, 'unixepoch', 'localtime') AS UCT_time_of_Packet
FROM packets
WHERE timestamp IS NOT NULL
ORDER BY UCT_time_of_Packet DESC;
"
from_call to_call timestamp UCT_time_of_Packet
--------- ------- ---------------- -------------------
W0SUN-8 SYTSQV 1778250417.86065 2026-05-08 15:26:57
KI6WGK-9 APAT81 1778250382.40328 2026-05-08 15:26:22
W0SUN-8 SYTSWW 1778250298.39837 2026-05-08 15:24:58
N0SZ-2 APMI06 1778250272.79263 2026-05-08 15:24:32
KI6WGK-9 APAT81 1778250247.77413 2026-05-08 15:24:07
W0SUN-8 SYTTSY 1778249448.26645 2026-05-08 15:10:48
WA0DE-9 S9RSVQ 1778249385.35479 2026-05-08 15:09:45
KE0NKL-9 S9PQYX 1778249385.97395 2026-05-08 15:09:45
W0SUN-8 SYTTTQ 1778249326.85702 2026-05-08 15:08:46
ECRA-1 APWW11 1778249296.29909 2026-05-08 15:08:16
W0SUN-8 SYTTTQ 1778249248.0751 2026-05-08 15:07:28
KE0NKL-9 S8UYTX 1778249248.6946 2026-05-08 15:07:28
WT0R-9 SYTPZZ 1778249183.35087 2026-05-08 15:06:23
W0SUN-8 SYTTSX 1778249182.83758 2026-05-08 15:06:22
KE0NKL-9 S8UYTT 1778249134.17795 2026-05-08 15:05:34
K0ECO-9 S8TYYZ 1778249134.68799 2026-05-08 15:05:34
W0SUN-8 SYTSYP 1778249133.57773 2026-05-08 15:05:33
WA0DE-9 S9RSVQ 1778249065.14252 2026-05-08 15:04:25
KE0NKL-9 S8UYWV 1778249023.07378 2026-05-08 15:03:43
K0ECO-9 S8UPPZ 1778249018.10333 2026-05-08 15:03:38
KE0NKL-9 S9PPPS 1778248993.01426 2026-05-08 15:03:13
AB0Z-9 SYSRVT 1778248953.86714 2026-05-08 15:02:33
W0AJO-13 SYRRST 1778248876.89964 2026-05-08 15:01:16
KE0SMR-9 SXUXWT 1778248848.5694 2026-05-08 15:00:48
KE0YTD-9 S9STUP 1778248847.84181 2026-05-08 15:00:47
KE0SMR-9 SXUXTY 1778248798.77675 2026-05-08 14:59:58
KE0NKL-9 S8UWQX 1778248743.18198 2026-05-08 14:59:03
KE0SMR-9 SXUXRR 1778248743.90899 2026-05-08 14:59:03
KE0NKL-9 S8UVXR 1778248710.17992 2026-05-08 14:58:30
KC5W SYSRSQ 1778248640.12225 2026-05-08 14:57:20
W0SUN-8 SYSURY 1778248639.77972 2026-05-08 14:57:19
KE0SMR-9 SXUWSP 1778248575.41938 2026-05-08 14:56:15
W0SUN-8 SYSTVQ 1778248549.00943 2026-05-08 14:55:49
KE0YTD-9 S9STTY 1778248514.15174 2026-05-08 14:55:14
K0ECO-9 S8TVSZ 1778248482.15062 2026-05-08 14:54:42
W0SUN-8 SYSSYU 1778248481.63875 2026-05-08 14:54:41
W0SUN-8 SYSSTP 1778248445.49002 2026-05-08 14:54:05
KE0YTD-9 S9SURW 1778247285.32137 2026-05-08 14:34:45
KC0QD-9 S9TTTT 1778247264.68963 2026-05-08 14:34:24
WA0DE-9 S9RSVQ 1778247261.6118 2026-05-08 14:34:21
KC5W SYSRSQ 1778242553.98633 2026-05-08 13:15:53
K5RHD-10 APMI06 1778242506.52144 2026-05-08 13:15:06
WA0DE-9 APMI0 1778242479.14064 2026-05-08 13:14:39
KC0FAC-7 SXTWPY 1778242435.97377 2026-05-08 13:13:55
KB9UZO-2 APN000 1778242301.78618 2026-05-08 13:11:41
K5RHD-7 S9UPWQ 1778242184.15792 2026-05-08 13:09:44
WA0DE-9 S9RSVQ 1778242171.36197 2026-05-08 13:09:31
N0SZ-2 APMI06 1778242170.98747 2026-05-08 13:09:30
W0AJO-13 SYRRST 1778241670.26484 2026-05-08 13:01:10
K5RHD-10 APMI06 1778241662.54097 2026-05-08 13:01:02
pi@digipi:~/local/share/direwolf-dashboard $ sqlite3 -header -column $HOME/local/share/direwolf-dashboard/packets.db "
SELECT
callsign,
last_seen,
latitude,
longitude,
packet_count,
datetime(last_seen, 'unixepoch', 'localtime') AS GMT_last_seen
FROM stations
WHERE last_seen IS NOT NULL
ORDER BY GMT_last_seen DESC;
"
callsign last_seen latitude longitude packet_count GMT_last_seen
--------- ---------------- ---------------- ----------------- ------------ -------------------
W0SUN-8 1778250417.86065 39.7193333333333 -104.2375 11 2026-05-08 15:26:57
KI6WGK-9 1778250382.40328 39.545 -104.764166666667 92 2026-05-08 15:26:22
N0SZ-2 1778250272.79263 39.2648333333333 -105.114166666667 21 2026-05-08 15:24:32
WA0DE-9 1778249385.35479 39.3935 -104.674833333333 74 2026-05-08 15:09:45
KE0NKL-9 1778249385.97395 39.033 -104.837166666667 78 2026-05-08 15:09:45
ECRA-1 1778249296.29909 38.937 -104.596 46 2026-05-08 15:08:16
WT0R-9 1778249183.35087 39.675 -104.758333333333 38 2026-05-08 15:06:23
K0ECO-9 1778249134.68799 38.8325 -104.7375 8 2026-05-08 15:05:34
AB0Z-9 1778248953.86714 39.544 -104.7695 1 2026-05-08 15:02:33
W0AJO-13 1778248876.89964 39.3723333333333 -104.801333333333 14 2026-05-08 15:01:16
KE0SMR-9 1778248848.5694 38.979 -104.834333333333 19 2026-05-08 15:00:48
KE0YTD-9 1778248847.84181 39.575 -104.846 27 2026-05-08 15:00:47
KC5W 1778248640.12225 39.5385 -105.015333333333 53 2026-05-08 14:57:20
KC0QD-9 1778247264.68963 39.7406666666667 -104.8375 1 2026-05-08 14:34:24
K5RHD-10 1778242506.52144 39.845 -105.085666666667 113 2026-05-08 13:15:06
KC0FAC-7 1778242435.97377 38.7848333333333 -104.745833333333 18 2026-05-08 13:13:55
KB9UZO-2 1778242301.78618 38.9396666666667 -104.624666666667 1 2026-05-08 13:11:41
K5RHD-7 1778242184.15792 39.8451666666667 -105.085833333333 24 2026-05-08 13:09:44
KF0EYS-9 1778183482.65534 39.5805 -105.059166666667 7 2026-05-07 20:51:22
WD4IXD-2 1778183162.50722 39.5126666666667 -105.015833333333 12 2026-05-07 20:46:02
K0TOC 1778183003.68047 39.5703333333333 -105.327333333333 13 2026-05-07 20:43:23
SMS 1778182940.72635 40.4085 -149.717 32 2026-05-07 20:42:20
WI0K 1778182935.84499 39.7906666666667 -104.747333333333 493 2026-05-07 20:42:15
WA6IFI-12 1778182188.19473 38.7721666666667 -104.9925 27 2026-05-07 20:29:48
WD0HXN-9 1778181946.12641 40.0006666666667 -105.0365 1 2026-05-07 20:25:46
N0GMC-9 1778181620.53537 39.779 -104.926 9 2026-05-07 20:20:20
W1AMS-9 1778181292.47083 39.4141666666667 -104.869166666667 32 2026-05-07 20:14:52
SV1GGY-1 1778180925.85914 37.9437371037944 23.7704016003108 4 2026-05-07 20:08:45
K6BUB 1778180013.01146 38.8461666666667 -104.721333333333 1 2026-05-07 19:53:33
J73R 1778179813.58572 15.412 -61.419 3 2026-05-07 19:50:13
TA2CAX-7 1778179764.41269 40.0765 32.8346666666667 2 2026-05-07 19:49:24
N0RAP-7 1778179691.16177 38.9553333333333 -104.728833333333 38 2026-05-07 19:48:11
ANSRVR 1778179532.5212 23 2026-05-07 19:45:32
KE0ZAB-1 1778179513.31907 4 2026-05-07 19:45:13
N5OBC-9 1778179441.16934 1 2026-05-07 19:44:01
OM1ASZ-7 1778179387.11176 48.159 17.0645 3 2026-05-07 19:43:07
N5CWH 1778179255.24937 2 2026-05-07 19:40:55
SO9TA-7 1778179229.03137 1 2026-05-07 19:40:29
WE0FUN-1 1778179223.05674 5 2026-05-07 19:40:23
KJ0CFW-2 1778179189.88604 38.732 -104.687666666667 18 2026-05-07 19:39:49
KD8ATF-5 1778179173.3309 2 2026-05-07 19:39:33
KB2YZV-10 1778179053.09679 3 2026-05-07 19:37:33
TA2BCO-10 1778178966.07674 1 2026-05-07 19:36:06
AC0XW-9 1778178925.97131 39.824 -105.058 7 2026-05-07 19:35:25
APRSPH 1778178875.98655 2 2026-05-07 19:34:35
KD2QQM-8 1778178874.2788 2 2026-05-07 19:34:34
YM2KDZ 1778178873.00015 2 2026-05-07 19:34:33
EB2GKK 1778178758.57458 42.8405 -2.5125 1 2026-05-07 19:32:38
M0NPQ-10 1778178752.61611 52.6018124255105 1.72812567270284 2 2026-05-07 19:32:32
WA5LUY-10 1778164867.39874 34.4705 -93.1208333333333 2 2026-05-07 15:41:07
WA5LUY-11 1778159254.81607 2 2026-05-07 14:07:34
WA7GMX-2 1778156953.74935 47.4378409454855 -122.587489433643 1 2026-05-07 13:29:13
KE0MIC-9 1778084235.70902 38.9116666666667 -104.6275 12 2026-05-06 17:17:15
WY0RS-9 1778084140.73041 39.9135 -105.108 27 2026-05-06 17:15:40
W0RMT-1 1778083943.99184 39.9768333333333 -105.147833333333 17 2026-05-06 17:12:23
KE0HXD-7 1778083708.49343 39.7688333333333 -104.810166666667 26 2026-05-06 17:08:28
REPEAT 1778083410.74499 37.364 -78.84 225 2026-05-06 17:03:30
FIND 1778082764.15255 46.1733333333333 -148.575166666667 48 2026-05-06 16:52:44
KE0OTQ-9 1778082505.20978 39.7255 -104.789166666667 145 2026-05-06 16:48:25
WI0K-7 1778082481.41006 39.7906666666667 -104.747333333333 52 2026-05-06 16:48:01
MPAD 1778081939.70717 51.864 9.59133333333333 32 2026-05-06 16:38:59
WD4IXD-12 1778081741.99054 39.0895 -105.768166666667 24 2026-05-06 16:35:41
W0NED 1778060119.0412 40.0351666666667 -105.5405 32 2026-05-06 10:35:19
KK0X-10 1778059866.48963 39.5691666666667 -104.9175 51 2026-05-06 10:31:06
WQ8M-9 1778059866.83777 39.558 -104.794166666667 10 2026-05-06 10:31:06
KF0HEG-9 1778015628.56097 40.0353333333333 -105.055333333333 13 2026-05-05 22:13:48
KF0KBL-1 1778015549.24327 39.9383333333333 -105.046833333333 4 2026-05-05 22:12:29
SIMLA 1778015537.61656 39.0996666666667 -104.0345 75 2026-05-05 22:12:17
NO5L 1778015511.16377 38.865 -104.812666666667 1 2026-05-05 22:11:51
N6JPH-9 1778015469.58363 39.6477767335388 -105.180523251235 4 2026-05-05 22:11:09
KC0CNT-9 1778015464.80755 39.6866666666667 -105.0965 3 2026-05-05 22:11:04
HUGOCO 1778015462.77811 39.0541666666667 -103.480333333333 23 2026-05-05 22:11:02
AC0ED 1778015431.22755 38.3214029304029 -104.716380952381 81 2026-05-05 22:10:31
NCFPD 1778015394.55413 39.448 -104.206666666667 63 2026-05-05 22:09:54
KF0ILW-9 1778015350.37403 39.751 -104.9405 3 2026-05-05 22:09:10
AD0HO-7 1778015330.8555 39.8128333333333 -105.128666666667 4 2026-05-05 22:08:50
KB0WYT-9 1778015291.57916 40.1456666666667 -103.5845 20 2026-05-05 22:08:11
AF4IG-8 1778015285.37297 40.03 -104.974666666667 22 2026-05-05 22:08:05
W3OO-1 1778015244.0501 39.6175005119104 -104.901298414915 13 2026-05-05 22:07:24
W0KDE-11 1778015219.75117 39.2725 -104.191166666667 21 2026-05-05 22:06:59
KJ7MKX-9 1778015210.21365 39.4206666666667 -104.888333333333 8 2026-05-05 22:06:50
AI0J-1 1778015180.15634 39.9028333333333 -105.3805 10 2026-05-05 22:06:20
N0IGD 1778015044.2198 40.4166666666667 -105.116833333333 19 2026-05-05 22:04:04
PVLY 1778015031.57018 39.1848333333333 -104.518666666667 33 2026-05-05 22:03:51
W0OOD-2 1778014959.57008 38.924 -104.834833333333 13 2026-05-05 22:02:39
W0AJO 1778014902.22936 39.4021666666667 -104.617166666667 19 2026-05-05 22:01:42
KF0IGK-7 1778014782.8017 39.5918333333333 -104.969833333333 18 2026-05-05 21:59:42
K5KTI-1 1778014773.7783 38.904 -104.7655 27 2026-05-05 21:59:33
K0BE-9 1778014236.92543 38.725 -104.731 6 2026-05-05 21:50:36
KD0GWT 1778014022.59082 39.9235 -105.023666666667 2 2026-05-05 21:47:02
WT0Z-9 1778013452.33062 38.8886666666667 -106.115333333333 2 2026-05-05 21:37:32
KF6PMD-7 1778013154.90144 40.0108333333333 -105.072833333333 1 2026-05-05 21:32:34
KB0TVJ-1 1778013142.8923 40.0541666666667 -105.207 7 2026-05-05 21:32:22
BADGR 1778012990.59107 39.0503333333333 -105.513833333333 13 2026-05-05 21:29:50
K0AKK-9 1778012690.21951 40.4791666666667 -104.951333333333 4 2026-05-05 21:24:50
N7MJ-1 1778012653.61322 41.1358333333333 -104.7455 2 2026-05-05 21:24:13
AD0E 1778012590.78593 38.9435 -104.820166666667 4 2026-05-05 21:23:10
N0HAX 1778012308.61199 38.2998333333333 -104.578166666667 13 2026-05-05 21:18:28
W0SUN-15 1778012237.2713 39.5563333333333 -104.898166666667 2 2026-05-05 21:17:17
KF0BPN-9 1778012215.72417 39.6723333333333 -105.3615 3 2026-05-05 21:16:55
AE0EW-7 1778012148.16223 1 2026-05-05 21:15:48
N0GQ-9 1778011148.80843 39.3546666666667 -104.667666666667 5 2026-05-05 20:59:08
AC0XW-1 1778010927.79185 39.824 -105.058833333333 1 2026-05-05 20:55:27
KB7OKL-1 1778010759.42961 39.5576025641026 -104.793527472527 16 2026-05-05 20:52:39
W0OER-7 1778009848.71158 40.1606666666667 -105.055166666667 1 2026-05-05 20:37:28
N7MJ-9 1777996716.59056 41.1325 -104.779333333333 1 2026-05-05 16:58:36
N7UW-1 1777996704.60163 41.097 -105.9765 1 2026-05-05 16:58:24
N0XGA-9 1777996586.37296 38.9393333333333 -104.760166666667 2 2026-05-05 16:56:26
K0JSC-9 1777996313.64439 38.234 -104.607666666667 1 2026-05-05 16:51:53
KE0VH-2 1777989411.15236 39.3805 -104.863166666667 16 2026-05-05 14:56:51
WB0MH-1 1777988326.13622 40.4526666666667 -105.079666666667 6 2026-05-05 14:38:46
W0WAL-1 1777986494.67827 40.4383333333333 -104.968333333333 3 2026-05-05 14:08:14
QRX 1777982690.36671 6 2026-05-05 13:04:50
W0WAL-9 1777982627.83914 40.5136666666667 -104.9915 6 2026-05-05 13:03:47
AC0VP-10 1777980579.78627 39.4268333333333 -105.427666666667 1 2026-05-05 12:29:39
WQ8M-1 1777979442.89266 39.5289120879121 -104.780573260073 20 2026-05-05 12:10:42
WI0K-4 1777972588.3286 1 2026-05-05 10:16:28
pi@digipi:~/local/share/direwolf-dashboard $
William Tracy
DELETE FROM packets WHERE timestamp < strftime('%s','now','-8 hours');
DELETE FROM stations WHERE last_seen < strftime('%s','now','-8 hours');
VACUUM;"
pi@digipi:~/config/direwolf-dashboard $ sudo reboot
pi@digipi:~/config/direwolf-dashboard $ Read from remote host 10.0.0.232: Connection reset by peer
Connection to 10.0.0.232 closed.
client_loop: send disconnect: Broken pipe
wptracy@Williams-Mac-mini ~ %
William Tracy
To update a running installation:
cd ~/direwolf-dashboard
git pull
uv pip install -e .
Dan Soule
William Tracy
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 1959 100 1959 0 0 5864 0 --:--:-- --:--:-- --:--:-- 5882
Installing rpi-clone into /usr/local/sbin ...
Downloading rpi-clone from https://raw.githubusercontent.com/geerlingguy/rpi-clone/master/rpi-clone ... done
Installing rpi-clone into /usr/local/sbin ... done
Downloading rpi-clone-setup from https://raw.githubusercontent.com/geerlingguy/rpi-clone/master/rpi-clone-setup ... done
Installing rpi-clone-setup into /usr/local/sbin ... done
rpi-clone installed
pi@digipi:~ $ lsblk
NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS
sda 8:0 1 7.3G 0 disk
├─sda1 8:1 1 512M 0 part
└─sda2 8:2 1 5G 0 part
mmcblk0 179:0 0 7.3G 0 disk
├─mmcblk0p1 179:1 0 512M 0 part /boot/firmware
└─mmcblk0p2 179:2 0 6.8G 0 part /
pi@digipi:~ $
pi@digipi:~/direwolf-dashboard $ git pull
remote: Enumerating objects: 533, done.
remote: Counting objects: 100% (26/26), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 533 (delta 23), reused 26 (delta 23), pack-reused 507 (from 1)
Receiving objects: 100% (533/533), 984.54 KiB | 1.93 MiB/s, done.
Resolving deltas: 100% (303/303), completed with 10 local objects.
From https://github.com/hemna/direwolf-dashboard
7c8ad53..066de52 master -> origin/master
* [new branch] feature/configurable-storage -> origin/feature/configurable-storage
* [new branch] feature/gpx-overlay -> origin/feature/gpx-overlay
ad5470d..9b3ecde feature/library-pattern -> origin/feature/library-pattern
* [new tag] v1.0.3 -> v1.0.3
* [new tag] 1.0.4 -> 1.0.4
* [new tag] v1.0.2 -> v1.0.2
* [new tag] v1.0.5 -> v1.0.5
* [new tag] v1.0.6 -> v1.0.6
Auto-merging src/direwolf_dashboard/static/index.html
CONFLICT (content): Merge conflict in src/direwolf_dashboard/static/index.html
error: could not apply e33194a... digipi
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply e33194a... digipi
pi@digipi:~/direwolf-dashboard $ git status
interactive rebase in progress; onto 066de52
Last command done (1 command done):
pick e33194a digipi
No commands remaining.
You are currently rebasing branch 'master' on '066de52'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: src/direwolf_dashboard/static/index.html
no changes added to commit (use "git add" and/or "git commit -a")
pi@digipi:~/direwolf-dashboard $ git log --oneline -10
066de52 (HEAD, origin/master, origin/HEAD) feat: add GPX track export for stations
db5cec2 (tag: v1.0.6) chore: bump version to 1.0.6, update changelog
c85a8fb feat: simplify packet log to show/hide toggle with drag resize
6c6bcfb feat: add clear-data FAB on map with 'dont ask again' option
05cfbd7 fix: address code review findings across backend modules
2fd18d7 feat: add port client monitor implementation plan
3b296a4 Address spec review feedback: fix ambiguities and edge cases
75e732e Add port client monitor design spec
cc84860 Fix missing wsproto dependency: switch to websockets
4f06ed1 (tag: v1.0.5) Add APRS Dashboard link to About modal
pi@digipi:~/direwolf-dashboard $ git add src/direwolf_dashboard/static/index.html
pi@digipi:~/direwolf-dashboard $ git rebase --continue
[detached HEAD 528dff3] digipi
1 file changed, 8 insertions(+)
Successfully rebased and updated refs/heads/master.
Craig
will be fixed in next beta (or final release, or both) - or git pull in ~/direwolf-dashboard - correct.
-craig
KM6LYW
--
You received this message because you are subscribed to the Google Groups "DigiPi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to digipi+un...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/digipi/cae7ed0c-ee03-4477-a29f-481a93569263n%40googlegroups.com.