support more pixels per output
Stefan Schuermans commited on 2017-05-31 21:47:27
Showing 3 changed files, with 8 additions and 6 deletions.
- Makefile 59e66c1..c655157
- org/blinkenareJEtherPix/Constants.java 13de391..f7f6073
- org/blinkenareJEtherPix/Distri.java 678ff48..fcc550c
| ... | ... |
@@ -28,7 +28,7 @@ class Constants |
| 28 | 28 |
* available */ |
| 29 | 29 |
static int outputMaxCnt = 128; /**< maximum number of outputs per |
| 30 | 30 |
* distributor */ |
| 31 |
- static int pixelMaxCnt = 128; /**< maximum number of pixels that can |
|
| 31 |
+ static int pixelMaxCnt = 1024; /**< maximum number of pixels that can |
|
| 32 | 32 |
* be connected to an output of a |
| 33 | 33 |
* distributor */ |
| 34 | 34 |
|
| ... | ... |
@@ -38,8 +38,8 @@ class Constants |
| 38 | 38 |
(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, |
| 39 | 39 |
(byte)0x00, (byte)0x03, (byte)0x00, (byte)0xFF |
| 40 | 40 |
}; |
| 41 |
- static int mcufOfsOutputs = 5; /**< offset of output count in MCUF data */ |
|
| 42 |
- static int mcufOfsPixels = 7; /**< offset of pixel count in MCUF data */ |
|
| 41 |
+ static int mcufOfsOutputsU16 = 4; /**< offset of output count in MCUF data */ |
|
| 42 |
+ static int mcufOfsPixelsU16 = 6; /**< offset of pixel count in MCUF data */ |
|
| 43 | 43 |
|
| 44 | 44 |
// fixed settings constants |
| 45 | 45 |
static int destIpBase = 0x0A465000; /**< base IP address of distributors, |
| ... | ... |
@@ -65,8 +65,10 @@ class Distri |
| 65 | 65 |
m_msgBuf = Arrays.copyOf(Constants.mcufHdr, |
| 66 | 66 |
Constants.mcufHdr.length + |
| 67 | 67 |
m_outputCnt * m_pixelCnt * 3); |
| 68 |
- m_msgBuf[Constants.mcufOfsOutputs] = (byte)m_outputCnt; |
|
| 69 |
- m_msgBuf[Constants.mcufOfsPixels] = (byte)m_pixelCnt; |
|
| 68 |
+ m_msgBuf[Constants.mcufOfsOutputsU16 + 0] = (byte)(m_outputCnt >> 8); |
|
| 69 |
+ m_msgBuf[Constants.mcufOfsOutputsU16 + 1] = (byte)m_outputCnt; |
|
| 70 |
+ m_msgBuf[Constants.mcufOfsPixelsU16 + 0] = (byte)(m_pixelCnt >> 8); |
|
| 71 |
+ m_msgBuf[Constants.mcufOfsPixelsU16 + 1] = (byte)m_pixelCnt; |
|
| 70 | 72 |
} |
| 71 | 73 |
|
| 72 | 74 |
int m_distri; ///< number of this distributor |
| 73 | 75 |