Blinker

@@ -125,7 +125,9 @@ void EtherPix::displayFrame(stBlinkenFrame *pFrame)

 #ifdef BLINKER_CFG_ETHERPIX

   char data[65536];

   bool haveData = false;

+  etp_pixfmt_t pixfmt;

   stBlinkenFrame *pClonedFrame;

+  int frameWidth, frameHeight, frameChannels, frameMaxval, channels;

   // leave if no display

   if (!m_pDisplay)

@@ -136,38 +138,48 @@ void EtherPix::displayFrame(stBlinkenFrame *pFrame)

   // frame available

   if (pFrame) {

-    // format matches (size matches and 24bit RGB as required by EtherPix)

-    if (BlinkenFrameGetWidth(pFrame) == (int)m_size.m_width &&

-        BlinkenFrameGetHeight(pFrame) == (int)m_size.m_height &&

-        BlinkenFrameGetChannels(pFrame) == 3 &&

-        BlinkenFrameGetMaxval(pFrame) == 255) {

+    frameWidth = BlinkenFrameGetWidth(pFrame);

+    frameHeight = BlinkenFrameGetHeight(pFrame);

+    frameChannels = BlinkenFrameGetChannels(pFrame);

+    frameMaxval = BlinkenFrameGetMaxval(pFrame);

+    // format matches

+    // (size matches and 24bit RGB or monochrome as required by EtherPix)

+    if (frameWidth == (int)m_size.m_width &&

+        frameHeight == (int)m_size.m_height &&

+        (frameChannels == 1 || frameChannels == 3) &&

+        frameMaxval == 255) {

       // convert to MCUF packet

       haveData = BlinkenFrameToNetwork(pFrame, BlinkenProtoMcuf,

                                        data, sizeof(data)) >= 0;

+      channels = frameChannels;

     }

     // format does not match

     else {

       // convert format: clone and resize

       pClonedFrame = BlinkenFrameClone(pFrame);

       if (pClonedFrame) {

+        channels = frameChannels == 1 ? 1 : 3;

         BlinkenFrameResize(pClonedFrame, m_size.m_height,

-                           m_size.m_width, 3, 255);

+                           m_size.m_width, channels, 255);

         // convert to MCUF packet

         haveData = BlinkenFrameToNetwork(pClonedFrame, BlinkenProtoMcuf,

                                          data, sizeof(data)) >= 0;

-        // free clones frame

+        // free cloned frame

         BlinkenFrameFree(pClonedFrame);

       }

     }

   }

   // data available -> to EtherPix display

-  if (haveData)

-    etp_display_data(m_pDisplay, (etp_u8_t*)(data + 12), 3, m_size.m_width * 3,

-                     0, 0, m_size.m_width, m_size.m_height);

+  if (haveData) {

+    pixfmt = channels == 1 ? etp_pixfmt_mono8 : etp_pixfmt_rgb24;

+    etp_display_data_fmt(m_pDisplay, (etp_u8_t*)(data + 12),

+                         channels, m_size.m_width * channels,

+                         0, 0, m_size.m_width, m_size.m_height, pixfmt);

   // no data available -> clear EtherPix display

-  else

+  } else {

     etp_display_data_clear(m_pDisplay);

+  }

   // send configured frame

   sendFrame();