rename "FlexiPix" to "EtherPix" (5e1f52e) - JEtherPix · BlinkenArea

rename "FlexiPix" to "EtherPix"

Stefan Schuermans commited on 2017-05-20 17:13:05
Showing 22 changed files, with 57 additions and 57 deletions.

"FlexiPix" is a registered trademark

.gitignore 45e16e4..c45f1aa
Makefile ed549f1..f78dee4
README 465030f..ae88bc2
git-clone-url 74579b4..2aeb731
git-web-url db2b00d..f9120a1
org/blinkenareJFlexiPix/.gitignore
org/blinkenareJFlexiPix/AddrParser.java d5ad246..1c82fcf
org/blinkenareJFlexiPix/Config.java 3ef6f42..d6b8125
org/blinkenareJFlexiPix/Constants.java 2a688ed..556261a
org/blinkenareJFlexiPix/Display.java 3a126c1..911e8b8
org/blinkenareJFlexiPix/Distri.java 3537416..8e06614
org/blinkenareJFlexiPix/Mapping.java 697f1ff..1bd1a44
org/blinkenareJFlexiPix/MessageIf.java 4577768..104d07a
org/blinkenareJFlexiPix/MsgType.java 8518589..b3e43ac
org/blinkenareJFlexiPix/Pixel.java 74d9368..a0a6adc
org/blinkenareJFlexiPix/PixelParser.java f523161..5111b7a
org/blinkenareJFlexiPix/examples/.gitignore
org/blinkenareJFlexiPix/examples/Blink.java 4f69c20..898d797
org/blinkenareJFlexiPix/examples/Fade.java 055e764..a91f327
org/blinkenareJFlexiPix/examples/Msg.java 93f90ff..c092129
org/blinkenareJFlexiPix/examples/config/AdK2008.flp 3824a78..780618e
org/blinkenareJFlexiPix/examples/config/single8x8.flp 7a1138d..c4d73de

.gitignore

View file @ 5e1f52e

...	...	@@ -1,3 +1,3 @@
1		-JFlexiPix.jar
2		-JFlexiPix.keystore
	1	+JEtherPix.jar
	2	+JEtherPix.keystore
3	3

Makefile

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-# JFlexiPix - Java implementation of FlexiPix output library
+# JEtherPix - Java implementation of EtherPix output library
 #
 # Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
 #
@@ -27,9 +27,9 @@ JAVAC=javac
 JAR=jar
 KEYTOOL=keytool
 JARSIGNER=jarsigner
-KEYPASS=JFlexiPix
+KEYPASS=JEtherPix
 JAVA=java
-PKG_PATH=org/blinkenarea/JFlexiPix
+PKG_PATH=org/blinkenarea/JEtherPix
 PKG_PATH_EX=$(PKG_PATH)/examples
 
 CLASSES=AddrParser Config Constants Display Distri \
@@ -50,10 +50,10 @@ all: jar $(CLASS_FILES_EX)
 clean:
 	rm -f $(PKG_PATH)/Version.java
 	rm -f $(CLASS_FILES)
-	rm -f JFlexiPix.jar
+	rm -f JEtherPix.jar
 	rm -f $(CLASS_FILES_EX)
 
-jar: JFlexiPix.jar
+jar: JEtherPix.jar
 
 blink: $(PKG_PATH_EX)/Blink.class
 	$(JAVA) -classpath . $(subst /,.,$(basename $<)) $(CONFIG_EX)
@@ -64,7 +64,7 @@ fade: $(PKG_PATH_EX)/Fade.class
 $(CLASS_FILES_EX): $(CLASS_FILES)
 
 $(PKG_PATH)/Version.java: Makefile
-	echo "package org.blinkenarea.JFlexiPix;" >$@
+	echo "package org.blinkenarea.JEtherPix;" >$@
 	echo "public class Version {" >>$@
 	echo "  public static int Major = $(VERSION_MAJOR);" >>$@
 	echo "  public static int Minor = $(VERSION_MINOR);" >>$@
@@ -74,10 +74,10 @@ $(PKG_PATH)/Version.java: Makefile
 %.class: %.java
 	$(JAVAC) -classpath $(CLASSPATH) $<
 
