Add some 1750 detection code to glutt-o-logic

3 files changed, 13 insertions, 10 deletions

diff --git a/src/common/includes/Audio/audio_in.h b/src/common/includes/Audio/audio_in.h
index 86c93b2..3bc543c 100644
--- a/src/common/includes/Audio/audio_in.h
+++ b/src/common/includes/Audio/audio_in.h
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Maximilien Cuony
+ * Copyright (c) 2019 Matthias P. Braendli, Maximilien Cuony
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,19 +22,16 @@
  * SOFTWARE.
 */
 
-#ifndef __AUDIO_IN_H__
-#define __AUDIO_IN_H__
+#pragma once
 
 #include <stdio.h>
 #include "FreeRTOS.h"
 
-#define AUDIO_IN_BUF_LEN 2048
 #define AUDIO_IN_RATE 8000
-
-int16_t * audio_in_buffer;
+#define AUDIO_IN_BUF_LEN 32
 
 void audio_in_initialize(int rate);
-void audio_in_initialize_plateform(int rate);
-void audio_in_buffer_ready(void);
 
-#endif
+// Fill the buffer with AUDIO_IN_BUF_LEN samples.
+void audio_in_get_buffer(int16_t *buffer /*of length AUDIO_IN_BUF_LEN*/ );
+
diff --git a/src/common/includes/Audio/tone.h b/src/common/includes/Audio/tone.h
index 0e80228..861a472 100644
--- a/src/common/includes/Audio/tone.h
+++ b/src/common/includes/Audio/tone.h
@@ -42,6 +42,11 @@ struct tone_detector {
 };
 
 void tone_init(int threshold);
-int tone_detect_1750(int16_t sample);
+
+/* Return 1 when 1750 detected, 0 otherwise */
+int tone_1750_status(void);
+
+/* Update 1750 tone detection status */
+void tone_detect_1750(const int16_t *samples, int len);
 
 #endif
diff --git a/src/common/includes/Core/common.h b/src/common/includes/Core/common.h
index b5dc881..3f7dbcc 100644
--- a/src/common/includes/Core/common.h
+++ b/src/common/includes/Core/common.h
@@ -63,6 +63,7 @@ int random_bool(void);
 #define FAULT_SOURCE_TASK_OVERFLOW 5
 #define FAULT_SOURCE_CW_AUDIO_QUEUE 6
 #define FAULT_SOURCE_ADC1 7
+#define FAULT_SOURCE_ADC2 8
 void trigger_fault(int source);
 
 int find_last_sunday(const struct tm*);