random commit

Author: DematteisGiacomo

tests/on_target/scripts/memory_plot_generator.py

@@ -6,32 +6,39 @@
 import os
 import sys
 
+def append_to_memory_csv(filename, used, total, current_date, output_dir):
+    """Append memory data to a CSV file."""
+    data = {'Date': current_date, 'Used (B)': used, 'Total (B)': total, 'Usage (%)': (used/total)*100}
+    df = pd.DataFrame([data])
+    
+    csv_path = os.path.join(output_dir, filename)
+    
+    if os.path.exists(csv_path):
+        print(f"CSV exists at {csv_path}, appending data")
+        # Read existing data
+        existing_df = pd.read_csv(csv_path)
+        print(f"Existing data:\n{existing_df}")
+        
+        # Combine existing and new data
+        combined_df = pd.concat([existing_df, df], ignore_index=True)
+        print(f"Combined data:\n{combined_df}")
+        
+        # Write back the complete dataset
+        combined_df.to_csv(csv_path, index=False)
+    else:
+        print(f"Creating new CSV at {csv_path}")
+        df.to_csv(csv_path, index=False)
+
 def append_to_csv(ram_used, ram_total, flash_used, flash_total, output_dir):
     """Append memory usage data to CSV files with timestamps."""
     current_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
     # Ensure output directory exists
     os.makedirs(output_dir, exist_ok=True)
 
-    # RAM CSV
-    ram_csv = os.path.join(output_dir, "ram_history.csv")
-    ram_data = {'Date': current_date, 'Used (B)': ram_used, 'Total (B)': ram_total, 'Usage (%)': (ram_used/ram_total)*100}
-    ram_df = pd.DataFrame([ram_data])
-    
-    if os.path.exists(ram_csv):
-        ram_df.to_csv(ram_csv, mode='a', header=False, index=False)
-    else:
-        ram_df.to_csv(ram_csv, mode='w', header=True, index=False)
-    
-    # Flash CSV
-    flash_csv = os.path.join(output_dir, "flash_history.csv")
-    flash_data = {'Date': current_date, 'Used (B)': flash_used, 'Total (B)': flash_total, 'Usage (%)': (flash_used/flash_total)*100}
-    flash_df = pd.DataFrame([flash_data])
-    
-    if os.path.exists(flash_csv):
-        flash_df.to_csv(flash_csv, mode='a', header=False, index=False)
-    else:
-        flash_df.to_csv(flash_csv, mode='w', header=True, index=False)
+    # Append to RAM and Flash CSVs
+    append_to_memory_csv("ram_history.csv", ram_used, ram_total, current_date, output_dir)
+    append_to_memory_csv("flash_history.csv", flash_used, flash_total, current_date, output_dir)
 
 def generate_memory_plots(output_dir):
     """Generate HTML plots from the CSV data."""
@@ -41,7 +48,9 @@ def generate_memory_plots(output_dir):
     # RAM Plot
     ram_csv = os.path.join(output_dir, "ram_history.csv")
     if os.path.exists(ram_csv):
+        print(f"Reading RAM CSV for plotting from: {ram_csv}")
         df_ram = pd.read_csv(ram_csv)
+        print(f"RAM data for plotting:\n{df_ram}")
         df_ram['Date'] = pd.to_datetime(df_ram['Date'])
 
         # Calculate y-axis range for RAM

tests/on_target/scripts/update_memory_badges.sh

@@ -29,31 +29,53 @@ handle_error() {
     exit 0
 }
 
-# Generate badge files using Python script
-echo "Generating badge files..."
-./tests/on_target/scripts/parse_memory_stats.py "$BUILD_LOG" "tests/on_target" || handle_error "Failed to generate badge files"
-
-
 # Configure Git
 git config --global --add safe.directory "$(pwd)"
 git config --global user.email "github-actions@github.com"
 git config --global user.name "GitHub Actions"
 
-# Ensure the gh-pages branch exists and switch to it
+# Create a temporary directory for gh-pages content
+TEMP_DIR=$(mktemp -d)
+
+# Fetch existing CSV files from gh-pages branch
 git fetch origin gh-pages
+
+echo "Fetching existing CSV files..."
+if git show origin/gh-pages:docs/ram_history.csv > "$TEMP_DIR/ram_history.csv" 2>/dev/null; then
+    echo "Found existing RAM history:"
+    cat "$TEMP_DIR/ram_history.csv"
+else
+    echo "No existing RAM history, creating new file"
+    touch "$TEMP_DIR/ram_history.csv"
+fi
+
+if git show origin/gh-pages:docs/flash_history.csv > "$TEMP_DIR/flash_history.csv" 2>/dev/null; then
+    echo "Found existing Flash history:"
+    cat "$TEMP_DIR/flash_history.csv"
+else
+    echo "No existing Flash history, creating new file"
+    touch "$TEMP_DIR/flash_history.csv"
+fi
+
+# Generate badge files and append to existing CSV files
+echo "Generating badge files..."
+./tests/on_target/scripts/parse_memory_stats.py "$BUILD_LOG" "$TEMP_DIR" || handle_error "Failed to generate badge files"
+
+# Switch to gh-pages branch and update files
 git checkout gh-pages || handle_error "Not able to checkout gh-pages"
 git pull origin gh-pages || handle_error "Failed to pull latest gh-pages"
 
-# Stage, commit, and push changes to the branch
-cp $FLASH_BADGE_FILE $FLASH_BADGE_FILE_DEST
-cp $RAM_BADGE_FILE $RAM_BADGE_FILE_DEST
-cp $FLASH_HISTORY_CSV $FLASH_HISTORY_CSV_DEST
-cp $RAM_HISTORY_CSV $RAM_HISTORY_CSV_DEST
-cp $FLASH_PLOT_HTML $FLASH_PLOT_HTML_DEST
-cp $RAM_PLOT_HTML $RAM_PLOT_HTML_DEST
+# Copy all files to docs/
+mkdir -p docs
+cp "$TEMP_DIR"/*.json docs/
+cp "$TEMP_DIR"/*.csv docs/
+cp "$TEMP_DIR"/*.html docs/
 
 git add $FLASH_BADGE_FILE_DEST $RAM_BADGE_FILE_DEST \
     $FLASH_HISTORY_CSV_DEST $RAM_HISTORY_CSV_DEST \
     $FLASH_PLOT_HTML_DEST $RAM_PLOT_HTML_DEST
 git commit -m "Update memory usage badges"
 git push origin gh-pages
+
+# Clean up
+rm -rf "$TEMP_DIR"