diff options
author | Maximilien Cuony <maximilien@theglu.org> | 2016-06-05 22:28:56 +0200 |
---|---|---|
committer | Maximilien Cuony <maximilien@theglu.org> | 2016-06-05 22:28:56 +0200 |
commit | 765b06950c1a5b55bb96a29f9da3c136f790a0f2 (patch) | |
tree | ebe75c291b201a16cf16ed52fbfc2c82d13a98ff /src/common | |
parent | 327114f6c35a2c28004eb950baf5d1c1c175824a (diff) | |
download | glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.tar.gz glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.tar.bz2 glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.zip |
Fix warnings
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/includes/Audio/audio.h | 10 | ||||
-rw-r--r-- | src/common/includes/Audio/cw.h | 2 | ||||
-rw-r--r-- | src/common/includes/Core/common.h | 3 | ||||
-rw-r--r-- | src/common/includes/Core/delay.h | 7 | ||||
-rw-r--r-- | src/common/includes/GPIO/pio.h | 2 | ||||
-rw-r--r-- | src/common/includes/GPIO/temperature.h | 1 | ||||
-rw-r--r-- | src/common/includes/GPIO/usart.h | 6 | ||||
-rw-r--r-- | src/common/src/GPIO/usart.c | 2 |
8 files changed, 23 insertions, 10 deletions
diff --git a/src/common/includes/Audio/audio.h b/src/common/includes/Audio/audio.h index 6531879..a4ac2da 100644 --- a/src/common/includes/Audio/audio.h +++ b/src/common/includes/Audio/audio.h @@ -15,8 +15,8 @@ extern int buffer_number; extern bool dma_running; void audio_initialize_platform(int plln, int pllr, int i2sdiv, int i2sodd, int rate); -void audio_start_dma_and_request_buffers(); -void audio_stop_dma(); +void audio_start_dma_and_request_buffers(void); +void audio_stop_dma(void); #define Audio8000HzSettings 256,5,12,1,8000 #define Audio16000HzSettings 213,2,13,0,16000 @@ -35,8 +35,8 @@ void audio_stop_dma(); void audio_initialize(int plln,int pllr,int i2sdiv,int i2sodd, int rate); // Power up and down the audio hardware. -void audio_on(); -void audio_off(); +void audio_on(void); +void audio_off(void); // Set audio volume in steps of 0.5 dB. 0xff is +12 dB. void audio_set_volume(int volume); @@ -48,7 +48,7 @@ void audio_output_sample_without_blocking(int16_t sample); // Start and stop audio playback using DMA. // Callback is optional, and called whenever a new buffer is needed. void audio_play_with_callback(AudioCallbackFunction *callback,void *context); -void audio_stop(); +void audio_stop(void); // Provide a new buffer to the audio DMA. Output is double buffered, so // at least two buffers must be maintained by the program. It is not allowed diff --git a/src/common/includes/Audio/cw.h b/src/common/includes/Audio/cw.h index 384918d..ccb13ab 100644 --- a/src/common/includes/Audio/cw.h +++ b/src/common/includes/Audio/cw.h @@ -45,5 +45,7 @@ size_t cw_psk31_fill_buffer(int16_t *buf, size_t bufsize); // Return 1 if the CW or PSK31 generator is running int cw_psk31_busy(void); +void cw_message_sent(const char*); + #endif // __CW_H_ diff --git a/src/common/includes/Core/common.h b/src/common/includes/Core/common.h index 80739cf..950085c 100644 --- a/src/common/includes/Core/common.h +++ b/src/common/includes/Core/common.h @@ -58,3 +58,6 @@ int random_bool(void); #define FAULT_SOURCE_USART 4 void trigger_fault(int source); +#ifdef SIMULATOR +void __disable_irq(void); +#endif diff --git a/src/common/includes/Core/delay.h b/src/common/includes/Core/delay.h index 67ff3b7..4cc3f07 100644 --- a/src/common/includes/Core/delay.h +++ b/src/common/includes/Core/delay.h @@ -28,7 +28,12 @@ // High-precisions delay (with approximations) // These functions only work if interupts are disabled +#ifdef SIMULATOR +void delay_us(int micros); +void delay_ms(int millis); +#else void delay_us(uint32_t micros); void delay_ms(uint32_t millis); +#endif -void delay_init(); +void delay_init(void); diff --git a/src/common/includes/GPIO/pio.h b/src/common/includes/GPIO/pio.h index 19d3e15..10b83bf 100644 --- a/src/common/includes/GPIO/pio.h +++ b/src/common/includes/GPIO/pio.h @@ -41,7 +41,7 @@ void pio_set_qrp(int on); void pio_set_fsm_signals(struct fsm_input_signals_t* sig); -int pio_read_button(); +int pio_read_button(void); #endif // _PIO_H_ diff --git a/src/common/includes/GPIO/temperature.h b/src/common/includes/GPIO/temperature.h index a67d16b..a0e5b5d 100644 --- a/src/common/includes/GPIO/temperature.h +++ b/src/common/includes/GPIO/temperature.h @@ -37,3 +37,4 @@ int temperature_valid(); // Get current temperature float temperature_get(); +void temperature_task(void *); diff --git a/src/common/includes/GPIO/usart.h b/src/common/includes/GPIO/usart.h index 0ad1034..ed7d441 100644 --- a/src/common/includes/GPIO/usart.h +++ b/src/common/includes/GPIO/usart.h @@ -62,12 +62,14 @@ void usart_debug_puts_header(const char* hdr, const char* str); // Return 1 on success int usart_get_nmea_sentence(char* nmea); -void usart_debug_timestamp(); +void usart_debug_timestamp(void); -void usart_gps_specific_init(); +void usart_gps_specific_init(void); void usart_process_char(char); void usart_gps_process_char(char); +void usart_puts(USART_TypeDef*, const char*); + #endif //__USART_H_ diff --git a/src/common/src/GPIO/usart.c b/src/common/src/GPIO/usart.c index b96fa27..ee7e96d 100644 --- a/src/common/src/GPIO/usart.c +++ b/src/common/src/GPIO/usart.c @@ -53,7 +53,7 @@ void usart_gps_init() { void usart_gps_puts(const char* str) { vTaskSuspendAll(); - return usart_puts(USART3, str); + usart_puts(USART3, str); xTaskResumeAll(); } |