Commit Graph

177 Commits

Author SHA1 Message Date
Finlay Davidson b1de7e0d20 Apply changes suggested by shellcheck 2023-02-20 11:13:48 +01:00
Ben V. Brown 8263b4e2c2
Merge pull request #45 from FintasticMan/switch_to_opus
Switch to opus by default, and support any format
2023-02-20 13:39:37 +11:00
Finlay Davidson 32aececcaf Switch to opus by default, and support any format 2023-02-19 23:56:44 +01:00
Ben V. Brown 9ce6f966d2
Merge pull request #46 from ThatcherC/cn-audio
Language options for sound files
2023-02-20 09:27:22 +11:00
Ben V. Brown 46c05333b6
Merge branch 'main' into cn-audio 2023-02-20 09:12:43 +11:00
Ben V. Brown 012e1ca2c8
Merge pull request #47 from ThatcherC/remove-EQ_COEF
Remove unused file
2023-02-20 09:09:58 +11:00
Thatcher Chamberlin 171beef6a7 Add strip to AUDIO variable in Makefile 2023-02-19 15:00:04 -05:00
Thatcher Chamberlin d8ac8e3278 Remove unused file 2023-02-19 14:50:38 -05:00
Thatcher Chamberlin ec7941b845 Moved default AUDIO=en behavior to Makefile instead of build.sh 2023-02-19 14:42:33 -05:00
Thatcher Chamberlin 90cd88f1a8 LANG -> AUDIO 2023-02-19 14:36:52 -05:00
Thatcher Chamberlin e9ddfd6c4a
Update build.sh
Co-authored-by: FintasticMan <52415484+FintasticMan@users.noreply.github.com>
2023-02-19 14:28:49 -05:00
Thatcher Chamberlin 6d95360c51 Add language configuration to build.sh! 2023-02-18 08:35:32 -05:00
Thatcher Chamberlin b8149e8be2 Removed res_audio_data_cn.h 2023-02-17 23:19:01 -05:00
Thatcher Chamberlin 5780956102 Fixed media_sound_map use - much simpler now! 2023-02-17 23:17:06 -05:00
Thatcher Chamberlin 3be6634d9b Removed unused macro 2023-02-17 23:16:42 -05:00
Thatcher Chamberlin c162d79d52 Remove language prefix from sound variable names 2023-02-17 23:16:29 -05:00
Thatcher Chamberlin 73bcb05de2 Remove language prefix (EN_, CN_) from converted sound files 2023-02-17 23:15:44 -05:00
Thatcher Chamberlin f26b504bd1 Add LANG variable to Makefile to select language file 2023-02-17 23:14:50 -05:00
Thatcher Chamberlin f6ed5f50a2 Rename CN findme sound 2023-02-17 22:25:50 -05:00
Thatcher Chamberlin d119ccc2ce Rename some CN sound variable names for consistency. Builds! 2023-02-17 22:23:25 -05:00
Thatcher Chamberlin e35da82d83 Remove ifdef around CN sound inits 2023-02-17 22:22:59 -05:00
Thatcher Chamberlin eebe8d3cb1 Add CN sounds to makefile 2023-02-17 22:22:34 -05:00
Thatcher Chamberlin 86b2d7de96 Removed sizeof from CN audio code 2023-02-17 21:41:10 -05:00
Thatcher Chamberlin 6878290e9e Converted all CN audio TXT files to MP3s with:
```
for i in *.txt; do ../../../../convert.sh -T "$i" "${i%.*}.mp3"; done
```
2023-02-17 19:52:06 -05:00
Ben V. Brown e72390463d
Merge pull request #43 from pine64/re-organising
Split up the main apps file
2023-02-05 19:14:47 +11:00
Ben V. Brown 30a3a6410e cleanup headers 2023-02-05 18:54:25 +11:00
Ben V. Brown 92c3f9b107 rb_codec 2023-02-05 18:50:55 +11:00
Ben V. Brown 530de36418 gfps 2023-02-05 18:50:13 +11:00
Ben V. Brown bd55e53337 Split out LED control + key handler 2023-02-05 18:27:13 +11:00
Ben V. Brown a1c073d3a4
Merge pull request #40 from pine64/cleanup-modules
Remove USB & SDMMC
2023-02-04 11:06:48 +11:00
Ben V. Brown 22ba33ecfe Remove USB 2023-02-04 10:36:08 +11:00
Ben V. Brown 4e8ec04b34 Drop SDMMC 2023-02-04 10:31:16 +11:00
Ben V. Brown 5ceb23bef1 make convert quieter in build logs 2023-02-04 09:58:40 +11:00
Ben V. Brown 05b139e61f
Merge pull request #39 from pine64/cleanups-remove-FPGA-buildconfig
Removing FPGA dev support
2023-02-03 13:36:01 +11:00
Ben V. Brown b319051c35
Merge branch 'main' into cleanups-remove-FPGA-buildconfig 2023-02-03 13:31:17 +11:00
Ben V. Brown 8a7e040fc7
Merge pull request #33 from pine64/developer-comforts
Developer comforts part 1
2023-02-03 10:17:06 +11:00
Ben V. Brown dca92cf01f Removing FPGA dev support
As we will never get their FGPA source code. Zero loss.
2023-02-02 17:42:33 +11:00
Ben V. Brown 75381150fd Formatting
Formatting Pass 1

Lots of fixups to adding stdint and stdbool all over the place

Formatting Pass 2
Formatting Pass 3
Formatting Pass 4

