From 0e86a6903c1727209041aa181b6f4339dfa3a41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Foucher?= <cfoucher@laas.fr>
Date: Wed, 13 Jul 2022 16:24:16 +0200
Subject: [PATCH] Harmonize includes in modules.
---
zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c | 2 +-
.../zephyr/public_api/DataAcquisition.cpp | 6 ++++--
.../zephyr/public_api/HardwareConfiguration.cpp | 2 +-
.../zephyr/public_api/HardwareConfiguration.h | 4 ++--
zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h | 3 +++
.../owntech_scheduling/zephyr/public_api/Scheduling.h | 3 +++
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c b/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
index d811e8f..aacc4d1 100644
--- a/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
+++ b/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
@@ -27,7 +27,7 @@
// STM32 LL
#include <stm32_ll_adc.h>
-// OwnTech API
+// Current module private functions
#include "../src/adc_channels.h"
#include "../src/adc_core.h"
diff --git a/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp b/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
index 3b4dea8..028c4c3 100644
--- a/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
+++ b/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
@@ -28,12 +28,14 @@
// Stdlib
#include <string.h>
-// OwnTech Power API
-#include "adc.h"
+// Current module private functions
#include "../dma/dma.h"
#include "../data_dispatch/data_dispatch.h"
#include "../data_conversion/data_conversion.h"
+// OwnTech Power API
+#include "adc.h"
+
// Current class header
#include "DataAcquisition.h"
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
index 1a7047a..fc0a128 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
+++ b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
@@ -26,7 +26,7 @@
*/
-// OwnTech headers
+// Current module private functions
#include "../src/dac_configuration.h"
#include "../src/ngnd_configuration.h"
#include "../src/led_configuration.h"
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
index 1ae42af..479e629 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
+++ b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
@@ -29,14 +29,14 @@
#ifndef HARDWARECONFIGURATION_H_
#define HARDWARECONFIGURATION_H_
-// Std lib
+// Stdlib
#include <stdint.h>
// ARM lib
#include <arm_math.h>
// OwnTech API
-#include "../src/adc_configuration.h"
+#include "adc.h"
/** Hardware version. See
diff --git a/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h b/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
index 0fb8981..5a5e899 100644
--- a/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
+++ b/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
@@ -27,8 +27,11 @@
#ifndef NGND_H_
#define NGND_H_
+
+// Zephyr
#include <device.h>
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h b/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
index 99b807c..dca2cea 100644
--- a/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
+++ b/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
@@ -26,10 +26,13 @@
#define SCHEDULING_H_
+// Stdlib
#include <stdint.h>
+// Zephyr
#include <zephyr.h>
+
typedef void (*thread_function_t)();
/////
--
GitLab