-JFlexiPix.keystore:
-	$(KEYTOOL) -genkey -alias JFlexiPix -dname CN=JFlexiPix,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore $@ -storepass $(KEYPASS) -validity 3652
+JEtherPix.keystore:
+	$(KEYTOOL) -genkey -alias JEtherPix -dname CN=JEtherPix,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore $@ -storepass $(KEYPASS) -validity 3652
 
-JFlexiPix.jar: JFlexiPix.keystore $(CLASS_FILES)
+JEtherPix.jar: JEtherPix.keystore $(CLASS_FILES)
 	$(JAR) cf $@ $(CLASS_FILES)
-	$(JARSIGNER) -keystore $< -storepass $(KEYPASS) $@ JFlexiPix
+	$(JARSIGNER) -keystore $< -storepass $(KEYPASS) $@ JEtherPix
 

README

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-JFlexiPix - Java implementation of FlexiPix output library
+JEtherPix - Java implementation of EtherPix output library
 
 FlexPix is a large scale display architecure that is driven using UDP/IP.
 It consists of single pixels that are connected to chains. A number of those
@@ -7,7 +7,7 @@ receives data over ethernet and distributes it to the pixel chains.
 
 The protocol used on UDP is MCUF (microcontroller unit frame, see
 http://wiki.blinkenarea.org/index.php/MicroControllerUnitFrame). However,
-as FlexiPix displays can have more than 65536 pixels, multiple MCUF packets
+as EtherPix displays can have more than 65536 pixels, multiple MCUF packets
 are sent for one frame - a single MCUF frame to every distributor.
 The coordinates of the pixels in the MCUF packets do not correspond to pixel
 locations, but to pixel addresses. The y coordinate is the number of the
@@ -15,11 +15,11 @@ output of the distributor and the x coordinate is the number of the pixel
 in the chain. The number of channels is always 3 (RGB) and the maximum value
 is always 255 (8 bit per channel).
 
-This library can be used to send the required UDP packets to the FlexiPix
+This library can be used to send the required UDP packets to the EtherPix
 display to make it show images and/or videos.
 As the libarary has to know how the pixels are wired and where there are
 located (i.e. which pixel in the source image they represent), a rather
 complex config file is needed. Examples of config files can be found in
-"org/blinkenarea/JFlexiPix/examples/config" and example code showing how
-to use the library is located in "org/blinkenarea/JFlexiPix/examples".
+"org/blinkenarea/JEtherPix/examples/config" and example code showing how
+to use the library is located in "org/blinkenarea/JEtherPix/examples".
 

git-clone-url

View file @ 5e1f52e

...	...	@@ -1 +1 @@
1		-http://git.blinkenarea.org/projects/JFlexiPix
	1	+http://git.blinkenarea.org/projects/JEtherPix

git-web-url

View file @ 5e1f52e

...	...	@@ -1 +1 @@
1		-http://git.blinkenarea.org/index.php?p=JFlexiPix
	1	+http://git.blinkenarea.org/index.php?p=JEtherPix

org/blinkenareJFlexiPix/.gitignore

View file @ 5e1f52e

org/blinkenareJFlexiPix/AddrParser.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 import java.net.*;
 import java.util.regex.*;

org/blinkenareJFlexiPix/Config.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 import java.io.*;
 import java.net.*;

org/blinkenareJFlexiPix/Constants.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,12 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 /// package global constants
 class Constants
 {
-  // FlexiPix hardware constants
+  // EtherPix hardware constants
   static int distriMaxCnt = 4096; /**< maximum number of distributors
                                    *   that can be in the system,
                                    *   number of distributor addresses

org/blinkenareJFlexiPix/Display.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 import java.net.*;
 
-/// FlexiPix display
+/// EtherPix display
 public class Display
 {
   /**

org/blinkenareJFlexiPix/Distri.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,12 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 import java.net.*;
 import java.util.Arrays;
 
-/// FlexiPix distributor
+/// EtherPix distributor
 class Distri
 {
   /**

org/blinkenareJFlexiPix/Mapping.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,10 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 /**
- * FlexiPix mapping information
+ * EtherPix mapping information
  *
  * values of channels are mapped according to following formula:
  * <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

org/blinkenareJFlexiPix/MessageIf.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 /// message callback interface
 public interface MessageIf

org/blinkenareJFlexiPix/MsgType.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 /// message type
 public enum MsgType { Err, Warn, Info }

org/blinkenareJFlexiPix/Pixel.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
-/// FlexiPix pixel
+/// EtherPix pixel
 class Pixel
 {
   /// constructor

org/blinkenareJFlexiPix/PixelParser.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix;
+package org.blinkenarea.JEtherPix;
 
 import java.util.regex.*;
 

org/blinkenareJFlexiPix/examples/.gitignore

View file @ 5e1f52e

org/blinkenareJFlexiPix/examples/Blink.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix.examples;
+package org.blinkenarea.JEtherPix.examples;
 
-import org.blinkenarea.JFlexiPix.*;
+import org.blinkenarea.JEtherPix.*;
 
 public class Blink
 {

org/blinkenareJFlexiPix/examples/Fade.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix.examples;
+package org.blinkenarea.JEtherPix.examples;
 
-import org.blinkenarea.JFlexiPix.*;
+import org.blinkenarea.JEtherPix.*;
 
 public class Fade
 {

org/blinkenareJFlexiPix/examples/Msg.java

View file @ 5e1f52e

@@ -1,4 +1,4 @@
-/* JFlexiPix - Java implementation of FlexiPix output library
+/* JEtherPix - Java implementation of EtherPix output library
  *
  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
  *
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.blinkenarea.JFlexiPix.examples;
+package org.blinkenarea.JEtherPix.examples;
 
-import org.blinkenarea.JFlexiPix.*;
+import org.blinkenarea.JEtherPix.*;
 
 public class Msg implements MessageIf
 {

org/blinkenareJFlexiPix/examples/config/AdK2008.flp

View file @ 5e1f52e

@@ -1,7 +1,7 @@
-# FlexiPix configuration file
+# EtherPix configuration file
 
 # the address to bind the local socket to
-#  - the FlexiPix network 10.70.80.0/16 must be reachable from this address
+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address
 bindAddr = 0.0.0.0:0
 
 # the size of the display

org/blinkenareJFlexiPix/examples/config/single8x8.flp

View file @ 5e1f52e

@@ -1,7 +1,7 @@
-# FlexiPix configuration file
+# EtherPix configuration file
 
 # the address to bind the local socket to
-#  - the FlexiPix network 10.70.80.0/16 must be reachable from this address
+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address
 bindAddr = 0.0.0.0:0
 
 # the size of the display


...	...	@@ -1,4 +1,4 @@
1		-# JFlexiPix - Java implementation of FlexiPix output library
	1	+# JEtherPix - Java implementation of EtherPix output library
2	2	#
3	3	# Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
4	4	#
...	...	@@ -27,9 +27,9 @@ JAVAC=javac
27	27	JAR=jar
28	28	KEYTOOL=keytool
29	29	JARSIGNER=jarsigner
30		-KEYPASS=JFlexiPix
	30	+KEYPASS=JEtherPix
31	31	JAVA=java
32		-PKG_PATH=org/blinkenarea/JFlexiPix
	32	+PKG_PATH=org/blinkenarea/JEtherPix
33	33	PKG_PATH_EX=$(PKG_PATH)/examples
34	34
35	35	CLASSES=AddrParser Config Constants Display Distri \
...	...	@@ -50,10 +50,10 @@ all: jar $(CLASS_FILES_EX)
50	50	clean:
51	51	rm -f $(PKG_PATH)/Version.java
52	52	rm -f $(CLASS_FILES)
53		- rm -f JFlexiPix.jar
	53	+ rm -f JEtherPix.jar
54	54	rm -f $(CLASS_FILES_EX)
55	55
56		-jar: JFlexiPix.jar
	56	+jar: JEtherPix.jar
57	57
58	58	blink: $(PKG_PATH_EX)/Blink.class
59	59	$(JAVA) -classpath . $(subst /,.,$(basename $<)) $(CONFIG_EX)
...	...	@@ -64,7 +64,7 @@ fade: $(PKG_PATH_EX)/Fade.class
64	64	$(CLASS_FILES_EX): $(CLASS_FILES)
65	65
66	66	$(PKG_PATH)/Version.java: Makefile
67		- echo "package org.blinkenarea.JFlexiPix;" >$@
	67	+ echo "package org.blinkenarea.JEtherPix;" >$@
68	68	echo "public class Version {" >>$@
69	69	echo " public static int Major = $(VERSION_MAJOR);" >>$@
70	70	echo " public static int Minor = $(VERSION_MINOR);" >>$@
...	...	@@ -74,10 +74,10 @@ $(PKG_PATH)/Version.java: Makefile
74	74	%.class: %.java
75	75	$(JAVAC) -classpath $(CLASSPATH) $<
76	76
77		-JFlexiPix.keystore:
78		- $(KEYTOOL) -genkey -alias JFlexiPix -dname CN=JFlexiPix,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore $@ -storepass $(KEYPASS) -validity 3652
	77	+JEtherPix.keystore:
	78	+ $(KEYTOOL) -genkey -alias JEtherPix -dname CN=JEtherPix,O=blinkenarea,C=org -keypass $(KEYPASS) -keystore $@ -storepass $(KEYPASS) -validity 3652
79	79
80		-JFlexiPix.jar: JFlexiPix.keystore $(CLASS_FILES)
	80	+JEtherPix.jar: JEtherPix.keystore $(CLASS_FILES)
81	81	$(JAR) cf $@ $(CLASS_FILES)
82		- $(JARSIGNER) -keystore $< -storepass $(KEYPASS) $@ JFlexiPix
	82	+ $(JARSIGNER) -keystore $< -storepass $(KEYPASS) $@ JEtherPix
83	83

...	...	@@ -1,4 +1,4 @@
1		-JFlexiPix - Java implementation of FlexiPix output library
	1	+JEtherPix - Java implementation of EtherPix output library
2	2
3	3	FlexPix is a large scale display architecure that is driven using UDP/IP.
4	4	It consists of single pixels that are connected to chains. A number of those
...	...	@@ -7,7 +7,7 @@ receives data over ethernet and distributes it to the pixel chains.
7	7
8	8	The protocol used on UDP is MCUF (microcontroller unit frame, see
9	9	http://wiki.blinkenarea.org/index.php/MicroControllerUnitFrame). However,
10		-as FlexiPix displays can have more than 65536 pixels, multiple MCUF packets
	10	+as EtherPix displays can have more than 65536 pixels, multiple MCUF packets
11	11	are sent for one frame - a single MCUF frame to every distributor.
12	12	The coordinates of the pixels in the MCUF packets do not correspond to pixel
13	13	locations, but to pixel addresses. The y coordinate is the number of the
...	...	@@ -15,11 +15,11 @@ output of the distributor and the x coordinate is the number of the pixel
15	15	in the chain. The number of channels is always 3 (RGB) and the maximum value
16	16	is always 255 (8 bit per channel).
17	17
18		-This library can be used to send the required UDP packets to the FlexiPix
	18	+This library can be used to send the required UDP packets to the EtherPix
19	19	display to make it show images and/or videos.
20	20	As the libarary has to know how the pixels are wired and where there are
21	21	located (i.e. which pixel in the source image they represent), a rather
22	22	complex config file is needed. Examples of config files can be found in
23		-"org/blinkenarea/JFlexiPix/examples/config" and example code showing how
24		-to use the library is located in "org/blinkenarea/JFlexiPix/examples".
	23	+"org/blinkenarea/JEtherPix/examples/config" and example code showing how
	24	+to use the library is located in "org/blinkenarea/JEtherPix/examples".
25	25

...	...	@@ -1,4 +1,4 @@
1		-/* JFlexiPix - Java implementation of FlexiPix output library
	1	+/* JEtherPix - Java implementation of EtherPix output library
2	2	*
3	3	* Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>
4	4	*
...	...	@@ -16,7 +16,7 @@
16	16	* along with this program. If not, see <http://www.gnu.org/licenses/>.
17	17	*/
18	18
19		-package org.blinkenarea.JFlexiPix;
	19	+package org.blinkenarea.JEtherPix;
20	20
21	21	import java.net.*;
22	22	import java.util.regex.*;

...	...	@@ -1,7 +1,7 @@
1		-# FlexiPix configuration file
	1	+# EtherPix configuration file
2	2
3	3	# the address to bind the local socket to
4		-# - the FlexiPix network 10.70.80.0/16 must be reachable from this address
	4	+# - the EtherPix network 10.70.80.0/16 must be reachable from this address
5	5	bindAddr = 0.0.0.0:0
6	6
7	7	# the size of the display