Skip to content
Snippets Groups Projects
Commit c58bea19 authored by Lennard's avatar Lennard
Browse files

Remove debug info and add check for overwriting previous commit

parent eafb360c
No related branches found
No related tags found
No related merge requests found
Pipeline #775 passed
...@@ -4,3 +4,4 @@ CHANGELOG.md ...@@ -4,3 +4,4 @@ CHANGELOG.md
profiling.log profiling.log
data/data data/data
data.zip data.zip
__pycache__/**
\ No newline at end of file
...@@ -152,8 +152,6 @@ def main(config: Any) -> None: ...@@ -152,8 +152,6 @@ def main(config: Any) -> None:
last_write = time.time() last_write = time.time()
data = np.zeros((8,)) data = np.zeros((8,))
n = 0 n = 0
recv1, recv2 = None, None
off1, off2 = None, None
while datetime.datetime.now() + datetime.timedelta(seconds=delta_time) < end_time: while datetime.datetime.now() + datetime.timedelta(seconds=delta_time) < end_time:
try: try:
...@@ -162,30 +160,24 @@ def main(config: Any) -> None: ...@@ -162,30 +160,24 @@ def main(config: Any) -> None:
con1.write(1) con1.write(1)
# offsets for writing data in correct column # offsets for writing data in correct column
off1 = 0 if int(convert(con1.readline())) == 1.0 else 4 off = 0 if int(convert(con1.readline())) == 1.0 else 4
# read data # read data
for i in range(4): for i in range(4):
recv1 = con1.readline() new_data[i + off] += float(convert(con1.readline()))
new_data[i + off1] += float(convert(recv1))
recv1 = None
off1 = None
con2.write(1) con2.write(1)
# offsets for writing data in correct column # offsets for writing data in correct column
off2 = 0 if int(convert(con2.readline())) == 1.0 else 4 off = 0 if int(convert(con2.readline())) == 1.0 else 4
for i in range(4): for i in range(4):
recv2 = con2.readline() new_data[i + off] += float(convert(con2.readline()))
new_data[i + off2] += float(convert(recv2))
recv2 = None
off2 = None
n += 1 n += 1
data = new_data data = new_data
except (TypeError, ValueError): except (TypeError, ValueError):
# may occur if no data was read over serial, but why??? # may occur if no data was read over serial
logger.info(f"Didn't receive data from arduino, off1: {off1}, off2: {off2}, recv1: {recv1}, recv2: {recv2}", exc_info=True) logger.info("Didnt receive data from arduino", exc_info=True)
if time.time() - last_write > delta_time: if time.time() - last_write > delta_time:
# write data # write data
...@@ -197,9 +189,6 @@ def main(config: Any) -> None: ...@@ -197,9 +189,6 @@ def main(config: Any) -> None:
fh[0].doRollover() # rollover the current data log file fh[0].doRollover() # rollover the current data log file
Path(f"{Path(__file__).parent}/data/data").unlink(missing_ok=True) # delete old data file
logger.warning("Finished") logger.warning("Finished")
......
...@@ -6,22 +6,28 @@ while pidof -x "python3 main.py">/dev/null; do ...@@ -6,22 +6,28 @@ while pidof -x "python3 main.py">/dev/null; do
echo "python3 main.py is still running, checking in 60 seconds." echo "python3 main.py is still running, checking in 60 seconds."
sleep 60 sleep 60
done done
sleep 10
du -hc --max-depth=1 .
scripts/./write.bash
sleep 10 sleep 10
python3 measure.py scripts/./write.bash
sleep 10 sleep 10
echo -e "Starting python script:\n" echo -e "Starting python script:\n"
python3 main.py if python3 main.py then
rm data/data
fi
echo -e "\nPython script ended" echo -e "\nPython script ended"
git pull git pull
last_commit_name = $(git log -1 --pretty=%B | cat)
if [[ $string == *"New data"* ]]; then
# check if the last commit was "New data"
# if yes overwrite the commit
git reset --soft HEAD~1
fi
git add . git add .
git commit -m "New data" && git push --force git commit -m "New data" && git push --force
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment