Merge branch 'master' into dev

Author: ThomasAkam

controls_dialogs/example_blinker_gui_from_py.py

@@ -106,14 +106,14 @@ def __init__(self, parent, grid_layout, board, init_vars):
 
         # image
         self.picture = QtWidgets.QLabel()
-        image = QtGui.QPixmap("config/user_controls_dialogs/example_image.png")
+        image = QtGui.QPixmap("controls_dialogs/example_image.png")
         self.picture.setPixmap(image)
         layout.addWidget(self.picture, row, 0, 1, 4)
         row += 1
 
         # gif
         self.gif = QtWidgets.QLabel()
-        self.movie = QtGui.QMovie("config/user_controls_dialogs/example_movie.gif")
+        self.movie = QtGui.QMovie("controls_dialogs/example_movie.gif")
         self.gif.setMovie(self.movie)
         self.movie.start()
         layout.addWidget(self.gif, row, 0, 1, 4)

source/communication/pycboard.py

@@ -421,7 +421,6 @@ def setup_state_machine(self, sm_name, sm_dir=None, uploaded=False):
             micropython_version=self.micropython_version,
         )
         self.data_logger.reset()
-        self.timestamp = 0
 
     def get_states(self):
         """Return states as a dictionary {state_name: state_ID}"""
@@ -440,7 +439,8 @@ def start_framework(self, data_output=True):
         self.gc_collect()
         self.exec("fw.data_output = " + repr(data_output))
         self.serial.reset_input_buffer()
-        self.last_message_time = 0
+        self.last_message_time = time.time()
+        self.timestamp = 0
         self.exec_raw_no_follow("fw.run()")
         self.framework_running = True
 

source/gui/GUI_main.py

@@ -230,6 +230,7 @@ def launch_GUI():
     app = QtWidgets.QApplication(sys.argv)
     app.setStyle("Fusion")
     app.setWindowIcon(QtGui.QIcon("source/gui/icons/logo.svg"))
+    app.setAttribute(QtCore.Qt.ApplicationAttribute.AA_DontShowIconsInMenus, False)  # enable icons in mac menus
     font = QtGui.QFont()
     font.setPixelSize(get_setting("GUI", "ui_font_size"))
     app.setFont(font)

source/gui/custom_controls_dialog.py

@@ -6,7 +6,7 @@
 from copy import deepcopy
 from dataclasses import dataclass, asdict
 from pyqtgraph.Qt import QtGui, QtCore, QtWidgets
-from source.gui.settings import user_folder
+from source.gui.settings import user_folder, get_setting
 from source.gui.utility import variable_constants, null_resize, cbox_set_item, cbox_update_options
 
 
@@ -487,8 +487,27 @@ def __init__(self, parent_controls_dialog):
             widget.setLayout(layout)
             variable_tabs.addTab(widget, tab)
 
+        # the leftover section (a tab with ...) will containt a notes widget and
+        # any variables not used by the Custom Controls Dialog Editor
         leftover_widget = QtWidgets.QWidget()
         leftover_layout = QtWidgets.QGridLayout()
+
+        # notes section
+        self.parent_controls_dialog = parent_controls_dialog
+        notes_widget = QtWidgets.QWidget()
+        notes_layout = QtWidgets.QGridLayout()
+        self.notes_textbox = QtWidgets.QTextEdit()
+        self.notes_textbox.setFixedHeight(get_setting("GUI", "log_font_size") * 4)
+        self.notes_textbox.setFont(QtGui.QFont("Courier New", get_setting("GUI", "log_font_size")))
+        note_button = QtWidgets.QPushButton("Add note")
+        note_button.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        note_button.clicked.connect(self.add_note)
+        notes_layout.addWidget(self.notes_textbox, 0, 0, 1, 3)
+        notes_layout.addWidget(note_button, 1, 2)
+        notes_layout.setContentsMargins(0, 0, 0, 10)
+        notes_widget.setLayout(notes_layout)
+        leftover_layout.addWidget(notes_widget, 0, 0, 1, 4)
+
         leftover_vars = sorted(list(set(variables) - set(used_vars)), key=str.lower)
         leftover_vars = [
             v_name
@@ -498,19 +517,24 @@ def __init__(self, parent_controls_dialog):
             and not v_name.startswith("hw_")
             and v_name != "api_class"
         ]
