From f8b3730864b3549ca7c0606626084caccba7371c Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Thu, 21 Dec 2023 21:47:38 -0500 Subject: [PATCH] Change datalogtool default folder to log folder Fix straggling documentation --- datalogtool/src/main/native/cpp/Downloader.cpp | 2 +- ntcoreffi/src/main/native/include/DataLogManager.h | 4 ++-- wpilibc/src/main/native/include/frc/DataLogManager.h | 4 ++-- .../src/main/java/edu/wpi/first/wpilibj/DataLogManager.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/datalogtool/src/main/native/cpp/Downloader.cpp b/datalogtool/src/main/native/cpp/Downloader.cpp index 9629e3b0ffe..0a8b90dceeb 100644 --- a/datalogtool/src/main/native/cpp/Downloader.cpp +++ b/datalogtool/src/main/native/cpp/Downloader.cpp @@ -27,7 +27,7 @@ Downloader::Downloader(glass::Storage& storage) : m_serverTeam{storage.GetString("serverTeam")}, - m_remoteDir{storage.GetString("remoteDir", "/home/lvuser")}, + m_remoteDir{storage.GetString("remoteDir", "/home/lvuser/logs")}, m_username{storage.GetString("username", "lvuser")}, m_localDir{storage.GetString("localDir")}, m_deleteAfter{storage.GetBool("deleteAfter", true)}, diff --git a/ntcoreffi/src/main/native/include/DataLogManager.h b/ntcoreffi/src/main/native/include/DataLogManager.h index d2635c17e40..79d73eaaec7 100644 --- a/ntcoreffi/src/main/native/include/DataLogManager.h +++ b/ntcoreffi/src/main/native/include/DataLogManager.h @@ -20,8 +20,8 @@ namespace wpi { * Centralized data log that provides automatic data log file management. It * automatically cleans up old files when disk space is low and renames the file * based either on current date/time or (if available) competition match number. - * The deta file will be saved to a USB flash drive if one is attached, or to - * /home/lvuser otherwise. + * The data file will be saved to a USB flash drive in a folder named "logs" if + * one is attached, or to /home/lvuser/logs otherwise. * * Log files are initially named "FRC_TBD_{random}.wpilog" until the DS * connects. After the DS connects, the log file is renamed to diff --git a/wpilibc/src/main/native/include/frc/DataLogManager.h b/wpilibc/src/main/native/include/frc/DataLogManager.h index 336af4a01ea..f171cd380a6 100644 --- a/wpilibc/src/main/native/include/frc/DataLogManager.h +++ b/wpilibc/src/main/native/include/frc/DataLogManager.h @@ -17,8 +17,8 @@ namespace frc { * Centralized data log that provides automatic data log file management. It * automatically cleans up old files when disk space is low and renames the file * based either on current date/time or (if available) competition match number. - * The deta file will be saved to a USB flash drive if one is attached, or to - * /home/lvuser otherwise. + * The data file will be saved to a USB flash drive in a folder named "logs" if + * one is attached, or to /home/lvuser/logs otherwise. * * Log files are initially named "FRC_TBD_{random}.wpilog" until the DS * connects. After the DS connects, the log file is renamed to diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java index be6c25224c6..d4ec796c888 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java @@ -25,8 +25,8 @@ /** * Centralized data log that provides automatic data log file management. It automatically cleans up * old files when disk space is low and renames the file based either on current date/time or (if - * available) competition match number. The deta file will be saved to a USB flash drive if one is - * attached, or to /home/lvuser otherwise. + * available) competition match number. The data file will be saved to a USB flash drive in a folder + * named "logs" if one is attached, or to /home/lvuser/logs otherwise. * *

Log files are initially named "FRC_TBD_{random}.wpilog" until the DS connects. After the DS * connects, the log file is renamed to "FRC_yyyyMMdd_HHmmss.wpilog" (where the date/time is UTC).