From 0c1dbd58b2bddcfdf750f2d90152812160463c79 Mon Sep 17 00:00:00 2001 From: Arjan van Vught Date: Sat, 25 May 2024 14:04:39 +0200 Subject: [PATCH] Improved support for GD32 https://www.gd32-dmx.org/github.html --- lib-ltc/Makefile.GD32 | 17 ------- lib-ltc/include/artnetreader.h | 2 +- lib-ltc/include/ltc.h | 2 +- lib-ltc/include/ltc7segment.h | 2 +- lib-ltc/include/ltcdisplaymax7219.h | 2 +- lib-ltc/include/ltcdisplaymax72197segment.h | 2 +- lib-ltc/include/ltcdisplaymax7219matrix.h | 2 +- lib-ltc/include/ltcdisplaymax7219set.h | 2 +- lib-ltc/include/ltcdisplayparams.h | 2 +- lib-ltc/include/ltcdisplayparamsconst.h | 2 +- lib-ltc/include/ltcdisplayrgb.h | 2 +- lib-ltc/include/ltcdisplayrgbpanel.h | 2 +- lib-ltc/include/ltcdisplayrgbset.h | 2 +- lib-ltc/include/ltcdisplayws28xx7segment.h | 2 +- lib-ltc/include/ltcdisplayws28xxmatrix.h | 2 +- lib-ltc/include/ltcencoder.h | 2 +- lib-ltc/include/ltcetc.h | 2 +- lib-ltc/include/ltcetcparams.h | 2 +- lib-ltc/include/ltcetcparamsconst.h | 2 +- lib-ltc/include/ltcetcreader.h | 2 +- lib-ltc/include/ltcgenerator.h | 2 +- lib-ltc/include/ltcmidisystemrealtime.h | 2 +- lib-ltc/include/ltcoutputs.h | 2 +- lib-ltc/include/ltcparams.h | 2 +- lib-ltc/include/ltcparamsconst.h | 2 +- lib-ltc/include/ltcreader.h | 2 +- lib-ltc/include/ltcsender.h | 2 +- lib-ltc/include/ltcstore.h | 2 +- lib-ltc/include/midireader.h | 2 +- lib-ltc/include/ntpserver.h | 2 +- lib-ltc/include/platform_ltc.h | 2 +- lib-ltc/include/rtpmidireader.h | 2 +- lib-ltc/include/systimereader.h | 2 +- lib-ltc/include/tcnetdisplay.h | 2 +- lib-ltc/include/tcnetreader.h | 2 +- lib-ltc/include/timecodeconst.h | 2 +- lib-ltc/src/arm/artnetreader.cpp | 2 +- lib-ltc/src/arm/gd32/gd32_platform_ltc.h | 2 +- lib-ltc/src/arm/gd32/ltcsender.cpp | 4 +- lib-ltc/src/arm/gd32/platform_ltc.cpp | 23 +++++---- lib-ltc/src/arm/gd32/platform_ltc.h | 41 +++++++++++++++ lib-ltc/src/arm/h3/h3_platform_ltc.h | 2 +- lib-ltc/src/arm/h3/ltcsender.cpp | 2 +- lib-ltc/src/arm/ltcetcreader.cpp | 2 +- lib-ltc/src/arm/ltcgenerator.cpp | 2 +- lib-ltc/src/arm/ltcmidisystemrealtime.cpp | 4 +- lib-ltc/src/arm/ltcoutputs.cpp | 13 ++++- lib-ltc/src/arm/ltcreader.cpp | 50 +++++++++++++++++-- lib-ltc/src/arm/midireader.cpp | 2 +- lib-ltc/src/arm/platform_ltc.cpp | 2 +- lib-ltc/src/arm/rtpmidireader.cpp | 2 +- lib-ltc/src/arm/systimereader.cpp | 2 +- lib-ltc/src/arm/tcnetreader.cpp | 2 +- lib-ltc/src/displayrgb/ltcdisplayrgb.cpp | 2 +- lib-ltc/src/displayrgb/ltcdisplayrgbset.cpp | 2 +- .../src/displayrgb/ltcdisplayrgbsetrgb.cpp | 2 +- .../displayrgb/panel/ltcdisplayrgbpanel.cpp | 2 +- .../ws28xx/ltcdisplayws28xx7segment.cpp | 2 +- .../ws28xx/ltcdisplayws28xxmatrix.cpp | 2 +- lib-ltc/src/ltc.cpp | 2 +- lib-ltc/src/ltc7segment.cpp | 2 +- lib-ltc/src/ltcdisplaymax7219.cpp | 2 +- lib-ltc/src/ltcdisplaymax72197segment.cpp | 2 +- lib-ltc/src/ltcdisplaymax7219matrix.cpp | 2 +- lib-ltc/src/ltcdisplayparams.cpp | 2 +- lib-ltc/src/ltcdisplayparamsconst.cpp | 2 +- lib-ltc/src/ltcencoder.cpp | 4 +- lib-ltc/src/ltcetc.cpp | 2 +- lib-ltc/src/ltcetcparams.cpp | 2 +- lib-ltc/src/ltcetcparamsconst.cpp | 2 +- lib-ltc/src/ltcmidisystemrealtime.cpp | 2 +- lib-ltc/src/ltcparams.cpp | 4 +- lib-ltc/src/ltcparamsconst.cpp | 2 +- lib-ltc/src/ltcparamsgetsourcetype.cpp | 2 +- lib-ltc/src/ntpserver.cpp | 2 +- lib-ltc/src/tcnetdisplay.cpp | 2 +- lib-ltc/src/timecodeconst.cpp | 8 ++- lib-midi/.cproject | 13 +++-- lib-midi/.settings/language.settings.xml | 2 +- lib-midi/include/applemidi.h | 2 +- lib-midi/include/midi.h | 2 +- lib-midi/include/midibpm.h | 2 +- lib-midi/include/mididescription.h | 2 +- lib-midi/include/midiparams.h | 2 +- lib-midi/include/midiparamsconst.h | 2 +- lib-midi/include/rtpmidi.h | 2 +- lib-midi/src/{ => arm}/gd32/platform_midi.h | 2 +- lib-midi/src/{ => arm}/h3/platform_midi.h | 2 +- lib-midi/src/arm/midi.cpp | 2 +- lib-midi/src/arm/platform_midi.h | 6 +-- lib-midi/src/midi.cpp | 2 +- lib-midi/src/mididescription.cpp | 2 +- lib-midi/src/midiparams.cpp | 2 +- lib-midi/src/midiparamsconst.cpp | 2 +- lib-midi/src/net/applemidi.cpp | 2 +- lib-midi/src/net/rtpmidi.cpp | 2 +- 96 files changed, 223 insertions(+), 132 deletions(-) delete mode 100755 lib-ltc/Makefile.GD32 create mode 100644 lib-ltc/src/arm/gd32/platform_ltc.h mode change 100644 => 100755 lib-ltc/src/arm/ltcreader.cpp rename lib-midi/src/{ => arm}/gd32/platform_midi.h (94%) rename lib-midi/src/{ => arm}/h3/platform_midi.h (96%) diff --git a/lib-ltc/Makefile.GD32 b/lib-ltc/Makefile.GD32 deleted file mode 100755 index efcc7a891..000000000 --- a/lib-ltc/Makefile.GD32 +++ /dev/null @@ -1,17 +0,0 @@ -DEFINES= - -EXTRA_INCLUDES= - -EXTRA_SRCDIR=src/arm src/arm/gd32 - -ifneq ($(MAKE_FLAGS),) -else - DEFINES+=CONFIG_LTC_DISABLE_GPIO_BUTTONS - - DEFINES+=CONFIG_LTC_DISABLE_RGB_PANEL - DEFINES+=CONFIG_LTC_DISABLE_WS28XX -endif - -include Rules.mk -include ../firmware-template-gd32/lib/Rules.mk - diff --git a/lib-ltc/include/artnetreader.h b/lib-ltc/include/artnetreader.h index a2931b70a..784e61d6c 100644 --- a/lib-ltc/include/artnetreader.h +++ b/lib-ltc/include/artnetreader.h @@ -2,7 +2,7 @@ * @file artnetreader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltc.h b/lib-ltc/include/ltc.h index c38de591c..a7dd86863 100644 --- a/lib-ltc/include/ltc.h +++ b/lib-ltc/include/ltc.h @@ -2,7 +2,7 @@ * @file ltc.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltc7segment.h b/lib-ltc/include/ltc7segment.h index 2fff34c0e..332560ae5 100644 --- a/lib-ltc/include/ltc7segment.h +++ b/lib-ltc/include/ltc7segment.h @@ -2,7 +2,7 @@ * @file ltc7segment.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplaymax7219.h b/lib-ltc/include/ltcdisplaymax7219.h index 96ec2b7a9..e2b594176 100644 --- a/lib-ltc/include/ltcdisplaymax7219.h +++ b/lib-ltc/include/ltcdisplaymax7219.h @@ -1,7 +1,7 @@ /** * @file ltcdisplaymax7219.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplaymax72197segment.h b/lib-ltc/include/ltcdisplaymax72197segment.h index 05f6d6cea..087856317 100644 --- a/lib-ltc/include/ltcdisplaymax72197segment.h +++ b/lib-ltc/include/ltcdisplaymax72197segment.h @@ -2,7 +2,7 @@ * @file ltcdisplaymax72197segment.h * */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplaymax7219matrix.h b/lib-ltc/include/ltcdisplaymax7219matrix.h index 0cb65163d..1f3afbb27 100644 --- a/lib-ltc/include/ltcdisplaymax7219matrix.h +++ b/lib-ltc/include/ltcdisplaymax7219matrix.h @@ -2,7 +2,7 @@ * @file ltcdisplaymax7219matrix.h * */ -/* Copyright (C) 2019-2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplaymax7219set.h b/lib-ltc/include/ltcdisplaymax7219set.h index bcab98805..698db5b9e 100644 --- a/lib-ltc/include/ltcdisplaymax7219set.h +++ b/lib-ltc/include/ltcdisplaymax7219set.h @@ -2,7 +2,7 @@ * @file ltcdisplaymax7219set.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayparams.h b/lib-ltc/include/ltcdisplayparams.h index 1f86fecc2..01ea8374e 100644 --- a/lib-ltc/include/ltcdisplayparams.h +++ b/lib-ltc/include/ltcdisplayparams.h @@ -2,7 +2,7 @@ * @file ltcdisplayparams.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayparamsconst.h b/lib-ltc/include/ltcdisplayparamsconst.h index 60ba78535..e644c96a2 100644 --- a/lib-ltc/include/ltcdisplayparamsconst.h +++ b/lib-ltc/include/ltcdisplayparamsconst.h @@ -2,7 +2,7 @@ * @file ltcdisplayparamsconst.h * */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayrgb.h b/lib-ltc/include/ltcdisplayrgb.h index bfe5a0927..21ca834a2 100644 --- a/lib-ltc/include/ltcdisplayrgb.h +++ b/lib-ltc/include/ltcdisplayrgb.h @@ -3,7 +3,7 @@ */ /* * Copyright (C) 2019-2020 by hippy mailto:dmxout@gmail.com - * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayrgbpanel.h b/lib-ltc/include/ltcdisplayrgbpanel.h index 1619327e9..9dd5d7a86 100644 --- a/lib-ltc/include/ltcdisplayrgbpanel.h +++ b/lib-ltc/include/ltcdisplayrgbpanel.h @@ -2,7 +2,7 @@ * @file ltcdisplayrgbpanel.h */ /* - * Copyright (C) 2020 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayrgbset.h b/lib-ltc/include/ltcdisplayrgbset.h index 08559b15a..43fe6e59e 100644 --- a/lib-ltc/include/ltcdisplayrgbset.h +++ b/lib-ltc/include/ltcdisplayrgbset.h @@ -1,7 +1,7 @@ /** * @file ltcdisplayrgbset.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayws28xx7segment.h b/lib-ltc/include/ltcdisplayws28xx7segment.h index b559d1928..e61a25f77 100644 --- a/lib-ltc/include/ltcdisplayws28xx7segment.h +++ b/lib-ltc/include/ltcdisplayws28xx7segment.h @@ -3,7 +3,7 @@ */ /* * Copyright (C) 2019-2020 by hippy mailto:dmxout@gmail.com - * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcdisplayws28xxmatrix.h b/lib-ltc/include/ltcdisplayws28xxmatrix.h index 4427122ea..dcc8b0c5b 100644 --- a/lib-ltc/include/ltcdisplayws28xxmatrix.h +++ b/lib-ltc/include/ltcdisplayws28xxmatrix.h @@ -1,7 +1,7 @@ /** * @file ltcdisplayws28xxmatrix.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcencoder.h b/lib-ltc/include/ltcencoder.h index 9f2f2f31b..859e1bcc7 100644 --- a/lib-ltc/include/ltcencoder.h +++ b/lib-ltc/include/ltcencoder.h @@ -1,7 +1,7 @@ /** * @file ltcencoder.h */ -/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcetc.h b/lib-ltc/include/ltcetc.h index a24cb3d5f..aff5885bf 100644 --- a/lib-ltc/include/ltcetc.h +++ b/lib-ltc/include/ltcetc.h @@ -2,7 +2,7 @@ * @file ltcetc.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcetcparams.h b/lib-ltc/include/ltcetcparams.h index c79ad8c45..27e49c457 100644 --- a/lib-ltc/include/ltcetcparams.h +++ b/lib-ltc/include/ltcetcparams.h @@ -2,7 +2,7 @@ * @file ltcetcparams.h * */ -/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcetcparamsconst.h b/lib-ltc/include/ltcetcparamsconst.h index 34fdd222d..cd306753e 100644 --- a/lib-ltc/include/ltcetcparamsconst.h +++ b/lib-ltc/include/ltcetcparamsconst.h @@ -2,7 +2,7 @@ * @file ltcetcparamsconst.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcetcreader.h b/lib-ltc/include/ltcetcreader.h index a824db951..d96d54638 100644 --- a/lib-ltc/include/ltcetcreader.h +++ b/lib-ltc/include/ltcetcreader.h @@ -2,7 +2,7 @@ * @file ltcetcreader.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcgenerator.h b/lib-ltc/include/ltcgenerator.h index 9da62acc4..a719e692a 100644 --- a/lib-ltc/include/ltcgenerator.h +++ b/lib-ltc/include/ltcgenerator.h @@ -2,7 +2,7 @@ * @file ltcgenerator.h * */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcmidisystemrealtime.h b/lib-ltc/include/ltcmidisystemrealtime.h index d04a00fee..afe2015f5 100644 --- a/lib-ltc/include/ltcmidisystemrealtime.h +++ b/lib-ltc/include/ltcmidisystemrealtime.h @@ -2,7 +2,7 @@ * @file ltcmidisystemrealtime.h * */ -/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcoutputs.h b/lib-ltc/include/ltcoutputs.h index f1ecbc1a5..1c5933bb7 100644 --- a/lib-ltc/include/ltcoutputs.h +++ b/lib-ltc/include/ltcoutputs.h @@ -2,7 +2,7 @@ * @file ltcoutputs.h * */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcparams.h b/lib-ltc/include/ltcparams.h index a617c4a81..c60490368 100644 --- a/lib-ltc/include/ltcparams.h +++ b/lib-ltc/include/ltcparams.h @@ -1,7 +1,7 @@ /** * @file ltcparams.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcparamsconst.h b/lib-ltc/include/ltcparamsconst.h index 1a61eaa2f..01c048f56 100644 --- a/lib-ltc/include/ltcparamsconst.h +++ b/lib-ltc/include/ltcparamsconst.h @@ -1,7 +1,7 @@ /** * @file ltcparamsconst.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcreader.h b/lib-ltc/include/ltcreader.h index fdfcdc014..395d4ade4 100644 --- a/lib-ltc/include/ltcreader.h +++ b/lib-ltc/include/ltcreader.h @@ -2,7 +2,7 @@ * @file ltcreader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcsender.h b/lib-ltc/include/ltcsender.h index f7be9c8ea..5c6b3858d 100644 --- a/lib-ltc/include/ltcsender.h +++ b/lib-ltc/include/ltcsender.h @@ -2,7 +2,7 @@ * @file ltcsender.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ltcstore.h b/lib-ltc/include/ltcstore.h index e6511d942..0345c36fa 100755 --- a/lib-ltc/include/ltcstore.h +++ b/lib-ltc/include/ltcstore.h @@ -2,7 +2,7 @@ * @file ltcstore.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/midireader.h b/lib-ltc/include/midireader.h index 80a906391..d607f4e50 100644 --- a/lib-ltc/include/midireader.h +++ b/lib-ltc/include/midireader.h @@ -2,7 +2,7 @@ * @file midireader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/ntpserver.h b/lib-ltc/include/ntpserver.h index 75f63fea2..40360d7ce 100644 --- a/lib-ltc/include/ntpserver.h +++ b/lib-ltc/include/ntpserver.h @@ -2,7 +2,7 @@ * @file ntpserver.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/platform_ltc.h b/lib-ltc/include/platform_ltc.h index 941ba2ad3..7fc41e86b 100755 --- a/lib-ltc/include/platform_ltc.h +++ b/lib-ltc/include/platform_ltc.h @@ -2,7 +2,7 @@ * @file platform_ltc.h * */ -/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/rtpmidireader.h b/lib-ltc/include/rtpmidireader.h index 5d0dd085b..00ac56cac 100644 --- a/lib-ltc/include/rtpmidireader.h +++ b/lib-ltc/include/rtpmidireader.h @@ -2,7 +2,7 @@ * @file rtpmidireader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/systimereader.h b/lib-ltc/include/systimereader.h index fd5d7219b..44d04ceb5 100644 --- a/lib-ltc/include/systimereader.h +++ b/lib-ltc/include/systimereader.h @@ -2,7 +2,7 @@ * @file systimereader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/tcnetdisplay.h b/lib-ltc/include/tcnetdisplay.h index 9c4f5d54e..283295421 100644 --- a/lib-ltc/include/tcnetdisplay.h +++ b/lib-ltc/include/tcnetdisplay.h @@ -2,7 +2,7 @@ * @file tcnetdisplay.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/tcnetreader.h b/lib-ltc/include/tcnetreader.h index 93e6a4d5d..2100337ab 100644 --- a/lib-ltc/include/tcnetreader.h +++ b/lib-ltc/include/tcnetreader.h @@ -2,7 +2,7 @@ * @file tcnetreader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/include/timecodeconst.h b/lib-ltc/include/timecodeconst.h index 484a243fe..bff89cebd 100644 --- a/lib-ltc/include/timecodeconst.h +++ b/lib-ltc/include/timecodeconst.h @@ -1,7 +1,7 @@ /** * @file timecodeconst.h */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/artnetreader.cpp b/lib-ltc/src/arm/artnetreader.cpp index d01fe6c70..18c4bf516 100644 --- a/lib-ltc/src/arm/artnetreader.cpp +++ b/lib-ltc/src/arm/artnetreader.cpp @@ -2,7 +2,7 @@ * @file artnetreader.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/gd32/gd32_platform_ltc.h b/lib-ltc/src/arm/gd32/gd32_platform_ltc.h index b895e05bd..dd6a16c3e 100644 --- a/lib-ltc/src/arm/gd32/gd32_platform_ltc.h +++ b/lib-ltc/src/arm/gd32/gd32_platform_ltc.h @@ -2,7 +2,7 @@ * @file gd32_platform_ltc.h * */ -/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/gd32/ltcsender.cpp b/lib-ltc/src/arm/gd32/ltcsender.cpp index 16dfee6ce..776a162de 100644 --- a/lib-ltc/src/arm/gd32/ltcsender.cpp +++ b/lib-ltc/src/arm/gd32/ltcsender.cpp @@ -2,7 +2,7 @@ * @file ltcsender.cpp * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ LtcSender *LtcSender::s_pThis; -LtcSender::LtcSender(uint32_t nVolume) { +LtcSender::LtcSender([[maybe_unused]] uint32_t nVolume) { assert(s_pThis == nullptr); s_pThis = this; diff --git a/lib-ltc/src/arm/gd32/platform_ltc.cpp b/lib-ltc/src/arm/gd32/platform_ltc.cpp index 61e59fcfe..71e19702c 100644 --- a/lib-ltc/src/arm/gd32/platform_ltc.cpp +++ b/lib-ltc/src/arm/gd32/platform_ltc.cpp @@ -2,7 +2,7 @@ * @file platform_ltc.cpp * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,20 +26,22 @@ #include #include +#include "gd32.h" #include "ltc.h" extern "C" { void TIMER6_IRQHandler() { - __DMB(); + const auto nIntFlag = TIMER_INTF(TIMER6); - gv_ltc_nUpdatesPerSecond = gv_ltc_nUpdates - gv_ltc_nUpdatesPrevious; - gv_ltc_nUpdatesPrevious = gv_ltc_nUpdates; + if ((nIntFlag & TIMER_INT_FLAG_UP) == TIMER_INT_FLAG_UP) { + gv_ltc_nUpdatesPerSecond = gv_ltc_nUpdates - gv_ltc_nUpdatesPrevious; + gv_ltc_nUpdatesPrevious = gv_ltc_nUpdates; + } - __DMB(); + timer_interrupt_flag_clear(TIMER6, nIntFlag); } void TIMER7_BRK_TIMER11_IRQHandler() { - __DMB(); const auto nIntFlag = TIMER_INTF(TIMER11); if ((nIntFlag & TIMER_INT_FLAG_CH0) == TIMER_INT_FLAG_CH0) { @@ -50,7 +52,6 @@ void TIMER7_BRK_TIMER11_IRQHandler() { } timer_interrupt_flag_clear(TIMER11, nIntFlag); - __DMB(); } } @@ -63,7 +64,7 @@ void timer6_config() { timer_parameter_struct timer_initpara; timer_initpara.prescaler = TIMER_PSC_10KHZ; - timer_initpara.period = 10000; // 1 second + timer_initpara.period = 10000 - 1; // 1 second timer_init(TIMER6, &timer_initpara); timer_flag_clear(TIMER6, ~0); @@ -71,12 +72,16 @@ void timer6_config() { timer_interrupt_enable(TIMER6, TIMER_INT_UP); -// NVIC_SetPriority(TIMER6_IRQn, 0); + NVIC_SetPriority(TIMER6_IRQn, (1UL<<__NVIC_PRIO_BITS)-1UL); // Lowest priority NVIC_EnableIRQ(TIMER6_IRQn); timer_enable(TIMER6); } +void timer12_config() { + +} + void timer11_config() { rcu_periph_clock_enable(RCU_TIMER11); timer_deinit(TIMER11); diff --git a/lib-ltc/src/arm/gd32/platform_ltc.h b/lib-ltc/src/arm/gd32/platform_ltc.h new file mode 100644 index 000000000..c989f7a38 --- /dev/null +++ b/lib-ltc/src/arm/gd32/platform_ltc.h @@ -0,0 +1,41 @@ +/** + * @file platform_ltc.h + * + */ +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef GD32_PLATFORM_LTC_H_ +#define GD32_PLATFORM_LTC_H_ + +#include + +#include "gd32.h" + +namespace platform { +namespace ltc { +void timer6_config(); +void timer11_config(); +} // namespace ltc +} // namespace platform + + +#endif /* GD32_PLATFORM_LTC_H_ */ diff --git a/lib-ltc/src/arm/h3/h3_platform_ltc.h b/lib-ltc/src/arm/h3/h3_platform_ltc.h index 1610b46e2..dfaa2c738 100644 --- a/lib-ltc/src/arm/h3/h3_platform_ltc.h +++ b/lib-ltc/src/arm/h3/h3_platform_ltc.h @@ -2,7 +2,7 @@ * @file platform_ltc.h * */ -/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/h3/ltcsender.cpp b/lib-ltc/src/arm/h3/ltcsender.cpp index 9b53a4180..280c8dc6e 100644 --- a/lib-ltc/src/arm/h3/ltcsender.cpp +++ b/lib-ltc/src/arm/h3/ltcsender.cpp @@ -2,7 +2,7 @@ * @file ltcsender.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/ltcetcreader.cpp b/lib-ltc/src/arm/ltcetcreader.cpp index ce8384043..6ee73f96d 100644 --- a/lib-ltc/src/arm/ltcetcreader.cpp +++ b/lib-ltc/src/arm/ltcetcreader.cpp @@ -2,7 +2,7 @@ * @file ltcetcreader.cpp * */ -/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/ltcgenerator.cpp b/lib-ltc/src/arm/ltcgenerator.cpp index baa183e1b..91cb7e111 100644 --- a/lib-ltc/src/arm/ltcgenerator.cpp +++ b/lib-ltc/src/arm/ltcgenerator.cpp @@ -2,7 +2,7 @@ * @file ltcgenerator.cpp * */ -/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/ltcmidisystemrealtime.cpp b/lib-ltc/src/arm/ltcmidisystemrealtime.cpp index 900515d3a..c26bde494 100644 --- a/lib-ltc/src/arm/ltcmidisystemrealtime.cpp +++ b/lib-ltc/src/arm/ltcmidisystemrealtime.cpp @@ -2,7 +2,7 @@ * @file ltcmidisystemrealtime.cpp * */ -/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -78,7 +78,7 @@ void LtcMidiSystemRealtime::SetBPM(uint32_t nBPM) { #endif } else if ((nBPM >= midi::bpm::MIN) && (nBPM <= midi::bpm::MAX)) { #if defined (H3) - const uint32_t nValue = 60000000 / nBPM; + const uint32_t nValue = 60000000U / nBPM; irq_timer_arm_virtual_set(reinterpret_cast(timer_handler), nValue); #elif defined (GD32) #endif diff --git a/lib-ltc/src/arm/ltcoutputs.cpp b/lib-ltc/src/arm/ltcoutputs.cpp index fe747a232..9bcb02f0c 100644 --- a/lib-ltc/src/arm/ltcoutputs.cpp +++ b/lib-ltc/src/arm/ltcoutputs.cpp @@ -2,7 +2,7 @@ * @file ltcoutputs.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -57,6 +57,15 @@ static void irq_timer1_midi_handler([[maybe_unused]] uint32_t clo) { sv_isMidiQuarterFrameMessage = true; } #elif defined (GD32) +void TIMER12_IRQHandler() { + const auto nIntFlag = TIMER_INTF(TIMER12); + + if ((nIntFlag & TIMER_INT_FLAG_UP) == TIMER_INT_FLAG_UP) { + sv_isMidiQuarterFrameMessage = true; + } + + timer_interrupt_flag_clear(TIMER12, nIntFlag); +} #endif LtcOutputs *LtcOutputs::s_pThis; @@ -116,6 +125,8 @@ void LtcOutputs::Update(const struct ltc::TimeCode *ptLtcTimeCode) { H3_TIMER->TMR1_INTV = TimeCodeConst::TMR_INTV[ptLtcTimeCode->nType] / 4; H3_TIMER->TMR1_CTRL |= (TIMER_CTRL_EN_START | TIMER_CTRL_RELOAD); #elif defined (GD32) + TIMER_CNT(TIMER11) = 0; + TIMER_CH0CV(TIMER11) = TimeCodeConst::TMR_INTV[ptLtcTimeCode->nType] / 4; #endif m_nMidiQuarterFramePiece = 0; diff --git a/lib-ltc/src/arm/ltcreader.cpp b/lib-ltc/src/arm/ltcreader.cpp old mode 100644 new mode 100755 index ef508765a..384815a15 --- a/lib-ltc/src/arm/ltcreader.cpp +++ b/lib-ltc/src/arm/ltcreader.cpp @@ -2,7 +2,7 @@ * @file ltcreader.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,10 @@ * THE SOFTWARE. */ +#pragma GCC push_options +#pragma GCC optimize ("O2") +#pragma GCC optimize ("no-tree-loop-distribute-patterns") + #include #include #ifndef NDEBUG @@ -90,7 +94,12 @@ static void arm_timer_handler(void) { static void __attribute__((interrupt("FIQ"))) fiq_handler() { #elif defined (GD32) extern "C" { -void EXTI4_IRQHandler() { +void EXTI10_15_IRQHandler() { + if (0 != exti_interrupt_flag_get(EXTI_14)) { + exti_interrupt_flag_clear(EXTI_14); +# ifndef NDEBUG + GPIO_TG(GPIOA) = GPIO_PIN_4; +# endif #endif __DMB(); @@ -106,6 +115,12 @@ void EXTI4_IRQHandler() { nBitTime = nFiqUsCurrent - nFiqUsPrevious; } #elif defined (GD32) + nFiqUsCurrent = TIMER_CNT(TIMER5); + if (nFiqUsCurrent >= nFiqUsPrevious) { + nBitTime = nFiqUsCurrent - nFiqUsPrevious; + } else { + nBitTime = UINT16_MAX - (nFiqUsPrevious - nFiqUsCurrent); + } #endif nFiqUsPrevious = nFiqUsCurrent; @@ -173,7 +188,9 @@ void EXTI4_IRQHandler() { bTimeCodeAvailable = true; } } - +#if defined (GD32) + } +#endif __DMB(); } #if defined (GD32) @@ -207,6 +224,31 @@ void LtcReader::Start() { __enable_fiq(); #elif defined (GD32) platform::ltc::timer6_config(); + /** + * https://www.gd32-dmx.org/dev-board.html + * GPIO_EXT_26 = PA14 + */ + static_assert(GD32_GPIO_TO_NUMBER(GPIO_EXT_26) == 14, "GPIO PIN is not 14"); + static_assert(GD32_GPIO_TO_PORT(GPIO_EXT_26) == GD32_GPIO_PORTA, "GPIO PORT is not A"); + + rcu_periph_clock_enable(RCU_GPIOA); + gpio_mode_set(GPIOA, GPIO_MODE_INPUT, GPIO_PUPD_PULLDOWN, GPIO_PIN_14); + /* connect key EXTI line to key GPIO pin */ + syscfg_exti_line_config(EXTI_SOURCE_GPIOA, EXTI_SOURCE_PIN14); + /* configure key EXTI line */ + exti_init(EXTI_14, EXTI_INTERRUPT, EXTI_TRIG_BOTH); + exti_interrupt_flag_clear(EXTI_14); + NVIC_EnableIRQ(EXTI10_15_IRQn); +#ifndef NDEBUG + rcu_periph_clock_enable(RCU_GPIOA); +# if defined (GPIO_INIT) + gpio_init(GPIOA, GPIO_MODE_OUT_PP, GPIO_OSPEED_50MHZ, GPIO_PIN_4); +# else + gpio_mode_set(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO_PIN_4); + gpio_output_options_set(GPIOA, GPIO_OTYPE_PP, GPIO_OSPEED, GPIO_PIN_4); +# endif + GPIO_BOP(GPIOA) = GPIO_PIN_4; +# endif #endif } @@ -264,6 +306,8 @@ void LtcReader::Run() { H3_TIMER->TMR1_INTV = TimeCodeConst::TMR_INTV[static_cast(TimeCodeType)] / 4; H3_TIMER->TMR1_CTRL |= (TIMER_CTRL_EN_START | TIMER_CTRL_RELOAD); #elif defined (GD32) + TIMER_CNT(TIMER11) = 0; + TIMER_CH0CV(TIMER11) = TimeCodeConst::TMR_INTV[static_cast(TimeCodeType)] / 4; #endif } diff --git a/lib-ltc/src/arm/midireader.cpp b/lib-ltc/src/arm/midireader.cpp index 8577056bf..62168e8be 100644 --- a/lib-ltc/src/arm/midireader.cpp +++ b/lib-ltc/src/arm/midireader.cpp @@ -2,7 +2,7 @@ * @file midireader.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/platform_ltc.cpp b/lib-ltc/src/arm/platform_ltc.cpp index 879e322ff..ee7f82961 100644 --- a/lib-ltc/src/arm/platform_ltc.cpp +++ b/lib-ltc/src/arm/platform_ltc.cpp @@ -2,7 +2,7 @@ * @file platform_ltc.cpp * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/rtpmidireader.cpp b/lib-ltc/src/arm/rtpmidireader.cpp index f18044902..ef0422758 100644 --- a/lib-ltc/src/arm/rtpmidireader.cpp +++ b/lib-ltc/src/arm/rtpmidireader.cpp @@ -2,7 +2,7 @@ * @file rtpmidireader.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/systimereader.cpp b/lib-ltc/src/arm/systimereader.cpp index 8d29b2d7e..6df7a563a 100644 --- a/lib-ltc/src/arm/systimereader.cpp +++ b/lib-ltc/src/arm/systimereader.cpp @@ -2,7 +2,7 @@ * @file systimereader.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/arm/tcnetreader.cpp b/lib-ltc/src/arm/tcnetreader.cpp index 18a1659db..a1ead1e4c 100644 --- a/lib-ltc/src/arm/tcnetreader.cpp +++ b/lib-ltc/src/arm/tcnetreader.cpp @@ -2,7 +2,7 @@ * @file tcnetreader.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/ltcdisplayrgb.cpp b/lib-ltc/src/displayrgb/ltcdisplayrgb.cpp index fb5652344..e8bc51b5b 100644 --- a/lib-ltc/src/displayrgb/ltcdisplayrgb.cpp +++ b/lib-ltc/src/displayrgb/ltcdisplayrgb.cpp @@ -3,7 +3,7 @@ */ /* * Copyright (C) 2019-2020 by hippy mailto:dmxout@gmail.com - * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/ltcdisplayrgbset.cpp b/lib-ltc/src/displayrgb/ltcdisplayrgbset.cpp index 2a98973ad..604144901 100644 --- a/lib-ltc/src/displayrgb/ltcdisplayrgbset.cpp +++ b/lib-ltc/src/displayrgb/ltcdisplayrgbset.cpp @@ -1,7 +1,7 @@ /** * @file ltcdisplayrgbset.cpp */ -/* Copyright (C) 2020-2021 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2021 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/ltcdisplayrgbsetrgb.cpp b/lib-ltc/src/displayrgb/ltcdisplayrgbsetrgb.cpp index e1b5d38a2..fde40f9cc 100644 --- a/lib-ltc/src/displayrgb/ltcdisplayrgbsetrgb.cpp +++ b/lib-ltc/src/displayrgb/ltcdisplayrgbsetrgb.cpp @@ -3,7 +3,7 @@ */ /* * Copyright (C) 2019-2020 by hippy mailto:dmxout@gmail.com - * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/panel/ltcdisplayrgbpanel.cpp b/lib-ltc/src/displayrgb/panel/ltcdisplayrgbpanel.cpp index 7949ceaa7..6a72fd448 100644 --- a/lib-ltc/src/displayrgb/panel/ltcdisplayrgbpanel.cpp +++ b/lib-ltc/src/displayrgb/panel/ltcdisplayrgbpanel.cpp @@ -2,7 +2,7 @@ * @file ltcdisplayrgbpanel.cpp */ /* - * Copyright (C) 2020-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2020-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xx7segment.cpp b/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xx7segment.cpp index 3a18ebd81..4c457f91c 100644 --- a/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xx7segment.cpp +++ b/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xx7segment.cpp @@ -3,7 +3,7 @@ */ /* * Copyright (C) 2019-2020 by hippy mailto:dmxout@gmail.com - * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl + * Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xxmatrix.cpp b/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xxmatrix.cpp index 284c66e46..f22fc27bc 100644 --- a/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xxmatrix.cpp +++ b/lib-ltc/src/displayrgb/ws28xx/ltcdisplayws28xxmatrix.cpp @@ -1,7 +1,7 @@ /** * @file ltcdisplayws28xxmatrix.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltc.cpp b/lib-ltc/src/ltc.cpp index 3720bfd90..2c71d4b21 100644 --- a/lib-ltc/src/ltc.cpp +++ b/lib-ltc/src/ltc.cpp @@ -2,7 +2,7 @@ * @file ltc.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltc7segment.cpp b/lib-ltc/src/ltc7segment.cpp index b5979f4d1..2b68537b6 100644 --- a/lib-ltc/src/ltc7segment.cpp +++ b/lib-ltc/src/ltc7segment.cpp @@ -2,7 +2,7 @@ * @file ltc7segment.cpp.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcdisplaymax7219.cpp b/lib-ltc/src/ltcdisplaymax7219.cpp index ec3fe0ac2..005a50471 100644 --- a/lib-ltc/src/ltcdisplaymax7219.cpp +++ b/lib-ltc/src/ltcdisplaymax7219.cpp @@ -1,7 +1,7 @@ /** * @file ltcdisplaymax7219.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcdisplaymax72197segment.cpp b/lib-ltc/src/ltcdisplaymax72197segment.cpp index 81abfbbfe..1ced185f2 100644 --- a/lib-ltc/src/ltcdisplaymax72197segment.cpp +++ b/lib-ltc/src/ltcdisplaymax72197segment.cpp @@ -2,7 +2,7 @@ * @file ltcdisplaymax72197segment.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcdisplaymax7219matrix.cpp b/lib-ltc/src/ltcdisplaymax7219matrix.cpp index 734594378..1229b3dd2 100644 --- a/lib-ltc/src/ltcdisplaymax7219matrix.cpp +++ b/lib-ltc/src/ltcdisplaymax7219matrix.cpp @@ -2,7 +2,7 @@ * @file ltcdisplaymax7219matrix.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcdisplayparams.cpp b/lib-ltc/src/ltcdisplayparams.cpp index c8f317a19..f2234285a 100644 --- a/lib-ltc/src/ltcdisplayparams.cpp +++ b/lib-ltc/src/ltcdisplayparams.cpp @@ -2,7 +2,7 @@ * @file ltcdisplayparams.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcdisplayparamsconst.cpp b/lib-ltc/src/ltcdisplayparamsconst.cpp index 3d58e5af2..033282176 100644 --- a/lib-ltc/src/ltcdisplayparamsconst.cpp +++ b/lib-ltc/src/ltcdisplayparamsconst.cpp @@ -2,7 +2,7 @@ * @file ltcdisplayparamsconst.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcencoder.cpp b/lib-ltc/src/ltcencoder.cpp index 6a27dbf2e..7e45d5357 100644 --- a/lib-ltc/src/ltcencoder.cpp +++ b/lib-ltc/src/ltcencoder.cpp @@ -1,7 +1,7 @@ /** * @file ltcencoder.cpp */ -/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -121,7 +121,9 @@ LtcEncoder::~LtcEncoder() { void LtcEncoder::Encode() { const auto *p = reinterpret_cast(m_pLtcBits); +#if defined (CONFIG_LTC_USE_DAC) //Hack auto *dst = m_pBuffer; +#endif uint32_t nIdx; uint32_t nIdxPrevious = 1; // Force rising first diff --git a/lib-ltc/src/ltcetc.cpp b/lib-ltc/src/ltcetc.cpp index 8264d9bca..44fae2b6e 100644 --- a/lib-ltc/src/ltcetc.cpp +++ b/lib-ltc/src/ltcetc.cpp @@ -2,7 +2,7 @@ * @file ltcetc.cpp * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcetcparams.cpp b/lib-ltc/src/ltcetcparams.cpp index 2547ce808..c1e46f917 100644 --- a/lib-ltc/src/ltcetcparams.cpp +++ b/lib-ltc/src/ltcetcparams.cpp @@ -2,7 +2,7 @@ * @file ltcetcparams.cpp * */ -/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcetcparamsconst.cpp b/lib-ltc/src/ltcetcparamsconst.cpp index b5978a8f1..a06d5ebb2 100644 --- a/lib-ltc/src/ltcetcparamsconst.cpp +++ b/lib-ltc/src/ltcetcparamsconst.cpp @@ -2,7 +2,7 @@ * @file ltcetcparamsconst.cpp * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcmidisystemrealtime.cpp b/lib-ltc/src/ltcmidisystemrealtime.cpp index a30ec487a..4096a4e15 100644 --- a/lib-ltc/src/ltcmidisystemrealtime.cpp +++ b/lib-ltc/src/ltcmidisystemrealtime.cpp @@ -2,7 +2,7 @@ * @file ltcmidisystemrealtime.cpp * */ -/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcparams.cpp b/lib-ltc/src/ltcparams.cpp index 92394a6d1..8a7bcdf64 100644 --- a/lib-ltc/src/ltcparams.cpp +++ b/lib-ltc/src/ltcparams.cpp @@ -1,7 +1,7 @@ /** * @file ltcparams.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -374,7 +374,7 @@ void LtcParams::Set(struct ltc::TimeCode *ptStartTimeCode, struct ltc::TimeCode g_ltc_ptLtcDisabledOutputs.bRgbPanel = false; #endif - assert (g_ltc_ptLtcDisabledOutputs.bWS28xx || g_ltc_ptLtcDisabledOutputs.bRgbPanel); +// assert (g_ltc_ptLtcDisabledOutputs.bWS28xx || g_ltc_ptLtcDisabledOutputs.bRgbPanel); assert(ptStartTimeCode != nullptr); diff --git a/lib-ltc/src/ltcparamsconst.cpp b/lib-ltc/src/ltcparamsconst.cpp index 8ccb708d8..969abe8e2 100644 --- a/lib-ltc/src/ltcparamsconst.cpp +++ b/lib-ltc/src/ltcparamsconst.cpp @@ -1,7 +1,7 @@ /** * @file ltcparamsconst.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ltcparamsgetsourcetype.cpp b/lib-ltc/src/ltcparamsgetsourcetype.cpp index 5243be8b5..d28096eee 100644 --- a/lib-ltc/src/ltcparamsgetsourcetype.cpp +++ b/lib-ltc/src/ltcparamsgetsourcetype.cpp @@ -2,7 +2,7 @@ * @file ltcparamsgetsourcetype.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/ntpserver.cpp b/lib-ltc/src/ntpserver.cpp index 21ab2e28b..59fc14cf5 100644 --- a/lib-ltc/src/ntpserver.cpp +++ b/lib-ltc/src/ntpserver.cpp @@ -2,7 +2,7 @@ * @file ntpserver.cpp * */ -/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/tcnetdisplay.cpp b/lib-ltc/src/tcnetdisplay.cpp index d7b3223bf..dd5888c0b 100644 --- a/lib-ltc/src/tcnetdisplay.cpp +++ b/lib-ltc/src/tcnetdisplay.cpp @@ -2,7 +2,7 @@ * @file tcnetdisplay.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-ltc/src/timecodeconst.cpp b/lib-ltc/src/timecodeconst.cpp index d00f60e2e..fb7ec573b 100644 --- a/lib-ltc/src/timecodeconst.cpp +++ b/lib-ltc/src/timecodeconst.cpp @@ -1,7 +1,7 @@ /** * @file timecodeconst.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,4 +27,10 @@ #include "timecodeconst.h" const uint8_t TimeCodeConst::FPS[4] = { 24, 25, 30, 30 }; +#if defined (H3) const uint32_t TimeCodeConst::TMR_INTV[4] = {12000000 / 24, 12000000 / 25, 12000000 / 30, 12000000 / 30}; +#elif defined (GD32) +# include "gd32.h" +# define MASTER_TIMER_CLOCK (APB2_CLOCK_FREQ * 2) + const uint32_t TimeCodeConst::TMR_INTV[4] = {(MASTER_TIMER_CLOCK / 24) - 1, (MASTER_TIMER_CLOCK / 25) - 1, (MASTER_TIMER_CLOCK / 30) - 1, (MASTER_TIMER_CLOCK / 30) - 1}; +#endif diff --git a/lib-midi/.cproject b/lib-midi/.cproject index d94e057b1..90d7757fb 100644 --- a/lib-midi/.cproject +++ b/lib-midi/.cproject @@ -5,7 +5,6 @@ - @@ -84,8 +83,8 @@ - - + + @@ -98,7 +97,6 @@ - @@ -164,9 +162,10 @@ - - - + + + + diff --git a/lib-midi/.settings/language.settings.xml b/lib-midi/.settings/language.settings.xml index 759c69a94..35cd85b02 100644 --- a/lib-midi/.settings/language.settings.xml +++ b/lib-midi/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/lib-midi/include/applemidi.h b/lib-midi/include/applemidi.h index be7eac5c8..4efe7fa71 100644 --- a/lib-midi/include/applemidi.h +++ b/lib-midi/include/applemidi.h @@ -2,7 +2,7 @@ * @file applemidi.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/midi.h b/lib-midi/include/midi.h index 0d0dbf5b4..5ba77f735 100644 --- a/lib-midi/include/midi.h +++ b/lib-midi/include/midi.h @@ -2,7 +2,7 @@ * @file midi.h * */ -/* Copyright (C) 2016-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2016-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/midibpm.h b/lib-midi/include/midibpm.h index d690b15d9..6f9dbba92 100644 --- a/lib-midi/include/midibpm.h +++ b/lib-midi/include/midibpm.h @@ -2,7 +2,7 @@ * @file midibpm.h * */ -/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/mididescription.h b/lib-midi/include/mididescription.h index fa39aea81..5e968115c 100644 --- a/lib-midi/include/mididescription.h +++ b/lib-midi/include/mididescription.h @@ -1,7 +1,7 @@ /** * @file mididescription.h */ -/* Copyright (C) 2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/midiparams.h b/lib-midi/include/midiparams.h index bad149a4e..6ca478cb6 100644 --- a/lib-midi/include/midiparams.h +++ b/lib-midi/include/midiparams.h @@ -1,7 +1,7 @@ /** * @file midiparams.h */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/midiparamsconst.h b/lib-midi/include/midiparamsconst.h index 04409f888..6ed25b3e2 100644 --- a/lib-midi/include/midiparamsconst.h +++ b/lib-midi/include/midiparamsconst.h @@ -1,7 +1,7 @@ /** * @file midiparamsconst.h */ -/* Copyright (C) 2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/include/rtpmidi.h b/lib-midi/include/rtpmidi.h index 95427da16..fe9362f8d 100644 --- a/lib-midi/include/rtpmidi.h +++ b/lib-midi/include/rtpmidi.h @@ -2,7 +2,7 @@ * @file rtpmidi.h * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/gd32/platform_midi.h b/lib-midi/src/arm/gd32/platform_midi.h similarity index 94% rename from lib-midi/src/gd32/platform_midi.h rename to lib-midi/src/arm/gd32/platform_midi.h index 6d7b86c0d..e08d6588c 100644 --- a/lib-midi/src/gd32/platform_midi.h +++ b/lib-midi/src/arm/gd32/platform_midi.h @@ -2,7 +2,7 @@ * @file platform_midi.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/h3/platform_midi.h b/lib-midi/src/arm/h3/platform_midi.h similarity index 96% rename from lib-midi/src/h3/platform_midi.h rename to lib-midi/src/arm/h3/platform_midi.h index f46cd62a8..95cde37e5 100644 --- a/lib-midi/src/h3/platform_midi.h +++ b/lib-midi/src/arm/h3/platform_midi.h @@ -2,7 +2,7 @@ * @file platform_midi.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/arm/midi.cpp b/lib-midi/src/arm/midi.cpp index 97bab1ff8..b32cc6e86 100644 --- a/lib-midi/src/arm/midi.cpp +++ b/lib-midi/src/arm/midi.cpp @@ -2,7 +2,7 @@ * @file midi.cpp * */ -/* Copyright (C) 2016-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2016-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/arm/platform_midi.h b/lib-midi/src/arm/platform_midi.h index 727e28f5a..0c95c66f9 100644 --- a/lib-midi/src/arm/platform_midi.h +++ b/lib-midi/src/arm/platform_midi.h @@ -2,7 +2,7 @@ * @file platform_midi.h * */ -/* Copyright (C) 2022 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2022-2024 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,9 +27,9 @@ #define PLATFORM_MIDI_H_ #if defined (H3) -# include "../src/h3/platform_midi.h" +# include "../src/arm/h3/platform_midi.h" #elif defined (GD32) -# include "../src/gd32/platform_midi.h" +# include "../src/arm/gd32/platform_midi.h" #else #error platform midi #endif diff --git a/lib-midi/src/midi.cpp b/lib-midi/src/midi.cpp index 5f945e5d3..f6de92349 100644 --- a/lib-midi/src/midi.cpp +++ b/lib-midi/src/midi.cpp @@ -1,7 +1,7 @@ /** * @file midi.cpp */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/mididescription.cpp b/lib-midi/src/mididescription.cpp index 8bbbcbece..a9aad2471 100644 --- a/lib-midi/src/mididescription.cpp +++ b/lib-midi/src/mididescription.cpp @@ -1,7 +1,7 @@ /** * @file mididescription.h */ -/* Copyright (C) 2020-2021 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020-2021 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/midiparams.cpp b/lib-midi/src/midiparams.cpp index 8d20ec2af..2a47a66a8 100644 --- a/lib-midi/src/midiparams.cpp +++ b/lib-midi/src/midiparams.cpp @@ -1,7 +1,7 @@ /** * @file midiparams.cpp */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/midiparamsconst.cpp b/lib-midi/src/midiparamsconst.cpp index c8a2a3a4a..65e157ddc 100644 --- a/lib-midi/src/midiparamsconst.cpp +++ b/lib-midi/src/midiparamsconst.cpp @@ -1,7 +1,7 @@ /** * @file midiparamsconst.cpp */ -/* Copyright (C) 2020 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2020 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/net/applemidi.cpp b/lib-midi/src/net/applemidi.cpp index bbf4546e3..3b456467f 100644 --- a/lib-midi/src/net/applemidi.cpp +++ b/lib-midi/src/net/applemidi.cpp @@ -2,7 +2,7 @@ * @file applemidi.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/lib-midi/src/net/rtpmidi.cpp b/lib-midi/src/net/rtpmidi.cpp index 3eb51441c..5161a3bb1 100644 --- a/lib-midi/src/net/rtpmidi.cpp +++ b/lib-midi/src/net/rtpmidi.cpp @@ -2,7 +2,7 @@ * @file rtpmidi.cpp * */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl +/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@gd32-dmx.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal