curious.bio/planktoscope
curious.bio/planktoscope
9
0
Fork 0
Code Issues 10 Pull requests Packages Projects 7 Releases Wiki Activity

light: fix typo

Browse source 
imager: format metadata.json
This commit is contained in:
Romain Bazile 2020-12-17 17:33:42 +01:00
parent cd03960332
commit 0bdb95b607
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/planktoscope/imager.py
View file

@ -606,7 +606,7 @@ class ImagerProcess(multiprocessing.Process):
logger.info("Exporting the metadata to a metadata.json") logger.info("Exporting the metadata to a metadata.json")
metadata_filepath = os.path.join(self.__export_path, "metadata.json") metadata_filepath = os.path.join(self.__export_path, "metadata.json")
with open(metadata_filepath, "w") as metadata_file: with open(metadata_filepath, "w") as metadata_file:
json.dump(self.__global_metadata, metadata_file) json.dump(self.__global_metadata, metadata_file, indent="4")
logger.debug( logger.debug(
f"Metadata dumped in {metadata_file} are {self.__global_metadata}" f"Metadata dumped in {metadata_file} are {self.__global_metadata}"
) )
@ -654,6 +654,8 @@ class ImagerProcess(multiprocessing.Process):
logger.debug(f"Copying the image from the temp file to {filename_path}") logger.debug(f"Copying the image from the temp file to {filename_path}")
shutil.copy("/dev/shm/mjpeg/image.jpg", filename_path) shutil.copy("/dev/shm/mjpeg/image.jpg", filename_path)
# TODO Try to stop the camera streaming and display instead each captured image
# os.rename("/dev/shm/mjpeg/image.jpg", "/dev/shm/mjpeg/cam.jpg")
logger.debug("Syncing the disk") logger.debug("Syncing the disk")
os.sync() os.sync()

2
scripts/planktoscope/light.py
View file

@ -144,8 +144,6 @@ def error():
def interrupted(): def interrupted():
with smbus.SMBus(1) as bus: with smbus.SMBus(1) as bus:
setRGBOff()
time.sleep(1)
setRGBColor(bus, EffectColor.Yellow) setRGBColor(bus, EffectColor.Yellow)
setRGBSpeed(bus, 3) setRGBSpeed(bus, 3)
setRGBEffect(bus, Effect.Water) setRGBEffect(bus, Effect.Water)