Sync with local development

vanvught · Apr 29, 2024 · 0c10ac9 · 0c10ac9
1 parent 9ef6749
commit 0c10ac9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,4 @@ Artnet*.*
 do-tftp.sh
 udp_send
 
+/lib-clib
diff --git a/gd32_rdm_responder/lib/personalityupdate.cpp b/gd32_rdm_responder/lib/personalityupdate.cpp
@@ -2,7 +2,7 @@
  * @file personalityupdate.cpp
  *
  */
-/* Copyright (C) 2021-2024 by Arjan van Vught mailto:info@orangepi-dmx.nl
+/* Copyright (C) 2021-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-gd32/src/f/ptp/gd32_ptp.cpp b/lib-gd32/src/f/ptp/gd32_ptp.cpp
@@ -43,8 +43,11 @@ static void ptp_start(const uint32_t init_sec, const uint32_t init_subsec, const
 	enet_interrupt_disable(ENET_MAC_INT_TMSTIM);
 	enet_ptp_feature_enable(ENET_RXTX_TIMESTAMP);
 	enet_ptp_subsecond_increment_config(accuracy_cfg);
+
 	enet_ptp_timestamp_addend_config(carry_cfg);
 	enet_ptp_timestamp_function_config(ENET_PTP_ADDEND_UPDATE);
+	while (SET == enet_ptp_flag_get((uint32_t) ENET_PTP_ADDEND_UPDATE)) {}
+
 	enet_ptp_timestamp_function_config(ENET_PTP_FINEMODE);
 	enet_ptp_timestamp_update_config(ENET_PTP_ADD_TO_TIME, init_sec, init_subsec);
 	enet_ptp_timestamp_function_config(ENET_PTP_SYSTIME_INIT);

diff --git a/lib-hal/debug/i2c/i2cdetect.cpp b/lib-hal/debug/i2c/i2cdetect.cpp
@@ -2,7 +2,7 @@
  * @file i2cdetect.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-hal/debug/i2c/i2cdetect.h b/lib-hal/debug/i2c/i2cdetect.h
@@ -2,7 +2,7 @@
  * @file i2cdetect.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-hal/debug/stack/stack_debug.cpp b/lib-hal/debug/stack/stack_debug.cpp
@@ -2,7 +2,7 @@
  * @file stack_debug.cpp
  *
  */
-/* Copyright (C) 2023 by Arjan van Vught mailto:info@orangepi-dmx.nl
+/* Copyright (C) 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,3 +77,4 @@ Artnet.
		do-tftp.sh
		udp_send

		/lib-clib