Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #419 from Brumi-2021/Final_correction_GCC_10_Compile_error_#199_with_sharebrained_feedback

Browse Source 
Final correction gcc 10 compile error #199 with sharebrained feedback
This commit is contained in:
Erwin Ried 2021-11-24 12:31:29 +01:00 committed by GitHub
commit dc06950a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firmware/baseband/spectrum_collector.cpp
View File

@ -27,8 +27,6 @@
#include "event_m4.hpp"
#include "portapack_shared_memory.hpp"
#include "event_m4.hpp"
#include <algorithm>
void SpectrumCollector::on_message(const Message* const message) {
@ -105,24 +103,38 @@ void SpectrumCollector::post_message(const buffer_c16_t& data) {
}
}
template<typename T>
/* 3 types of Windowing time domain shapes declaration , but only used Hamming , shapes for FFT
GCC10 compile sintax error c/m (1/2),
The primary diff. between const and constexpr variables is that
the initialization of a const var can be deferred until run time.
A constexpr var. must be initialized at compile time. ...
A var. can be declared with constexpr , when it has a literal type and is initialized.
GCC compile sintax error c/m (2/2)
Static assert --> Tests a software assertion at compile time for debugging.
we keep the same safety compile protection , just changing slightly the sintax checking that the size of the called array is power of 2.
if the bool "constant expression" is TRUE (normal case) , the declaration has no effect.
if the bool "constant expression" is FALSE (abnormal array size) , it is aborted the compile with a msg error.
*/
template<typename T> // Although currently we are not using that Windowing shape, we apply the same GCC10 compile error c/m
static typename T::value_type spectrum_window_none(const T& s, const size_t i) {
static_assert(power_of_two(s.size()), "Array size must be power of 2");
static_assert(power_of_two(ARRAY_ELEMENTS(s)), "Array number of elements must be power of 2"); // c/m compile error GCC10 , OK for all GCC versions.
return s[i];
};
template<typename T>
template<typename T> // Currently we are calling and using that Window shape.
static typename T::value_type spectrum_window_hamming_3(const T& s, const size_t i) {
static_assert(power_of_two(s.size()), "Array size must be power of 2");
constexpr size_t mask = s.size() - 1;
static_assert(power_of_two(ARRAY_ELEMENTS(s)), "Array number of elements must be power of 2"); // c/m compile error GCC10 , OK for all GCC versions.
const size_t mask = s.size() - 1; // c/m compile error GCC10 , constexpr->const
// Three point Hamming window.
return s[i] * 0.54f + (s[(i-1) & mask] + s[(i+1) & mask]) * -0.23f;
};
template<typename T>
template<typename T> // Although currently we are not using that Windowing shape, we apply the same GCC10 compile error c/m
static typename T::value_type spectrum_window_blackman_3(const T& s, const size_t i) {
static_assert(power_of_two(s.size()), "Array size must be power of 2");
constexpr size_t mask = s.size() - 1;
static_assert(power_of_two(ARRAY_ELEMENTS(s)), "Array number of elements must be power of 2"); // c/m compile error GCC10 , OK for all GCC versions.
const size_t mask = s.size() - 1; // c/m compile error GCC10 , constexpr->const
// Three term Blackman window.
constexpr float alpha = 0.42f;
constexpr float beta = 0.5f * 0.5f;

3
firmware/baseband/spectrum_collector.hpp
View File

@ -22,6 +22,9 @@
#ifndef __SPECTRUM_COLLECTOR_H__
#define __SPECTRUM_COLLECTOR_H__
#define ARRAY_ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
/* sizeof() compile-time operator that returns #bytes of (data type). We used it to get #elements_array */
#include "dsp_types.hpp"
#include "complex.hpp"