From a0d12ecbac8fe327d1dcd4580fee594e24d4191b Mon Sep 17 00:00:00 2001 From: Arturs Artamonovs Date: Mon, 6 Jan 2025 12:30:49 +0000 Subject: Waterfall: UI drawing from file --- Radio/Utils/WaterfallFile/NaiveFFT.swift | 7 --- Radio/Utils/WaterfallFile/NaiveFFT512.swift | 49 +++++++++++++++++ Radio/Utils/WaterfallFile/SimpleImage.swift | 2 +- Radio/Utils/WaterfallFile/main.swift | 84 +++++++++-------------------- 4 files changed, 76 insertions(+), 66 deletions(-) delete mode 100644 Radio/Utils/WaterfallFile/NaiveFFT.swift create mode 100644 Radio/Utils/WaterfallFile/NaiveFFT512.swift (limited to 'Radio/Utils/WaterfallFile') diff --git a/Radio/Utils/WaterfallFile/NaiveFFT.swift b/Radio/Utils/WaterfallFile/NaiveFFT.swift deleted file mode 100644 index 79393b7..0000000 --- a/Radio/Utils/WaterfallFile/NaiveFFT.swift +++ /dev/null @@ -1,7 +0,0 @@ -// -// NaiveFFT.swift -// PrySDR -// -// Created by Jacky Jack on 05/01/2025. -// - diff --git a/Radio/Utils/WaterfallFile/NaiveFFT512.swift b/Radio/Utils/WaterfallFile/NaiveFFT512.swift new file mode 100644 index 0000000..b4dca7e --- /dev/null +++ b/Radio/Utils/WaterfallFile/NaiveFFT512.swift @@ -0,0 +1,49 @@ +// +// NaiveFFT.swift +// PrySDR +// +// Created by Jacky Jack on 05/01/2025. +// + +import Foundation +import Accelerate + +//SUpports now only fixed sizes and not flexible implementation just a PoC +class NaiveFFT512 { + + static let sampleCount = 512 + let forwardDCT = vDSP.DCT(count: sampleCount, transformType: .II)! + + init() { + + } + + func getSampleCount() -> Int { + return NaiveFFT512.sampleCount + } + + func computeLine(_ processingArray: [Int8]) -> [Float] { + + var dataFloat = [Float](repeating: 0.0, count: NaiveFFT512.sampleCount) + + if processingArray.count != NaiveFFT512.sampleCount { + print("Not supporting arrays not equail to \(NaiveFFT512.sampleCount)") + return [] + } + + vDSP.convertElements(of: processingArray, to: &dataFloat) + //dataFloat = vDSP.add(127.0, dataFloat) + //print(dataFloat) + + //move from -127.0 to 128.0 range -1.0...1.0 + //var adjusted = vDSP.divide(dataFloat, Float(sampleCount)) + var adjusted = dataFloat + //print(adjusted) + + var transform_result = forwardDCT.transform(adjusted) + transform_result = vDSP.absolute(transform_result) + + return transform_result + } + +} diff --git a/Radio/Utils/WaterfallFile/SimpleImage.swift b/Radio/Utils/WaterfallFile/SimpleImage.swift index c05709f..4f1bed8 100644 --- a/Radio/Utils/WaterfallFile/SimpleImage.swift +++ b/Radio/Utils/WaterfallFile/SimpleImage.swift @@ -32,7 +32,7 @@ public class SimpleImage { func drawPalletLine(line: Int, pixelLine:[Float]) { for i in 0..256.0 { + if pixel>255.0 { //print("values to high") pixel = 255.0 } diff --git a/Radio/Utils/WaterfallFile/main.swift b/Radio/Utils/WaterfallFile/main.swift index cf72d56..039be72 100644 --- a/Radio/Utils/WaterfallFile/main.swift +++ b/Radio/Utils/WaterfallFile/main.swift @@ -7,84 +7,58 @@ import Foundation import Accelerate +import ArgumentParser + +//set the command line arguments +struct CommandLineArgs: ParsableCommand { + @Argument var inputFile:String = "" + @Argument var outputFile:String = "" +} + +let args = CommandLineArgs.parseOrExit() print("Read binary file") -let input_filename="rtlsdr_100M_m.cu8" +let input_filename=args.inputFile //get data from u8 file -let dir = getCurrentExecutableDir() -let filemgr = FileManager.default - -if !filemgr.fileExists(atPath: input_filename) { - print("Cant find file \(input_filename)") +let fileReader = FileReader() +do { + try fileReader.open(filename: input_filename) +} catch { + print("Cant open file \(input_filename)") exit(0) } - -let fileHandle: FileHandle? = FileHandle(forReadingAtPath: dir+"/"+input_filename) var i8_arr:[Int8]? = nil -if let file = fileHandle { - file.seek(toFileOffset: 0) - do { - if let databuf = try file.readToEnd() { - - print("read \(databuf.count) \(databuf) bytes") - //let temp_arr = [Int8](databuf) - i8_arr = [Int8](repeating: 0, count: databuf.count) - - for i in 0..