summaryrefslogtreecommitdiff
path: root/source/application/hal/platforms/native
diff options
context:
space:
mode:
Diffstat (limited to 'source/application/hal/platforms/native')
-rw-r--r--source/application/hal/platforms/native/data_acquisition/data_acq.c4
-rw-r--r--source/application/hal/platforms/native/data_presentation/log/log.c18
2 files changed, 19 insertions, 3 deletions
diff --git a/source/application/hal/platforms/native/data_acquisition/data_acq.c b/source/application/hal/platforms/native/data_acquisition/data_acq.c
index 01f47fa..9b6815b 100644
--- a/source/application/hal/platforms/native/data_acquisition/data_acq.c
+++ b/source/application/hal/platforms/native/data_acquisition/data_acq.c
@@ -37,7 +37,9 @@ static int acquisition_init(void)
**/
static int get_user_input(char* user_input, int size)
{
- fgets(user_input, size, stdin);
+ if (NULL == fgets(user_input, size, stdin)) {
+ return 1;
+ }
return 0;
}
diff --git a/source/application/hal/platforms/native/data_presentation/log/log.c b/source/application/hal/platforms/native/data_presentation/log/log.c
index 6ce6684..8dffba9 100644
--- a/source/application/hal/platforms/native/data_presentation/log/log.c
+++ b/source/application/hal/platforms/native/data_presentation/log/log.c
@@ -20,6 +20,14 @@
#include <stdint.h>
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
int log_psn_init(void)
{
return 0;
@@ -50,10 +58,10 @@ int log_display_text(const char* str, const size_t str_sz,
int log_display_box_icon(const uint32_t pos_x, const uint32_t pos_y,
- const uint32_t width, const uint32_t height,
+ const uint32_t width, const uint32_t height,
const uint16_t color)
{
- debug("Showing rectangular, width: %d, height: %d, color: %d, x: %d, y: %d\n",
+ debug("Showing rectangular, width: %d, height: %d, color: %d, x: %d, y: %d\n",
width, height, color, pos_x, pos_y);
return 0;
}
@@ -69,3 +77,9 @@ int log_set_text_color (const uint16_t color)
debug("Setting text color: %d\n", color);
return 0;
}
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+ #pragma clang diagnostic pop
+#elif defined(__GNUC__)
+ #pragma GCC diagnostic pop
+#endif