Update app_bt_stream.cpp
2023-02-02 07:56:49 +11:00
Ben V. Brown dcb8fed27b Update Dockerfile 2023-02-02 07:52:23 +11:00
Ben V. Brown 3fdfaf815b Create clang-format spec 2023-01-31 21:22:20 +11:00
Ben V. Brown 19faa5dc4c Create format actions in make file 2023-01-31 21:19:12 +11:00
Ben V. Brown 40227d53c0 Add clang-format to docker file 2023-01-31 21:18:56 +11:00
Ben V. Brown 8be2eaf4cb Draft ci action 2023-01-31 08:17:02 +11:00
Ben V. Brown 4166b13d54
Merge pull request #28 from ThatcherC/build-from-mp3s-squash
Build from Sound Files
2023-01-31 07:24:00 +11:00
Ben V. Brown 764cffbaae
Merge pull request #27 from pine64/aarch64
Pull arch appropriate compiler build
2023-01-31 07:23:31 +11:00
Thatcher Chamberlin 5c393ec945 Updated README with sound instructions 2023-01-29 11:27:03 -05:00
Thatcher Chamberlin 90ed5cea80 Squashed commit of the following:
commit d21b9279462a63f292c8a6ef7d72f60bf83ea6df
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Sun Jan 29 11:12:31 2023 -0500

    Switched from WAVs to MP3s

commit 8a407aa29a6b636d8afe407089a80fc5a3f6e1b2
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Fri Jan 27 07:35:00 2023 -0500

    Re-added -j flag

commit 654b56be791ba7e9ab7407a084601a0b4f8f9619
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 23 20:40:08 2023 -0500

    Cleaned up build.mk

commit 112175c3fe8168860908c5fcd1b2b8fea0493231
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 23 20:36:18 2023 -0500

    Changed used variable names to match generated variable names

commit 0dfe30e5b66185671eb85930c8a7f63b1880f0c7
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Sun Jan 22 20:10:25 2023 -0500

    Zeroth cut at a better sound build system that makes better use of the .o/.cpp build system

commit f8131f371535e636b02b6aaef853154efff837aa
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 23:42:14 2023 -0500

    Removed parallel make - this is the only way I found to get wav->txt to run before the .txt files are included elsewhere

commit 934a42c0abd31e59bbebd6193a1db25e773d01ae
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 23:41:56 2023 -0500

    Deleted some reference code

commit 9d6a4c6638b6f74bd27f87af35451ad06de4cea8
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 23:39:02 2023 -0500

    Fixed include error and absolute paths of generated .txt files

commit ffc5d7178d8f4bbf4e76c91623c1aba85d83c1e7
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 23:38:29 2023 -0500

    Added txt to the windows-only branch

commit 1fea961998365c1483e23644cef60793cfe10e45
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 22:09:43 2023 -0500

    Renamed wav objects for consistency

commit e8d47b082a425074f0f16a29d0e54726aac1fa68
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Thu Jan 12 18:26:18 2023 -0500

    Changed out.raw to out.sbc and commented out the usage of the sbcinfo command

commit 2a0ff6569dd81f74f9f30714de8309013b4f8d9a
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 20:37:29 2023 -0500

    Added hash to out.raw so that `make -j` doesn't fail

commit 80b2c18d5d848c216a76398ab615dace029506fd
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 18:13:41 2023 -0500

    Deleted .txt sounds and fixed Make system to make them!

commit 319732a808d72dc70e03ebf8ce993ffdf7a01327
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 17:34:04 2023 -0500

    Standardized out.raw name

commit e48edd26d6a103e8b51c804416a3281122cde974
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 17:28:14 2023 -0500

    Added .wav files to tracking

commit 6a8c25eef4bf2ac477316629b37322188ba75762
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 17:26:33 2023 -0500

    Force ffmpeg overwrite

commit 03b50a544d579dadc573fb75e138ee0561d733f2
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 08:45:41 2023 -0500

    Removed extraneous slashes

commit b4670dc68a274d572005d093e471e4a1c982ed16
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 08:44:41 2023 -0500

    Added explicit verbosity

commit 2c8cdeea6ecbfbffc7cc4dc4ccb1bd4ac50c7f8a
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 08:11:02 2023 -0500

    Annotate xxd command args

commit 51d97b1033afcb561b89586fd7d8ffd78a35d43a
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 08:04:04 2023 -0500

    Added -aq audio quality flag to keep file sizes the same

commit 1e2b28a42fa6752d181b69fa655a165195d8e8d6
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Tue Jan 10 08:03:48 2023 -0500

    Fixed -ar audio rate flag

commit 4b19a367acc4fc6ee47777bbf5560de2fbbf86e7
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 9 21:50:40 2023 -0500

    Annotated ffmpeg args

commit 363ad5ceffc7580843728cff2ae87450233a473c
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 9 21:12:21 2023 -0500

    Modified Makefile (system) to auto-build wav files from txt files

    NOTE: this is kind of the opposite of what we want, so the next step
    will be to reverse to order and build txt files from wave files each time
    instead

commit 462a57a3ca2e328f3208c75468f68af4c946d42c
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 9 20:46:43 2023 -0500

    Added missing quotes

commit 965a4b96d274b1e0b1aeb3fec400a55743765d25
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 9 20:43:01 2023 -0500

    Updated convert.sh help message

commit ef84de0b949e76e37b81db15da57f924777c30dd
Author: Thatcher Chamberlin <j.thatcher.c@gmail.com>
Date:   Mon Jan 9 20:42:41 2023 -0500

    Added output name to convert.sh
2023-01-29 11:16:07 -05:00
Ben Brown 16c5ae9b20 Pull arch appropriate compiler build 2023-01-22 20:51:53 +11:00
Ben V. Brown cede4b1c01
Merge pull request #13 from ThatcherC/typos
A couple README typo fixes
2023-01-08 13:05:24 +11:00
Thatcher Chamberlin 879d4f0daa Spelling changes 2023-01-07 20:41:25 -05:00