Follow-up #294

- Corrected the MTC output timing
vanvught · Dec 31, 2024 · eb4131a · eb4131a
1 parent 2d83530
commit eb4131a
Show file tree

Hide file tree

Showing 17 changed files with 318 additions and 226 deletions.
diff --git a/lib-hal/include/hardware.h b/lib-hal/include/hardware.h
@@ -49,7 +49,7 @@ enum class Mode {
 
 namespace hal {
 #if !defined (CONFIG_HAL_TIMERS_COUNT)
-# define CONFIG_HAL_TIMERS_COUNT 8
+# define CONFIG_HAL_TIMERS_COUNT 12
 #endif
 
 static constexpr uint32_t SOFTWARE_TIMERS_MAX = CONFIG_HAL_TIMERS_COUNT;

diff --git a/lib-hal/superloop/softwaretimers.cpp b/lib-hal/superloop/softwaretimers.cpp
@@ -54,7 +54,7 @@ static int32_t m_nNextId;
 
 TimerHandle_t SoftwareTimerAdd(const uint32_t nIntervalMillis, const TimerCallbackFunction_t pCallbackFunction) {
 	if (m_nTimersCount >= hal::SOFTWARE_TIMERS_MAX) {
-#ifdef NDEBUG
+#ifndef NDEBUG
 		console_error("SoftwareTimerAdd: Max timer limit reached\n");
 #endif
 		return -1;

diff --git a/lib-ltc/include/arm/artnetreader.h b/lib-ltc/include/arm/artnetreader.h
@@ -50,8 +50,6 @@ class ArtNetReader {
 	void Stop();
 
 	void Run() {
-		LtcOutputs::Get()->UpdateMidiQuarterFrameMessage(reinterpret_cast<const struct ltc::TimeCode*>(&m_MidiTimeCode));
-
 		__DMB();
 		if (gv_ltc_nUpdatesPerSecond != 0) {
 			Hardware::Get()->SetMode(hardware::ledblink::Mode::DATA);
@@ -70,8 +68,6 @@ class ArtNetReader {
 	void Handler(const struct artnet::TimeCode *);
 
 private:
-	midi::Timecode m_MidiTimeCode;
-
 	static inline ArtNetReader *s_pThis;
 };
 

diff --git a/lib-ltc/include/arm/ltcetcreader.h b/lib-ltc/include/arm/ltcetcreader.h
@@ -41,8 +41,6 @@ class LtcEtcReader final : public LtcEtcHandler {
 	void Stop();
 
 	void Run() {
-		LtcOutputs::Get()->UpdateMidiQuarterFrameMessage(reinterpret_cast<const struct ltc::TimeCode *>(&m_MidiTimeCode));
-
 		__DMB();
 		if (gv_ltc_nUpdatesPerSecond != 0) {
 			Hardware::Get()->SetMode(hardware::ledblink::Mode::DATA);

diff --git a/lib-ltc/include/arm/ltcoutputs.h b/lib-ltc/include/arm/ltcoutputs.h
@@ -34,7 +34,6 @@ class LtcOutputs {
 
 	void Init();
 	void Update(const struct ltc::TimeCode *ptLtcTimeCode);
-	void UpdateMidiQuarterFrameMessage(const struct ltc::TimeCode *ptLtcTimeCode);
 
 	void ShowSysTime();
 	void ShowBPM(uint32_t nBPM);
@@ -45,18 +44,19 @@ class LtcOutputs {
 
 	void Print();
 
-	static LtcOutputs* Get() {
+	static LtcOutputs *Get() {
 		return s_pThis;
 	}
 
 private:
 	bool m_bShowSysTime;
+	bool m_bMidiQuarterFramePieceRunning { false };
+
 	ltc::Type m_TypePrevious { ltc::Type::INVALID };
-	uint32_t m_nMidiQuarterFramePiece { 0 };
-	uint32_t m_nRtpMidiQuarterFramePiece { 0 };
+	int32_t m_nSecondsPrevious { 60 };
+
 	char m_aTimeCode[ltc::timecode::CODE_MAX_LENGTH];
 	char m_aSystemTime[ltc::timecode::SYSTIME_MAX_LENGTH];
-	int32_t m_nSecondsPrevious { 60 };
 	char m_cBPM[9];
 
 	static inline LtcOutputs *s_pThis;

diff --git a/lib-ltc/include/arm/midireader.h b/lib-ltc/include/arm/midireader.h
@@ -42,7 +42,6 @@ class MidiReader {
 	void Update();
 
 private:
-	midi::Timecode m_MidiTimeCode;
 	midi::TimecodeType m_TimeCodeType { midi::TimecodeType::UNKNOWN };
 	uint8_t m_nPartPrevious { 0 };
 	bool m_bDirection { true };

diff --git a/lib-ltc/include/arm/systimereader.h b/lib-ltc/include/arm/systimereader.h
@@ -52,6 +52,7 @@ class SystimeReader {
 	}
 
 private:
+	void SetFps(uint8_t nFps);
 	void static staticCallbackFunction(const uint8_t *pBuffer, uint32_t nSize, uint32_t nFromIp, uint16_t nFromPort) {
 		s_pThis->Input(pBuffer, nSize, nFromIp, nFromPort);
 	}
@@ -63,7 +64,6 @@ class SystimeReader {
 	uint32_t m_nBytesReceived { 0 };
 	char *m_pUdpBuffer { nullptr };
 	time_t m_nTimePrevious { 0 };
-	midi::Timecode m_MidiTimeCode;
 	bool m_bIsStarted { false };
 
 	static inline SystimeReader *s_pThis;

diff --git a/lib-ltc/include/arm/tcnetreader.h b/lib-ltc/include/arm/tcnetreader.h
@@ -50,8 +50,6 @@ class TCNetReader {
 	void Stop();
 
 	void Run() {
-		LtcOutputs::Get()->UpdateMidiQuarterFrameMessage(reinterpret_cast<const struct ltc::TimeCode*>(&m_MidiTimeCode));
-
 		__DMB();
 		if (gv_ltc_nUpdatesPerSecond != 0) {
 			Hardware::Get()->SetMode(hardware::ledblink::Mode::DATA);

diff --git a/lib-ltc/src/arm/artnetreader.cpp b/lib-ltc/src/arm/artnetreader.cpp
@@ -86,18 +86,19 @@ void ArtNetReader::Stop() {
 	DEBUG_EXIT
 }
 
-void ArtNetReader::Handler(const struct artnet::TimeCode *ArtNetTimeCode) {
-	gv_ltc_nUpdates = gv_ltc_nUpdates + 1;
+void ArtNetReader::Handler(const struct artnet::TimeCode *pArtNetTimeCode) {
 
 	if (!ltc::g_DisabledOutputs.bLtc) {
-		LtcSender::Get()->SetTimeCode(reinterpret_cast<const struct ltc::TimeCode *>(ArtNetTimeCode));
+		LtcSender::Get()->SetTimeCode(reinterpret_cast<const struct ltc::TimeCode *>(pArtNetTimeCode));
 	}
 
 	if (!ltc::g_DisabledOutputs.bEtc) {
-		LtcEtc::Get()->Send(reinterpret_cast<const struct midi::Timecode *>(ArtNetTimeCode));
+		LtcEtc::Get()->Send(reinterpret_cast<const struct midi::Timecode *>(pArtNetTimeCode));
 	}
 
-	memcpy(&m_MidiTimeCode, ArtNetTimeCode, sizeof(struct midi::Timecode));
+	memcpy(&g_ltc_LtcTimeCode, pArtNetTimeCode, sizeof(struct midi::Timecode));
+
+	LtcOutputs::Get()->Update(reinterpret_cast<const struct ltc::TimeCode *>(pArtNetTimeCode));
 
-	LtcOutputs::Get()->Update(reinterpret_cast<const struct ltc::TimeCode *>(ArtNetTimeCode));
+	gv_ltc_nUpdates = gv_ltc_nUpdates + 1;
 }
diff --git a/lib-ltc/src/arm/ltcgenerator.cpp b/lib-ltc/src/arm/ltcgenerator.cpp
@@ -198,20 +198,8 @@ void LtcGenerator::Start() {
 	assert(m_nHandle != -1);
 
 	LtcOutputs::Get()->Init();
+	LtcOutputs::Get()->Update(static_cast<const struct ltc::TimeCode *>(&g_ltc_LtcTimeCode));
 
-	if (!ltc::g_DisabledOutputs.bLtc) {
-		LtcSender::Get()->SetTimeCode(const_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode), false);
-	}
-
-	if (!ltc::g_DisabledOutputs.bArtNet) {
-		ArtNetNode::Get()->SendTimeCode(reinterpret_cast<const struct artnet::TimeCode*>(&g_ltc_LtcTimeCode));
-	}
-
-	if (!ltc::g_DisabledOutputs.bEtc) {
-		LtcEtc::Get()->Send(reinterpret_cast<const struct midi::Timecode *>(&g_ltc_LtcTimeCode));
-	}
-
-	LtcOutputs::Get()->Update(const_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode));
 	Hardware::Get()->SetMode(hardware::ledblink::Mode::NORMAL);
 
 	DEBUG_EXIT
@@ -385,18 +373,18 @@ void LtcGenerator::ActionSetRate(const char *pTimeCodeRate) {
 #endif
 			//
 			if (!ltc::g_DisabledOutputs.bLtc) {
-				LtcSender::Get()->SetTimeCode(const_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode), false);
+				LtcSender::Get()->SetTimeCode(const_cast<const struct ltc::TimeCode *>(&g_ltc_LtcTimeCode), false);
 			}
 
 			if (!ltc::g_DisabledOutputs.bArtNet) {
-				ArtNetNode::Get()->SendTimeCode(reinterpret_cast<const struct artnet::TimeCode*>(&g_ltc_LtcTimeCode));
+				ArtNetNode::Get()->SendTimeCode(reinterpret_cast<const struct artnet::TimeCode *>(&g_ltc_LtcTimeCode));
 			}
 
 			if (!ltc::g_DisabledOutputs.bEtc) {
 				LtcEtc::Get()->Send(reinterpret_cast<const struct midi::Timecode *>(&g_ltc_LtcTimeCode));
 			}
 
-			LtcOutputs::Get()->Update(const_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode));
+			LtcOutputs::Get()->Update(const_cast<const struct ltc::TimeCode *>(&g_ltc_LtcTimeCode));
 		}
 	}
 
@@ -630,6 +618,12 @@ void LtcGenerator::Print() {
 	printf(" Stop  : %.2d.%.2d.%.2d:%.2d\n", m_pStopLtcTimeCode->nHours, m_pStopLtcTimeCode->nMinutes, m_pStopLtcTimeCode->nSeconds, m_pStopLtcTimeCode->nFrames);
 }
 
+#if !defined(__clang__)
+# pragma GCC push_options
+# pragma GCC optimize ("O3")
+# pragma GCC optimize ("no-tree-loop-distribute-patterns")
+#endif
+
 void LtcGenerator::Increment() {
 	if ((!m_bIgnoreStop) && (__builtin_expect((memcmp(&g_ltc_LtcTimeCode, m_pStopLtcTimeCode, sizeof(struct ltc::TimeCode)) == 0), 0))) {
 		if (m_State == STARTED) {
@@ -729,27 +723,23 @@ void LtcGenerator::SetTimeCode(int32_t nSeconds) {
 }
 
 void LtcGenerator::Update() {
-	if (m_State != STOPPED) {
-		LtcOutputs::Get()->UpdateMidiQuarterFrameMessage(const_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode));
-	}
-
 	__DMB();
 	if (gv_ltc_bTimeCodeAvailable) {
 		gv_ltc_bTimeCodeAvailable = false;
 
 		if (!ltc::g_DisabledOutputs.bLtc) {
-			LtcSender::Get()->SetTimeCode(static_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode), false);
+			LtcSender::Get()->SetTimeCode(static_cast<const struct ltc::TimeCode *>(&g_ltc_LtcTimeCode), false);
 		}
 
 		if (!ltc::g_DisabledOutputs.bArtNet) {
-			ArtNetNode::Get()->SendTimeCode(reinterpret_cast<const struct artnet::TimeCode*>(&g_ltc_LtcTimeCode));
+			ArtNetNode::Get()->SendTimeCode(reinterpret_cast<const struct artnet::TimeCode *>(&g_ltc_LtcTimeCode));
 		}
 
 		if (!ltc::g_DisabledOutputs.bEtc) {
 			LtcEtc::Get()->Send(reinterpret_cast<const struct midi::Timecode *>(&g_ltc_LtcTimeCode));
 		}
 
-		LtcOutputs::Get()->Update(static_cast<const struct ltc::TimeCode*>(&g_ltc_LtcTimeCode));
+		LtcOutputs::Get()->Update(static_cast<const struct ltc::TimeCode *>(&g_ltc_LtcTimeCode));
 
 		if (__builtin_expect((m_tDirection == ltcgenerator::Direction::DIRECTION_FORWARD), 1)) {
 			if (__builtin_expect((m_tPitch == ltcgenerator::Pitch::PITCH_NORMAL), 1)) {