Index: firmware/App/Modes/SelfTests.h
===================================================================
diff -u -r125a27d5a3a116e7b7473ff180daf247270d8e57 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/SelfTests.h	(.../SelfTests.h)	(revision 125a27d5a3a116e7b7473ff180daf247270d8e57)
+++ firmware/App/Modes/SelfTests.h	(.../SelfTests.h)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file SelfTests.h
+* @file    SelfTests.h
 *
-* @author (last) Quang Nguyen
-* @date (last) 28-Jan-2021
+* @author  (last)      Sean Nash
+* @date    (last)      01-Sep-2023
 *
-* @author (original) Quang Nguyen
-* @date (original) 28-Jan-2021
+* @author  (original)  Quang Nguyen
+* @date    (original)  28-Jan-2021
 *
 ***************************************************************************/
 
@@ -31,11 +31,24 @@
 
 // ********** public definitions **********
 
+/// Payload record structure for no cartridge self-test data broadcast message
+typedef struct
+{
+    U32 timeout;                            ///< No cartridge self-test timeout (in seconds)
+    U32 countdown;                          ///< No cartridge self-test timeout countdown (in seconds)
+} SELF_TEST_NO_CARTRIDGE_PAYLOAD_T;
+
+/// Payload record structure for dry self-test data broadcast message
+typedef struct
+{
+    U32 timeout;                            ///< Dry self-test timeout (in seconds)
+    U32 countdown;                          ///< Dry self-test timeout countdown (in seconds)
+} SELF_TEST_DRY_PAYLOAD_T;
+
 // ********** public function prototypes **********
 
 void initSelfTests( void );
 void signalResumeSelfTests( void );
-void signalStopSelfTests( void );
 
 void transitionToNoCartSelfTests();
 void execNoCartSelfTests( void );
@@ -48,7 +61,10 @@
 void transitionToWetSelfTests();
 void execWetSelfTests( void );
 BOOL isWetSelfTestsPassed( void );
+U32 getWetSelfTestState( void );
 
+void handleDoorCloseAfterCartridgeInsertion( void );
+
 /**@}*/
 
 #endif