- fixed merge error in tubecable_demo

- hotfix for error in Huffman table (wrong code for +-7753 replaced with code for +-7754)
floe · Nov 28, 2009 · c63bdc2 · c63bdc2
1 parent 2949d32
commit c63bdc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/tubecable_demo.c b/tubecable_demo.c
@@ -47,15 +47,13 @@ int main(int argc, char* argv[] ) {
 	if (!handle) {
 		printf("Trying DL-160...\n");
 		handle = usb_get_device_handle( 0x17E9, 0x0141 ); // DL-160
-<<<<<<< HEAD:tubecable_demo.c
-	if (!handle)
+	}
+	if (!handle) {
+		printf("Trying Nanovision Mimo...\n");
 		handle = usb_get_device_handle( 0x17E9, 0x401a ); // nanovision mimo
-	if (!handle)
-=======
 	}
 	if (!handle) {
 		printf("Trying ForwardVideo...\n");
->>>>>>> f76951c59e64acd4484ffa59e09d526713fce6b9:tubecable_demo.c
 		handle = usb_get_device_handle( 0x17E9, 0x019b ); // 'ForwardVideo' from dealextreme.com
 	}
 	if (!handle) {

diff --git a/tubecable_huffman.bin b/tubecable_huffman.bin
diff --git a/tubecable_huffman.c b/tubecable_huffman.c
@@ -15989,8 +15989,8 @@
 	array[ -7751] = assign( 27, "101111111111100111111111110" );
 	array[  7752] = assign( 27, "110111111111101111111101110" );
 	array[ -7752] = assign( 27, "100111111111101111111101110" );
-	array[  7753] = assign(  5, "11011" );
-	array[ -7753] = assign(  6, "111111" );
+	array[  7753] = assign( 26, "11011111111110000111111110" ); // FIXME: this is a copy of +-7754
+	array[ -7753] = assign( 26, "10011111111110000111111110" );
 	array[  7754] = assign( 26, "11011111111110000111111110" );
 	array[ -7754] = assign( 26, "10011111111110000111111110" );
 	array[  7755] = assign( 27, "110111111111100011011101010" );