Merge pull request #5 from arpruss/master

Support blue pill with open drain communication; respond to har

Author: lucadentella

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;
@@ -67,7 +67,8 @@ class CEC_LogicalDevice : public CEC_Electrical
 	typedef enum {
 	} CEC_TERTIARY_STATE;
 
-protected:
+public:
+//protected:
 	static int _validLogicalAddresses[6][5];
 	int _logicalAddress;
 	int _physicalAddress;

src/CEC/CEC_Device.cpp

@@ -1,6 +1,15 @@
 #include "CEC_Device.h"
 #include <Arduino.h>
 
+#if defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F2) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4)
+# define STM32
+# define CEC_HIGH 1
+# define CEC_LOW 0
+#else
+# define CEC_HIGH LOW
+# define CEC_LOW HIGH
+#endif
+
 CEC_Device::CEC_Device(int physicalAddress, int in_line, int out_line)
 : CEC_LogicalDevice(physicalAddress)
 , _isrTriggered(false)
@@ -12,10 +21,15 @@ CEC_Device::CEC_Device(int physicalAddress, int in_line, int out_line)
 
 void CEC_Device::Initialize(CEC_DEVICE_TYPE type)
 {
+#ifdef STM32
+  gpio_set_mode(digitalPinToPort(_in_line), PIN_MAP[_in_line].gpio_bit, GPIO_OUTPUT_OD); // set open drain output
+  _out_line = _in_line;
+#else
   pinMode(_out_line, OUTPUT);
   pinMode( _in_line,  INPUT);
+#endif  
 
-  digitalWrite(_out_line, LOW);
+  digitalWrite(_out_line, CEC_HIGH);
   delay(200);
 
   CEC_LogicalDevice::Initialize(type);
@@ -42,12 +56,12 @@ void CEC_Device::OnReceive(int source, int dest, unsigned char* buffer, int coun
 bool CEC_Device::LineState()
 {
   int state = digitalRead(_in_line);
-  return state == LOW;
+  return state == CEC_HIGH;
 }
 
 void CEC_Device::SetLineState(bool state)
 {
-  digitalWrite(_out_line, state?LOW:HIGH);
+  digitalWrite(_out_line, state?CEC_HIGH:CEC_LOW);
   // give enough time for the line to settle before sampling
   // it
   delayMicroseconds(50);

src/CEC/Common.cpp

@@ -28,11 +28,12 @@ void DbgPrint(const char* fmt, ...)
 
 #else
 
-#include <avr/io.h>
-#include <avr/pgmspace.h>
+//#include <avr/io.h>
+//#include <avr/pgmspace.h>
 #include <stdlib.h>
 #include <string.h>
-#include <util/delay.h>
+#include <stdarg.h>
+//#include <util/delay.h>
 #include <Arduino.h>
 
 void DbgPrint(const char* fmt, ...)

src/CEC/Common.h

@@ -1,6 +1,11 @@
 #ifndef COMMON_H__
 #define COMMON_H__
 
+#if defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F2) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4)
+# define STM32
+#endif
+
+
 #ifdef WIN32
 #include <windows.h>
 #include <stdio.h>
@@ -9,20 +14,37 @@
 #define ASSERT(x) assert(x)
 void DbgPrint(const char* fmt, ...);
 
-#else
+extern "C"
+{
+extern unsigned long micros();
+extern void delayMicroseconds(unsigned int);
+}
+
+#elif defined(STM32)
+
+#include "dwt.h"
 
 #define ASSERT(x) ((void)0)
 void DbgPrint(const char* fmt, ...);
 #ifndef NULL
 	#define NULL 0
 #endif
 
+#else
+
+#define ASSERT(x) ((void)0)
+void DbgPrint(const char* fmt, ...);
+#ifndef NULL
+	#define NULL 0
 #endif
 
+
 extern "C"
 {
 extern unsigned long micros();
 extern void delayMicroseconds(unsigned int);
 }
 
+#endif
+
 #endif // COMMON_H__

src/CEClient.cpp

@@ -2,7 +2,7 @@
 
 // create a new instance of CEClient
 CEClient::CEClient(int physicalAddress, int inputPin, int outputPin) : 
-    CEC_Device(physicalAddress, inputPin, outputPin) {
+    CEC_Device(physicalAddress, inputPin, outputPin<0 ? inputPin : outputPin) {
 
     _ready = false;
 }
@@ -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

src/CEClient.h

@@ -9,8 +9,7 @@ typedef void (*OnReceiveCallbackFunction)(int, int, unsigned char*, int);
 typedef void (*OnTransmitCompleteCallbackFunction)(bool);
 
 public:
-
-    CEClient(int physicalAddress, int inputPin, int outputPin);
+    CEClient(int physicalAddress, int inputPin, int outputPin=-1);
     void begin(CEC_DEVICE_TYPE type = CEC_LogicalDevice::CDT_PLAYBACK_DEVICE);
     bool isReady();
     bool write(int targetAddress, unsigned char* buffer, int count);
@@ -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();