works

tj57 · May 1, 2021 · 9ec132c · 9ec132c
1 parent c6de387
commit 9ec132c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/src/CEC/CEC.h b/src/CEC/CEC.h
@@ -10,7 +10,7 @@ class CEC_LogicalDevice : public CEC_Electrical
 		CDT_TV,
 		CDT_RECORDING_DEVICE,
 		CDT_PLAYBACK_DEVICE,
-		CDT_TUNER,
+		CDT_TUNER,	
 		CDT_AUDIO_SYSTEM,
 		CDT_OTHER,				// Not a real CEC type..
 	} CEC_DEVICE_TYPE;

diff --git a/src/CEC/CEC_Device.cpp b/src/CEC/CEC_Device.cpp
@@ -52,14 +52,6 @@ void CEC_Device::OnReceive(int source, int dest, unsigned char* buffer, int coun
   for (int i = 0; i < count; i++)
     DbgPrint(":%02X", buffer[i]);
   DbgPrint("\n");
-  if (!MonitorMode && dest == _logicalAddress && count == 1 && buffer[0] == 0x83) {
-      uint8 buffer[4];
-      buffer[0] = 0x84;
-      buffer[1] = _physicalAddress >> 8;
-      buffer[2] = _physicalAddress;
-      buffer[3] = _deviceType;
-      TransmitFrame(0xF, buffer, 4);
-  } 
 }
 
 bool CEC_Device::LineState()

diff --git a/src/CEC/Common.h b/src/CEC/Common.h
@@ -30,17 +30,6 @@ void DbgPrint(const char* fmt, ...);
 	#define NULL 0
 #endif
 
-/*
-static const uint32_t cyclesPerUS = (SystemCoreClock / 1000000ul);
-static inline unsigned long micros() {
-    bool ready = false;
-    if (!ready) {
-        CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
-        DWT->CTRL |= 1;
-        ready = true;
-    }
-    return DWT->CYCCNT / cyclesPerUS; // TODO: handle wraparound
-}*/
 #else
 
 #define ASSERT(x) ((void)0)

diff --git a/src/CEClient.cpp b/src/CEClient.cpp
@@ -79,9 +79,17 @@ void CEClient::OnReceive(int source, int dest, unsigned char* buffer, int count)
 
     if(_onReceiveCallback)
         _onReceiveCallback(source, dest, buffer, count);        
-
     else
         CEC_Device::OnReceive(source, dest, buffer, count);
+
+    if (!MonitorMode && dest == _logicalAddress && count == 1 && buffer[0] == 0x83) {
+      unsigned char buffer[4];
+      buffer[0] = 0x84;
+      buffer[1] = _physicalAddress >> 8;
+      buffer[2] = _physicalAddress;
+      buffer[3] = _deviceType;
+      TransmitFrame(0xF, buffer, 4);
+    }  
 }
 
 // OnReady redefinition, to save the current status

diff --git a/src/CEClient.h b/src/CEClient.h
@@ -9,7 +9,6 @@ typedef void (*OnReceiveCallbackFunction)(int, int, unsigned char*, int);
 typedef void (*OnTransmitCompleteCallbackFunction)(bool);
 
 public:
-
     CEClient(int physicalAddress, int inputPin, int outputPin=-1);
     void begin(CEC_DEVICE_TYPE type = CEC_LogicalDevice::CDT_PLAYBACK_DEVICE);
     bool isReady();
@@ -22,7 +21,6 @@ typedef void (*OnTransmitCompleteCallbackFunction)(bool);
     void run();
 
 private:
-
     void OnTransmitComplete(bool);
     void OnReceive(int source, int dest, unsigned char* buffer, int count);
     void OnReady();