Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass a File into CaptureThread.

Browse Source 
Groundwork for having a general output-stream interface.
This commit is contained in:
Jared Boone 2016-04-30 16:26:49 -07:00
parent a2a2de9a23
commit b5fbab8e29
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/application/capture_thread.hpp
View File

@ -71,11 +71,11 @@ private:
class CaptureThread { class CaptureThread {
public: public:
CaptureThread( CaptureThread(
std::string file_path, std::unique_ptr<File> file,
size_t write_size_log2, size_t write_size_log2,
size_t buffer_count_log2 size_t buffer_count_log2
) : config { write_size_log2, buffer_count_log2 }, ) : config { write_size_log2, buffer_count_log2 },
file_path { std::move(file_path) } file { std::move(file) }
{ {
// Need significant stack for FATFS // Need significant stack for FATFS
thread = chThdCreateFromHeap(NULL, 2048, NORMALPRIO + 10, CaptureThread::static_fn, this); thread = chThdCreateFromHeap(NULL, 2048, NORMALPRIO + 10, CaptureThread::static_fn, this);
@ -109,7 +109,7 @@ public:
private: private:
CaptureConfig config; CaptureConfig config;
const std::string file_path; std::unique_ptr<File> file;
static Thread* thread; static Thread* thread;
static msg_t static_fn(void* arg) { static msg_t static_fn(void* arg) {
@ -118,11 +118,6 @@ private:
} }
msg_t run() { msg_t run() {
File file { file_path, File::openmode::out | File::openmode::binary | File::openmode::trunc };
if( !file.is_open() ) {
return false;
}
const size_t write_size = 1U << config.write_size_log2; const size_t write_size = 1U << config.write_size_log2;
const auto write_buffer = std::make_unique<uint8_t[]>(write_size); const auto write_buffer = std::make_unique<uint8_t[]>(write_size);
if( !write_buffer ) { if( !write_buffer ) {
@ -133,7 +128,7 @@ private:
while( !chThdShouldTerminate() ) { while( !chThdShouldTerminate() ) {
if( stream.available() >= write_size ) { if( stream.available() >= write_size ) {
if( !transfer(stream, file, write_buffer.get(), write_size) ) { if( !transfer(stream, write_buffer.get(), write_size) ) {
return false; return false;
} }
} else { } else {
@ -144,14 +139,14 @@ private:
return true; return true;
} }
bool transfer(StreamOutput& stream, File& file, uint8_t* const write_buffer, const size_t write_size) { bool transfer(StreamOutput& stream, uint8_t* const write_buffer, const size_t write_size) {
bool success = false; bool success = false;
led_usb.on(); led_usb.on();
const auto bytes_to_write = stream.read(write_buffer, write_size); const auto bytes_to_write = stream.read(write_buffer, write_size);
if( bytes_to_write == write_size ) { if( bytes_to_write == write_size ) {
if( file.write(write_buffer, write_size) ) { if( file->write(write_buffer, write_size) ) {
success = true; success = true;
} }
} }

8
firmware/application/ui_record_view.cpp
View File

@ -95,7 +95,13 @@ void RecordView::start() {
write_metadata_file(filename_stem + ".TXT"); write_metadata_file(filename_stem + ".TXT");
capture_thread = std::make_unique<CaptureThread>(filename_stem + filename_extension, buffer_size_k, buffer_count_k); capture_thread = std::make_unique<CaptureThread>(
std::make_unique<File>(
filename_stem + filename_extension,
File::openmode::out | File::openmode::binary | File::openmode::trunc
),
buffer_size_k, buffer_count_k
);
button_record.set_bitmap(&bitmap_stop); button_record.set_bitmap(&bitmap_stop);
} }