From a31ea1d6c2b662ded7bbd8f87056600242aa7eb9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 28 Jan 2020 00:34:09 +0100
Subject: [PATCH] Some more bugfixes
---
.idea/deployment.xml | 14 --------------
.idea/inspectionProfiles/profiles_settings.xml | 6 ------
.idea/misc.xml | 7 -------
.idea/modules.xml | 9 ---------
.idea/tmtc.iml | 9 ---------
.idea/vcs.xml | 7 -------
sendreceive/OBSW_SequentialSenderReceiver.py | 2 +-
utility/OBSW_TmTcPrinter.py | 12 ++++++++++--
8 files changed, 11 insertions(+), 55 deletions(-)
delete mode 100644 .idea/deployment.xml
delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/tmtc.iml
delete mode 100644 .idea/vcs.xml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
deleted file mode 100644
index 488b56d..0000000
--- a/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="PublishConfigData">
- <serverData>
- <paths name="pi@RemoteHome">
- <serverdata>
- <mappings>
- <mapping local="$PROJECT_DIR$" web="/" />
- </mappings>
- </serverdata>
- </paths>
- </serverData>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <settings>
- <option name="USE_PROJECT_PROFILE" value="false" />
- <version value="1.0" />
- </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index cbb5b0e..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="JavaScriptSettings">
- <option name="languageLevel" value="ES6" />
- </component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index a9b2d29..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/../generators/.idea/generators.iml" filepath="$PROJECT_DIR$/../generators/.idea/generators.iml" />
- <module fileurl="file://$PROJECT_DIR$/.idea/tmtc.iml" filepath="$PROJECT_DIR$/.idea/tmtc.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/tmtc.iml b/.idea/tmtc.iml
deleted file mode 100644
index 9f2c7c6..0000000
--- a/.idea/tmtc.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="generators" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index f245aa7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/sendreceive/OBSW_SequentialSenderReceiver.py b/sendreceive/OBSW_SequentialSenderReceiver.py
index fb96c0c..eff8961 100644
--- a/sendreceive/OBSW_SequentialSenderReceiver.py
+++ b/sendreceive/OBSW_SequentialSenderReceiver.py
@@ -46,7 +46,7 @@ class SequentialCommandSenderReceiver(CommandSenderReceiver):
self.start_time = time.time()
self.checkForTimeout()
if self.doPrintToFile:
- print("Exporting output to log file")
+ print("Exporting output to log file.")
self.tmtcPrinter.printToFile()
self.comInterface.performListenerMode()
diff --git a/utility/OBSW_TmTcPrinter.py b/utility/OBSW_TmTcPrinter.py
index 3d3f308..513f0d6 100644
--- a/utility/OBSW_TmTcPrinter.py
+++ b/utility/OBSW_TmTcPrinter.py
@@ -8,6 +8,8 @@
@brief
Class that performs all printing functionalities
"""
+import os
+
from config import OBSW_Config as g
@@ -153,10 +155,16 @@ class TmtcPrinter:
if self.doPrintToFile:
self.fileBuffer = self.fileBuffer + self.printBuffer + "\n"
- def printToFile(self, logName="tmtc_log.txt", clearFileBuffer=False):
- file = open(logName, 'w')
+ def printToFile(self, logName="log/tmtc_log.txt", clearFileBuffer=False):
+ try:
+ file = open(logName, 'w')
+ except FileNotFoundError:
+ print("Log directory does not exists, creating log folder.")
+ os.mkdir('log')
+ file = open(logName, 'w')
file.write(self.fileBuffer)
if clearFileBuffer:
self.fileBuffer = ""
+ print("Log file written to " + logName)
file.close()
--
GitLab