-        if len(leftover_vars) > 0:
-            for row, var in enumerate(leftover_vars):
-                self.widget_dict[var] = Text_var(init_vars, var, var)
-                self.widget_dict[var].setBoard(parent_controls_dialog.parent_tab.board)
-                self.widget_dict[var].add_to_grid(leftover_layout, row + 1)
-            leftover_layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
-            leftover_widget.setLayout(leftover_layout)
-            variable_tabs.addTab(leftover_widget, "...")
+        for row, var in enumerate(leftover_vars):
+            self.widget_dict[var] = Text_var(init_vars, var, var)
+            self.widget_dict[var].setBoard(parent_controls_dialog.parent_tab.board)
+            self.widget_dict[var].add_to_grid(leftover_layout, row + 1)
+        leftover_layout.setRowStretch(row + 2, 1)
+        leftover_layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
+        leftover_widget.setLayout(leftover_layout)
+        variable_tabs.addTab(leftover_widget, "...")
 
         grid_layout.addWidget(variable_tabs, 0, 0, QtCore.Qt.AlignmentFlag.AlignLeft)
         grid_layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
         self.setLayout(grid_layout)
 
+    def add_note(self):
+        note_text = self.notes_textbox.toPlainText()
+        self.notes_textbox.clear()
+        self.parent_controls_dialog.parent_tab.board.data_logger.print_message(note_text, source="u")
+
 
 # GUI editor dialog. ---------------------------------------------------------
 
@@ -663,7 +687,7 @@ def add_tab(self, data=None, name=None):
         if name:
             tab_title = name
         else:
-            tab_title = f"tab-{len(self.tables)+1}"
+            tab_title = f"tab-{len(self.tables) + 1}"
         self.tables[tab_title] = new_table
         self.tabs.addTab(new_table, tab_title)
         if len(self.tables) < 2:

source/pyControl/audio.py

@@ -38,19 +38,19 @@ def __init__(self, channel=1):
     def off(self):
         self._timer.deinit()
         self._playing = False
-        self._DAC.write_timed(_off_buf, pyb.Timer(2, freq=10000), mode=pyb.DAC.NORMAL)
+        self._DAC.write_timed(_off_buf, pyb.Timer(4, freq=10000), mode=pyb.DAC.NORMAL)
 
     def sine(self, freq):  # Play a sine wave tone at the specified frequency.
-        self._DAC.write_timed(_sine_buf, pyb.Timer(2, freq=freq * _sine_len), mode=pyb.DAC.CIRCULAR)
+        self._DAC.write_timed(_sine_buf, pyb.Timer(4, freq=freq * _sine_len), mode=pyb.DAC.CIRCULAR)
 
     def square(self, freq):  # Play a square wave tone at the specified frequency.
-        self._DAC.write_timed(_sqr_buf, pyb.Timer(2, freq=freq * 2), mode=pyb.DAC.CIRCULAR)
+        self._DAC.write_timed(_sqr_buf, pyb.Timer(4, freq=freq * 2), mode=pyb.DAC.CIRCULAR)
 
     def noise(self, freq=10000):  # Play white noise with specified maximum frequency.
         self._DAC.noise(freq * 2)
 
     def click(self, timer=None):  # Play a single click.
-        self._DAC.write_timed(_click_buf, pyb.Timer(2, freq=40000), mode=pyb.DAC.NORMAL)
+        self._DAC.write_timed(_click_buf, pyb.Timer(4, freq=40000), mode=pyb.DAC.NORMAL)
 
     def clicks(self, rate):  # Play clicks at specified rate.
         self._timer.init(freq=rate)

source/pyControl/hardware.py

@@ -43,8 +43,8 @@ def get(self) -> int:
 
 IO_dict = {}  # Dictionary {ID: IO_object} containing all hardware inputs and outputs.
 
-available_timers = [3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14]  # Hardware timers not in use
-# Used timers; 1: Framework clock tick, 2: Audio write_timed, 6: DAC write_timed.
+available_timers = [3, 5, 7, 8, 9, 10, 11, 12, 13, 14]  # Hardware timers not in use.
+# Used timers; 1: Framework clock tick, 2: Rotary encoder, 4: Audio write_timed, 6: DAC write_timed.
 
 initialised = False  # Set to True once hardware has been intiialised.