Skip to content

Commit

Permalink
fixed sai redefinition issues (#29)
Browse files Browse the repository at this point in the history
* fixed stm32h7xx_hal.h dependendy issue

Also changed all imports from hal with double quotes to angle brackets. This should indicate the source of these imports a little better (i.e. not local files).

This addresses the problem raised in #27.

The example sketches build fine on my system (Linux / Ubuntu), and I doubt any other users will encounter platform-specific issues.

* removed temporary caching fix
  • Loading branch information
CorvusPrudens authored Jul 6, 2021
1 parent 53a9816 commit 2360fd0
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 3,821 deletions.
6 changes: 0 additions & 6 deletions src/utility/audio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,6 @@ void AudioHandle::Impl::InternalCallback(int32_t* in, int32_t* out, size_t size)
default: break;
}
}

//temporary bandaid until the cache fix is released via stm32duino
for(int i = 0; i < kAudioMaxChannels / 2; i++){
dsy_dma_invalidate_cache_for_buffer(dsy_audio_rx_buffer[i], kAudioMaxBufferSize);
dsy_dma_clear_cache_for_buffer(dsy_audio_tx_buffer[i], kAudioMaxBufferSize);
}

}

Expand Down
2 changes: 1 addition & 1 deletion src/utility/hal_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef DSY_HAL_MAP_H
#define DSY_HAL_MAP_H

#include "stm32h7xx_hal.h"
#include <stm32h7xx_hal.h>
#include "daisy_core.h"


Expand Down
3 changes: 2 additions & 1 deletion src/utility/sai.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

#include "daisy_core.h"

#include "stm32h7xx_hal_sai.h"
#include <stm32h7xx_hal.h>
#include <stm32h7xx_hal_sai.h>

namespace daisy
{
Expand Down
2 changes: 1 addition & 1 deletion src/utility/sdram.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stm32h7xx_hal.h"
#include <stm32h7xx_hal.h>
#include "sdram.h"
#include "hal_map.h"
//#include "libdaisy.h"
Expand Down
Loading

0 comments on commit 2360fd0

Please sign in to comment.