aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/includes
diff options
context:
space:
mode:
authorMaximilien Cuony <maximilien@theglu.org>2016-06-06 18:49:25 +0200
committerMaximilien Cuony <maximilien@theglu.org>2016-06-06 18:49:25 +0200
commite2e1af13be32fe00f98135beb62617ea0bba7bc8 (patch)
tree5ff81acadb2f5b9d7fee2269d746253a1f6bad49 /src/common/includes
parent2e4b80bc0fdae03f6e00b76000c16d12682e0479 (diff)
downloadglutte-o-matic-e2e1af13be32fe00f98135beb62617ea0bba7bc8.tar.gz
glutte-o-matic-e2e1af13be32fe00f98135beb62617ea0bba7bc8.tar.bz2
glutte-o-matic-e2e1af13be32fe00f98135beb62617ea0bba7bc8.zip
Fix warnings, add more warnings flags, normalize makefiles
Diffstat (limited to 'src/common/includes')
-rw-r--r--src/common/includes/Audio/audio.h2
-rw-r--r--src/common/includes/Audio/cw.h2
-rw-r--r--src/common/includes/Core/common.h5
-rw-r--r--src/common/includes/Core/fsm.h10
-rw-r--r--src/common/includes/GPIO/i2c.h2
-rw-r--r--src/common/includes/GPIO/temperature.h6
-rw-r--r--src/common/includes/GPS/gps.h4
7 files changed, 23 insertions, 8 deletions
diff --git a/src/common/includes/Audio/audio.h b/src/common/includes/Audio/audio.h
index a4ac2da..573c157 100644
--- a/src/common/includes/Audio/audio.h
+++ b/src/common/includes/Audio/audio.h
@@ -59,4 +59,6 @@ void audio_stop(void);
void audio_provide_buffer(void *samples,int numsamples);
bool audio_provide_buffer_without_blocking(void *samples,int numsamples);
+void DMA1_Stream7_IRQHandler(void);
+
#endif
diff --git a/src/common/includes/Audio/cw.h b/src/common/includes/Audio/cw.h
index ccb13ab..39be9c5 100644
--- a/src/common/includes/Audio/cw.h
+++ b/src/common/includes/Audio/cw.h
@@ -47,5 +47,7 @@ int cw_psk31_busy(void);
void cw_message_sent(const char*);
+size_t cw_symbol(uint8_t, uint8_t *, size_t);
+
#endif // __CW_H_
diff --git a/src/common/includes/Core/common.h b/src/common/includes/Core/common.h
index 950085c..b0927c8 100644
--- a/src/common/includes/Core/common.h
+++ b/src/common/includes/Core/common.h
@@ -58,6 +58,11 @@ int random_bool(void);
#define FAULT_SOURCE_USART 4
void trigger_fault(int source);
+
+int find_last_sunday(const struct tm*);
+
#ifdef SIMULATOR
void __disable_irq(void);
+#else
+void hard_fault_handler_c(uint32_t *);
#endif
diff --git a/src/common/includes/Core/fsm.h b/src/common/includes/Core/fsm.h
index c061597..75f1f46 100644
--- a/src/common/includes/Core/fsm.h
+++ b/src/common/includes/Core/fsm.h
@@ -25,6 +25,8 @@
#ifndef _FSM_H_
#define _FSM_H_
+#include <stdint.h>
+
// List of all states the FSM of the relay can be in
enum fsm_state_e {
FSM_OISIF = 0, // Idle
@@ -88,10 +90,10 @@ struct fsm_output_signals_t {
};
// Initialise local structures
-void fsm_init();
+void fsm_init(void);
// Call the FSM once and update the internal state
-void fsm_update();
+void fsm_update(void);
// Setter for inputs
void fsm_update_inputs(struct fsm_input_signals_t* inputs);
@@ -102,5 +104,9 @@ void fsm_get_outputs(struct fsm_output_signals_t* out);
// Announce a state change
void fsm_state_switched(const char *new_state);
+uint64_t fsm_current_state_time_ms(void);
+uint64_t fsm_current_state_time_s(void);
+const char* fsm_select_letter(void);
+
#endif // _FSM_H_
diff --git a/src/common/includes/GPIO/i2c.h b/src/common/includes/GPIO/i2c.h
index 109213b..69a4ad2 100644
--- a/src/common/includes/GPIO/i2c.h
+++ b/src/common/includes/GPIO/i2c.h
@@ -28,7 +28,7 @@
#include <stdint.h>
/* Initialise I2C on the board for both the audio codec and the GPS receiver */
-void i2c_init();
+void i2c_init(void);
/* Do an I2C write, return 1 on success, 0 on failure */
int i2c_write(uint8_t device, const uint8_t *txbuf, int len);
diff --git a/src/common/includes/GPIO/temperature.h b/src/common/includes/GPIO/temperature.h
index a0e5b5d..f49cc26 100644
--- a/src/common/includes/GPIO/temperature.h
+++ b/src/common/includes/GPIO/temperature.h
@@ -29,12 +29,12 @@ extern float _temperature_last_value;
extern int _temperature_valid;
// Setup communication and temperature
-void temperature_init();
+void temperature_init(void);
// Return 1 if the temperature is valid
-int temperature_valid();
+int temperature_valid(void);
// Get current temperature
-float temperature_get();
+float temperature_get(void);
void temperature_task(void *);
diff --git a/src/common/includes/GPS/gps.h b/src/common/includes/GPS/gps.h
index 768ade1..ec5ec77 100644
--- a/src/common/includes/GPS/gps.h
+++ b/src/common/includes/GPS/gps.h
@@ -35,10 +35,10 @@
*/
// Setup communication and GPS receiver
-void gps_init();
+void gps_init(void);
// Return 1 of the GPS is receiving time
-int gps_locked();
+int gps_locked(void);
// Get current time from GPS
// Returns 1 if time is valid, 0 otherwise