From dbe829849f4e60943803b1efb582b41353a8839e Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Mon, 10 Feb 2025 15:29:18 -0600 Subject: [PATCH] Update permissions --- .gitignore | 3 +++ MercuryController/MercuryController.ino | 0 README.md | 0 src/MercuryController.py | 0 src/SimController.py | 19 +++++++++---------- src/audio/convert_all.sh | 0 src/config.json | 0 src/events-accurate.csv | 0 src/events.csv | 0 src/events_launch.csv | 0 src/events_reentry.csv | 0 src/led_mapping.csv | 0 src/scenes.csv | 0 src/servo_mapping.csv | 0 src/stars.jpg | Bin 15 files changed, 12 insertions(+), 10 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 MercuryController/MercuryController.ino mode change 100644 => 100755 README.md mode change 100644 => 100755 src/MercuryController.py mode change 100644 => 100755 src/SimController.py mode change 100644 => 100755 src/audio/convert_all.sh mode change 100644 => 100755 src/config.json mode change 100644 => 100755 src/events-accurate.csv mode change 100644 => 100755 src/events.csv mode change 100644 => 100755 src/events_launch.csv mode change 100644 => 100755 src/events_reentry.csv mode change 100644 => 100755 src/led_mapping.csv mode change 100644 => 100755 src/scenes.csv mode change 100644 => 100755 src/servo_mapping.csv mode change 100644 => 100755 src/stars.jpg diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 7c842a9..18b42b4 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /Source Audio/ /venv/ +/src/audio/ /src/video/ +.idea/ +**/__pycache__/ diff --git a/MercuryController/MercuryController.ino b/MercuryController/MercuryController.ino old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/src/MercuryController.py b/src/MercuryController.py old mode 100644 new mode 100755 diff --git a/src/SimController.py b/src/SimController.py old mode 100644 new mode 100755 index 65884c4..be86c51 --- a/src/SimController.py +++ b/src/SimController.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python + import datetime import math import sys @@ -7,7 +7,6 @@ import time import subprocess import random import csv -import serial import json # import keyboard import logging @@ -16,6 +15,9 @@ from threading import Thread from distutils.spawn import find_executable from MercuryController import * +SECONDS_PER_MINUTE = 60 +SECONDS_PER_HOUR = 3600 + class MercurySim: def __init__(self): @@ -170,9 +172,7 @@ class MercurySim: def run_scene(self, scene_number): - logging.info('') - - logging.info('{:-^40}'.format(' Starting Scene #{} '.format(scene_number))) + logging.info('\n{:-^40}'.format(' Starting Scene #{} '.format(scene_number))) scene = self.scenes[scene_number] play_video(scene['video'], loop=True, random_orientation=True) @@ -430,8 +430,6 @@ def t_time_to_seconds(t_time_val): def time_to_seconds(hours=0, minutes=0, seconds=0): # Define the constants - SECONDS_PER_MINUTE = 60 - SECONDS_PER_HOUR = 3600 total_seconds = int(hours) * SECONDS_PER_HOUR total_seconds = total_seconds + (int(minutes) * SECONDS_PER_MINUTE) total_seconds = total_seconds + int(seconds) @@ -455,11 +453,12 @@ def formatted_time(time_val): return "%02d:%02d:%02d" % (hour, minutes, seconds) -def t_time(time): - prefix = "T-" if time < 0 else "T+" - t_time = prefix + formatted_time(time) +def t_time(time_val): + prefix = "T-" if time_val < 0 else "T+" + t_time = prefix + formatted_time(time_val) return t_time + def interpolated_value(start_time, start_val, end_time, end_val, current_time, rate): multiplier = math.pow(current_time-start_time, rate) / math.pow(end_time-start_time, rate) diff --git a/src/audio/convert_all.sh b/src/audio/convert_all.sh old mode 100644 new mode 100755 diff --git a/src/config.json b/src/config.json old mode 100644 new mode 100755 diff --git a/src/events-accurate.csv b/src/events-accurate.csv old mode 100644 new mode 100755 diff --git a/src/events.csv b/src/events.csv old mode 100644 new mode 100755 diff --git a/src/events_launch.csv b/src/events_launch.csv old mode 100644 new mode 100755 diff --git a/src/events_reentry.csv b/src/events_reentry.csv old mode 100644 new mode 100755 diff --git a/src/led_mapping.csv b/src/led_mapping.csv old mode 100644 new mode 100755 diff --git a/src/scenes.csv b/src/scenes.csv old mode 100644 new mode 100755 diff --git a/src/servo_mapping.csv b/src/servo_mapping.csv old mode 100644 new mode 100755 diff --git a/src/stars.jpg b/src/stars.jpg old mode 100644 new mode 100755