diff --git a/zephyr/modules/owntech_comparator_driver/zephyr/CMakeLists.txt b/zephyr/modules/owntech_comparator_driver/zephyr/CMakeLists.txt
index 4183e8516d6b4df943a85ef6ecc6382a2dfeeeab..0b4aa0ad2970e4b032ddcacb39959ae6b9f56f3f 100644
--- a/zephyr/modules/owntech_comparator_driver/zephyr/CMakeLists.txt
+++ b/zephyr/modules/owntech_comparator_driver/zephyr/CMakeLists.txt
@@ -1,10 +1,11 @@
 if(CONFIG_OWNTECH_COMPARATOR_DRIVER)
   # Select directory to add to the include path
-  zephyr_include_directories(./public_include)
+  zephyr_include_directories(./public_api)
   # Define the current folder as a Zephyr library
   zephyr_library()
   # Select source files to be compiled
   zephyr_library_sources(
     ./src/comparator_driver.c
+    ./public_api/comparator.c
     )
 endif()
diff --git a/zephyr/modules/owntech_comparator_driver/zephyr/public_api/comparator.c b/zephyr/modules/owntech_comparator_driver/zephyr/public_api/comparator.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba53756d4925651ab40a98ed0152af95de3bea5e
--- /dev/null
+++ b/zephyr/modules/owntech_comparator_driver/zephyr/public_api/comparator.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 LAAS-CNRS
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published by
+ *   the Free Software Foundation, either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: LGLPV2.1
+ */
+
+/**
+ * @date   2022
+ * @author Clément Foucher <clement.foucher@laas.fr>
+ */
+
+// Current module private functions
+#include "../src/comparator_driver.h"
+
+
+void comparator_init()
+{
+	comparator_gpio_init();
+	comparator_comp1_init();
+	comparator_comp3_init();
+}
diff --git a/zephyr/modules/owntech_comparator_driver/zephyr/public_include/comparator.h b/zephyr/modules/owntech_comparator_driver/zephyr/public_api/comparator.h
similarity index 100%
rename from zephyr/modules/owntech_comparator_driver/zephyr/public_include/comparator.h
rename to zephyr/modules/owntech_comparator_driver/zephyr/public_api/comparator.h
diff --git a/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.c b/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.c
index 0ef16db20e2b7d78d14e3e346531adda09b58314..42f3a390dbb6f7300c3376c083d7f5088650df0e 100644
--- a/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.c
+++ b/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 LAAS-CNRS
+ * Copyright (c) 2021-2022 LAAS-CNRS
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU Lesser General Public License as published by
@@ -18,7 +18,8 @@
  */
 
 /**
- * @author  Clément Foucher <clement.foucher@laas.fr>
+ * @date   2022
+ * @author Clément Foucher <clement.foucher@laas.fr>
  */
 
 
@@ -34,15 +35,7 @@
 #include "comparator_driver.h"
 
 
-void comparator_init()
-{
-	_comparator_gpio_init();
-	_comparator_comp1_init();
-	_comparator_comp3_init();
-}
-
-
-static void _comparator_gpio_init()
+void comparator_gpio_init()
 {
 	// TODO : use Zephyr gpio_pin_configure
 
@@ -68,7 +61,7 @@ static void _comparator_gpio_init()
 	LL_GPIO_SetPinMode(GPIOC, LL_GPIO_PIN_1, LL_GPIO_MODE_ANALOG);
 }
 
-static void _comparator_comp1_init()
+void comparator_comp1_init()
 {
 	LL_COMP_ConfigInputs(COMP1, LL_COMP_INPUT_MINUS_DAC1_CH1, LL_COMP_INPUT_PLUS_IO1);
 	LL_COMP_SetInputHysteresis(COMP1, LL_COMP_HYSTERESIS_NONE);
@@ -83,7 +76,7 @@ static void _comparator_comp1_init()
 	LL_COMP_Enable(COMP1);
 }
 
-static void _comparator_comp3_init()
+void comparator_comp3_init()
 {
 	LL_COMP_ConfigInputs(COMP3, LL_COMP_INPUT_MINUS_DAC3_CH1, LL_COMP_INPUT_PLUS_IO2);
 	LL_COMP_SetInputHysteresis(COMP3, LL_COMP_HYSTERESIS_NONE);
diff --git a/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.h b/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.h
index d8d667984cbae67c7b2c2e7386fe42d8ef53d539..18ce7109782649cc308eab6f1aa6f0bd7da68c2e 100644
--- a/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.h
+++ b/zephyr/modules/owntech_comparator_driver/zephyr/src/comparator_driver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 LAAS-CNRS
+ * Copyright (c) 2021-2022 LAAS-CNRS
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU Lesser General Public License as published by
@@ -18,7 +18,8 @@
  */
 
 /**
- * @author  Clément Foucher <clement.foucher@laas.fr>
+ * @date   2022
+ * @author Clément Foucher <clement.foucher@laas.fr>
  */
 
 #ifndef COMPARATOR_DRIVER_H_
@@ -28,9 +29,9 @@
 extern "C" {
 #endif
 
-static void _comparator_comp1_init();
-static void _comparator_comp3_init();
-static void _comparator_gpio_init();
+void comparator_comp1_init();
+void comparator_comp3_init();
+void comparator_gpio_init();
 
 #ifdef __cplusplus
 }