diff --git a/ChangeLog.txt b/ChangeLog.txt index e3180666..950696df 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- -Version 1.8 release candidate 1 2022-10-07 +Version 1.8 2022-11-08 ------------------------------------------------------------------------------- GUI: @@ -11,6 +11,12 @@ GUI: - Required device driver files are now automatically transferred to the pyboard when a task or hardware definition is uploaded. +- Hardware definition files are now stored in a hardware_definitions folder + not the generic config folder. + +- pyboards can how be hidden so they do not show up in board select GUI menus + by naming them _hidden_ in the setups tab. + - Various small improvements and bug fixes. Framework: @@ -30,10 +36,14 @@ Framework: - Added uRFID device class for controlling Priority 1 Designs RFID module. +- Added print_variables function for printing variable values to the data + log as a json formatted string. + Data import: -- Added session_dataframe function for generating a pandas dataframe from - a pyControl data file. +- Added session_dataframe() function for generating a pandas dataframe from + a pyControl data file and experiment_dataframe() for generating a pandas + dataframe from an experiment data folder. ------------------------------------------------------------------------------- Version 1.7.2 2022-06-30 diff --git a/gui/settings.py b/gui/settings.py index d0ffd226..3daf0b8b 100644 --- a/gui/settings.py +++ b/gui/settings.py @@ -1,7 +1,7 @@ import os import json -VERSION = "1.8rc1" +VERSION = "1.8" top_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Top level pyControl folder. dirs = { diff --git a/pyControl/framework.py b/pyControl/framework.py index 2ec4845d..36025ab3 100644 --- a/pyControl/framework.py +++ b/pyControl/framework.py @@ -3,7 +3,7 @@ from . import state_machine as sm from . import hardware as hw -VERSION = '1.8rc1' +VERSION = '1.8' class pyControlError(BaseException): # Exception for pyControl errors. pass diff --git a/readme.txt b/readme.txt index 28987244..6e767c0c 100644 --- a/readme.txt +++ b/readme.txt @@ -4,17 +4,18 @@ For more information please see the Docs: http://pycontrol.readthedocs.io/ Repository contents: -gui : Graphical user interface -com : Serial communication and data logging -config : Configuration files edited by user -data : Behavioural data. -experiments : Experiment definition files. -devices : pyControl hardware classes (uploaded to pyboard). -pyControl : pyControl framework (uploaded to pyboard). -tasks : Task definition files -tools : Tools for importing and visualising pycontrol data -pyControl_GUI.py : Python script to launch the GUI. +gui : Graphical user interface +com : Serial communication and data logging +config : Configuration files +data : Behavioural data +experiments : Experiment definition files +devices : Hardware device classes +pyControl : pyControl framework +tasks : User task definition files +hardware_defintions : User hardware definition files +tools : Tools for importing and visualising pycontrol data +pyControl_GUI.py : Python script to launch the GUI -Version: v1.8rc1 +Version: v1.8 ---------------