From 996a19ee7ba3308e17fd347afde0b135852835cc Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Tue, 29 Jun 2021 15:36:35 -0700
Subject: Revert "Audio system overhaul (#11820)" due to freezing issues

This reverts commit c80e5f9f8868ccaa8cb990be6f4da3f1011c2b78.
---
 util/audio_generate_dac_lut.py | 67 ------------------------------------------
 util/sample_parser.py          | 39 ------------------------
 util/wavetable_parser.py       | 40 -------------------------
 3 files changed, 146 deletions(-)
 delete mode 100755 util/audio_generate_dac_lut.py
 delete mode 100755 util/sample_parser.py
 delete mode 100755 util/wavetable_parser.py

(limited to 'util')

diff --git a/util/audio_generate_dac_lut.py b/util/audio_generate_dac_lut.py
deleted file mode 100755
index c31ba3d7ee..0000000000
--- a/util/audio_generate_dac_lut.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2020 JohSchneider
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-AUDIO_DAC_BUFFER_SIZE=256
-AUDIO_DAC_SAMPLE_MAX=4095
-
-def plot(values):
-    for v in values:
-        print('0'* int(v * 80/AUDIO_DAC_SAMPLE_MAX))
-
-def to_lut(values):
-    for v in values:
-        print(hex(int(v)), end=", ")
-
-
-from math import sin, tau, pi
-
-samples=[]
-
-def sampleSine():
-    for s in range(AUDIO_DAC_BUFFER_SIZE):
-        samples.append((sin((s/AUDIO_DAC_BUFFER_SIZE)*tau - pi/2) + 1 )/2* AUDIO_DAC_SAMPLE_MAX)
-
-def sampleTriangle():
-    for s in range(AUDIO_DAC_BUFFER_SIZE):
-        if s < AUDIO_DAC_BUFFER_SIZE/2:
-            samples.append(s/(AUDIO_DAC_BUFFER_SIZE/2) * AUDIO_DAC_SAMPLE_MAX)
-        else:
-            samples.append(AUDIO_DAC_SAMPLE_MAX - (s-AUDIO_DAC_BUFFER_SIZE/2)/(AUDIO_DAC_BUFFER_SIZE/2) * AUDIO_DAC_SAMPLE_MAX)
-
-#compromise between square and triangle wave,
-def sampleTrapezoidal():
-    for i in range(AUDIO_DAC_BUFFER_SIZE):
-        a=3 #slope/inclination
-        if (i < AUDIO_DAC_BUFFER_SIZE/2):
-            s = a * (i * AUDIO_DAC_SAMPLE_MAX/(AUDIO_DAC_BUFFER_SIZE/2)) + (1-a)*AUDIO_DAC_SAMPLE_MAX/2
-        else:
-            i = i - AUDIO_DAC_BUFFER_SIZE/2
-            s = AUDIO_DAC_SAMPLE_MAX - a * (i * AUDIO_DAC_SAMPLE_MAX/(AUDIO_DAC_BUFFER_SIZE/2)) - (1-a)*AUDIO_DAC_SAMPLE_MAX/2
-
-        if s < 0:
-            s=0
-        if s> AUDIO_DAC_SAMPLE_MAX:
-            s=AUDIO_DAC_SAMPLE_MAX
-        samples.append(s)
-
-
-#sampleSine()
-sampleTrapezoidal()
-#print(samples)
-plot(samples)
-to_lut(samples)
diff --git a/util/sample_parser.py b/util/sample_parser.py
deleted file mode 100755
index 70e193aee7..0000000000
--- a/util/sample_parser.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2019 Jack Humbert
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import wave, struct, sys
-
-waveFile = wave.open(sys.argv[1], 'r')
-# print(str(waveFile.getparams()))
-# sys.exit()
-
-if (waveFile.getsampwidth() != 2):
-    raise(Exception("This script currently only works with 16bit audio files"))
-
-length = waveFile.getnframes()
-out = "#define DAC_SAMPLE_CUSTOM_LENGTH " + str(length) + "\n\n"
-out += "static const dacsample_t dac_sample_custom[" + str(length) + "] = {"
-for i in range(0,length):
-    if (i % 8 == 0):
-        out += "\n    "
-    waveData = waveFile.readframes(1)
-    data = struct.unpack("<h", waveData)
-    out += str(int((int(data[0]) + 0x8000) / 16)) + ", "
-out = out[:-2]
-out += "\n};"
-print(out)
diff --git a/util/wavetable_parser.py b/util/wavetable_parser.py
deleted file mode 100755
index be0f01f7b4..0000000000
--- a/util/wavetable_parser.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2019 Jack Humbert
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import wave, struct, sys
-
-waveFile = wave.open(sys.argv[1], 'r')
-
-length = waveFile.getnframes()
-out = "#define DAC_WAVETABLE_CUSTOM_LENGTH " + str(int(length / 256)) + "\n\n"
-out += "static const dacsample_t dac_wavetable_custom[" + str(int(length / 256)) + "][256] = {"
-for i in range(0,length):
-    if (i % 8 == 0):
-        out += "\n    "
-    if (i % 256 == 0):
-        out = out[:-2]
-        out += "{\n    "
-    waveData = waveFile.readframes(1)
-    data = struct.unpack("<h", waveData)
-    out += str(int((int(data[0]) + 0x8000) / 16)) + ", "
-    if (i % 256 == 255):
-        out = out[:-2]
-        out += "\n  },"
-out = out[:-1]
-out += "\n};"
-print(out)
-- 
cgit v1.2.3