HAL: add function to read FPGA/HW temperature (from Tom's commit)

NOTE: work ported from Tom's commits on Low Phase Drift Calibration

HAL: add function to read FPGA/HW temperature (from Tom's commit)
NOTE: work ported from Tom's commits on Low Phase Drift Calibration
d19aa22e · Jean-Claude BAU · Maciej Lipinski · f2378553 · d19aa22e · d19aa22e
Commit d19aa22e authored Aug 14, 2019 by Jean-Claude BAU Committed by Maciej Lipinski Aug 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 1 deletion

hal_main.c userspace/wrsw_hal/hal_main.c +6 -1

hal_main.h userspace/wrsw_hal/hal_main.h +16 -0

No files found.
--- a/userspace/wrsw_hal/hal_main.c
+++ b/userspace/wrsw_hal/hal_main.c
@@ -64,6 +64,7 @@ static char *dotconfigname = "/wr/etc/dot-config";

 struct hal_shmem_header *hal_shmem;
 struct wrs_shm_head *hal_shmem_hdr;
+struct hal_temp_sensors temp_sensors;

 /* Adds a function to be called during the HAL shutdown. */
 int hal_add_cleanup_callback(hal_cleanup_callback_t cb)
@@ -251,7 +252,6 @@ static void hal_parse_cmdline(int argc, char *argv[])
 }

 static void cb_timer_update_fan(int timerId) {
-	struct hal_temp_sensors temp_sensors; /* local copy of temperatures */

 	/* Update fans and get temperatures values. Don't write
 	* temperatures directly to the shmem to reduce the
@@ -267,6 +267,11 @@ static void cb_timer_update_all(int timerId) {
 	hal_port_update_all();
 }

+int hal_get_fpga_temperature(void)
+{
+	return temp_sensors.fpga;
+}
+
 int main(int argc, char *argv[])
 {


--- a/userspace/wrsw_hal/hal_main.h
+++ b/userspace/wrsw_hal/hal_main.h
+/*
+ * Copyright (C) 2019 CERN (www.cern.ch)
+ * Author: Jean-Claude BAU - CERN
+ *
+ * Released according to the GNU LGPL, version 2.1 or any later version.
+ *
+ *
+ */
+
+#ifndef HAL_MAIN_H
+#define HAL_MAIN_H
+
+extern int hal_tmg_set_mode(uint32_t tm);
+extern int hal_tmg_get_mode(void);
+extern int hal_get_fpga_temperature(void);
+#endif