The-Homebrew-Cloud/HIDtoVPADNetworkClient
2
0
Fork 0
mirror of https://github.com/Maschell/HIDtoVPADNetworkClient.git synced 2024-11-25 15:26:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from Maschell/master

Browse Source 
Formatting (Use spaces instead of tabs)
This commit is contained in:
Maschell 2017-03-23 22:04:55 +01:00 committed by GitHub
commit 1e5db6e56f
31 changed files with 1337 additions and 992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

295
eclipse_code_convention.xml Normal file
View File

@ -0,0 +1,295 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="12">
<profile kind="CodeFormatterProfile" name="HIDtoVPADNetworkClient Code Convention" version="12">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="160"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
</profile>
</profiles>

2
src/net/ash/HIDToVPADNetworkClient/Main.java
View File

@ -33,7 +33,7 @@ import net.ash.HIDToVPADNetworkClient.util.Settings;
* TODO locale
*/
public class Main {
public static void main(String[] args){
public static void main(String[] args) {
Settings.loadSettings();
try {
new Thread(ActiveControllerManager.getInstance()).start();

40
src/net/ash/HIDToVPADNetworkClient/controller/Controller.java
View File

@ -29,12 +29,13 @@ import net.ash.HIDToVPADNetworkClient.util.Settings;
import net.ash.HIDToVPADNetworkClient.util.Utilities;
/**
* Main controller interface, extended by controller drivers.
* <br><br>
* Main controller interface, extended by controller drivers. <br>
* <br>
* See {@link LinuxDevInputController} for a full implementation.
*
* @author ash
*/
public abstract class Controller implements Runnable{
public abstract class Controller implements Runnable {
private boolean active;
@Getter private final ControllerType type;
@Getter private final String identifier;
@ -48,10 +49,10 @@ public abstract class Controller implements Runnable{
private Object rumbleLock = new Object();
private boolean rumble = false;
public Controller(ControllerType type, String identifier) throws ControllerInitializationFailedException{
public Controller(ControllerType type, String identifier) throws ControllerInitializationFailedException {
this.type = type;
this.identifier = identifier;
if(!initController(identifier)){
if (!initController(identifier)) {
throw new ControllerInitializationFailedException();
}
}
@ -59,11 +60,11 @@ public abstract class Controller implements Runnable{
@Override
public void run() {
boolean shutdownState = shutdown;
while(!shutdownState){
while (!shutdownState) {
Utilities.sleep(Settings.DETECT_CONTROLLER_INTERVAL);
while(isActive()) {
while (isActive()) {
byte[] newData = pollLatestData();
if(newData != null){
if (newData != null) {
setLatestData(newData);
}
doSleepAfterPollingData();
@ -88,11 +89,11 @@ public abstract class Controller implements Runnable{
@Synchronized("dataLock")
public byte[] getLatestData() {
if(latestData != null){
if (latestData != null) {
byte[] data = this.latestData.clone();
this.latestData = null;
return data;
}else{
} else {
return null;
}
}
@ -100,20 +101,19 @@ public abstract class Controller implements Runnable{
public abstract byte[] pollLatestData();
/**
* Sets up the driver.
* <br>
* Sets up the driver. <br>
* During this method call, a connection will be made with the controller hardware (if required).
*
* @param arg Driver-specific init argument, see {@link ControllerManager} and {@link ControllerDetector}.
* @param arg
* Driver-specific init argument, see {@link ControllerManager} and {@link ControllerDetector}.
* @return Whether initialization was successful.
*/
public abstract boolean initController(String identifier);
/**
* Destroys the controller driver and ends the polling thread.
*/
public void destroyAll(){
public void destroyAll() {
destroyDriver();
endThread();
}
@ -123,7 +123,6 @@ public abstract class Controller implements Runnable{
*/
public abstract void destroyDriver();
private void endThread() {
new Thread(new Runnable() {
@Override
@ -136,12 +135,13 @@ public abstract class Controller implements Runnable{
boolean done = false;
int i = 0;
while(!done){
while (!done) {
synchronized (shutdownLock) {
done = shutdownDone;
}
Utilities.sleep(50);
if(i++ > 50) System.out.println("Thread doesn't stop!!");
if (i++ > 50)
System.out.println("Thread doesn't stop!!");
}
}
}).start();
@ -161,7 +161,7 @@ public abstract class Controller implements Runnable{
}
@Override
public String toString(){
public String toString() {
return getType() + " " + getIdentifier();
}
@ -209,7 +209,7 @@ public abstract class Controller implements Runnable{
}
public enum ControllerType {
PureJAVAHid, LINUX, XINPUT13,XINPUT14
PureJAVAHid, LINUX, XINPUT13, XINPUT14
}
public abstract String getInfoText();

4
src/net/ash/HIDToVPADNetworkClient/controller/DS4NewController.java
View File

@ -8,7 +8,7 @@ public class DS4NewController extends PureJavaHidController {
public DS4NewController(String identifier) throws ControllerInitializationFailedException {
super(identifier);
//truncate package to 6;
// truncate package to 6;
this.PACKET_LENGTH = 6;
}
@ -18,7 +18,7 @@ public class DS4NewController extends PureJavaHidController {
}
@Override
public String getInfoText(){
public String getInfoText() {
return "DS4 on " + getIdentifier();
}
}

45
src/net/ash/HIDToVPADNetworkClient/controller/LinuxDevInputController.java
View File

@ -30,16 +30,16 @@ import lombok.Getter;
import lombok.Setter;
import net.ash.HIDToVPADNetworkClient.exeption.ControllerInitializationFailedException;
public class LinuxDevInputController extends Controller implements Runnable{
public class LinuxDevInputController extends Controller implements Runnable {
public LinuxDevInputController(String identifier) throws ControllerInitializationFailedException {
super(ControllerType.LINUX, identifier);
}
public static final int NUM_SUPPORTED_AXIS = 10; //possibly off-by-one
public static final int NUM_SUPPORTED_AXIS = 10; // possibly off-by-one
public static final int CONTROLLER_DATA_SIZE = Long.BYTES + (Byte.BYTES * NUM_SUPPORTED_AXIS);
private static final byte JS_EVENT_BUTTON = 0x01;
private static final byte JS_EVENT_INIT = (byte)0x80;
private static final byte JS_EVENT_INIT = (byte) 0x80;
private static final byte JS_EVENT_AXIS = 0x02;
@Getter @Setter private DataInputStream controller;
@ -57,9 +57,10 @@ public class LinuxDevInputController extends Controller implements Runnable{
return false;
}
setVID((short)(identifier.hashCode() & 0xFFFF));
setPID((short)((identifier.hashCode() >> Short.BYTES) & 0xFFFF));
System.out.println("[LinuxDevInputController] " + identifier.toString() + " fakevid: " + Integer.toHexString((int)getVID() & 0xFFFF) + " fakepid: " + Integer.toHexString((int)getPID() & 0xFFFF));
setVID((short) (identifier.hashCode() & 0xFFFF));
setPID((short) ((identifier.hashCode() >> Short.BYTES) & 0xFFFF));
System.out.println("[LinuxDevInputController] " + identifier.toString() + " fakevid: " + Integer.toHexString((int) getVID() & 0xFFFF) + " fakepid: "
+ Integer.toHexString((int) getPID() & 0xFFFF));
return true;
}
@ -70,12 +71,12 @@ public class LinuxDevInputController extends Controller implements Runnable{
@Override
public byte[] pollLatestData() {
DataInputStream inputStream = getController();
//Read out next event from controller
/*int time;*/
// Read out next event from controller
/* int time; */
short value;
byte type, number;
try {
/*time = */inputStream.readInt();
/* time = */inputStream.readInt();
value = inputStream.readShort();
type = inputStream.readByte();
number = inputStream.readByte();
@ -87,7 +88,7 @@ public class LinuxDevInputController extends Controller implements Runnable{
return null;
}
//Treat init events as normal (clear init bit)
// Treat init events as normal (clear init bit)
type &= ~JS_EVENT_INIT;
if (type == JS_EVENT_BUTTON) {
@ -97,10 +98,10 @@ public class LinuxDevInputController extends Controller implements Runnable{
}
if (value != 0) {
//Set bit with button number
// Set bit with button number
buttonState |= (1 << number);
} else {
//Clear bit with button number
// Clear bit with button number
buttonState &= ~(1 << number);
}
} else if (type == JS_EVENT_AXIS) {
@ -108,18 +109,18 @@ public class LinuxDevInputController extends Controller implements Runnable{
System.out.println("[LinuxDevInputController] Axis number " + number + " out of range; ignoring");
return null;
}
//Do byteswap
value = (short)(((value & 0xFF) << Byte.SIZE) | ((value & 0xFF00) >> Byte.SIZE));
//Convert to unsigned byte and store
axisState[number] = (byte)(((value + Short.MAX_VALUE + 1) >> 8) & 0xFF);
// Do byteswap
value = (short) (((value & 0xFF) << Byte.SIZE) | ((value & 0xFF00) >> Byte.SIZE));
// Convert to unsigned byte and store
axisState[number] = (byte) (((value + Short.MAX_VALUE + 1) >> 8) & 0xFF);
}
byte[] newData = new byte[CONTROLLER_DATA_SIZE];
//Copy in button states
// Copy in button states
for (int i = 0; i < Long.BYTES; i++) {
newData[i] = (byte)((buttonState >> (i * Byte.SIZE)) & 0xFF);
newData[i] = (byte) ((buttonState >> (i * Byte.SIZE)) & 0xFF);
}
//Copy in axis data
// Copy in axis data
for (int i = Long.BYTES; i < CONTROLLER_DATA_SIZE; i++) {
newData[i] = axisState[i - Long.BYTES];
}
@ -128,7 +129,8 @@ public class LinuxDevInputController extends Controller implements Runnable{
@Override
protected void doSleepAfterPollingData() {
//This is event driven (aka pollLatestData() is blocking anyway until we have data), we don't need to sleep it all.
// This is event driven (aka pollLatestData() is blocking anyway until
// we have data), we don't need to sleep it all.
}
@Override
@ -141,7 +143,8 @@ public class LinuxDevInputController extends Controller implements Runnable{
@Override
public String toString() {
return "[" + super.toString() + ";VID," + Integer.toHexString((int)getVID() & 0xFFFF) + ";PID," + Integer.toHexString((int)getPID() & 0xFFFF) + ";run," + isActive() + ((controller == null) ? ";uninitialised]" : ";initialised]");
return "[" + super.toString() + ";VID," + Integer.toHexString((int) getVID() & 0xFFFF) + ";PID," + Integer.toHexString((int) getPID() & 0xFFFF)
+ ";run," + isActive() + ((controller == null) ? ";uninitialised]" : ";initialised]");
}
@Override

28
src/net/ash/HIDToVPADNetworkClient/controller/PureJavaHidController.java
View File

@ -36,14 +36,15 @@ import purejavahidapi.InputReportListener;
public class PureJavaHidController extends Controller implements InputReportListener {
public static Controller getInstance(String deviceIdentifier) throws IOException, ControllerInitializationFailedException {
HidDevice device = PureJavaHidApiManager.getDeviceByPath(deviceIdentifier);
//We use a special version to optimize the data for the switch pro controller
if(device.getHidDeviceInfo().getVendorId() == SwitchProController.SWITCH_PRO_CONTROLLER_VID &&
device.getHidDeviceInfo().getProductId() == SwitchProController.SWITCH_PRO_CONTROLLER_PID){
// We use a special version to optimize the data for the switch pro
// controller
if (device.getHidDeviceInfo().getVendorId() == SwitchProController.SWITCH_PRO_CONTROLLER_VID
&& device.getHidDeviceInfo().getProductId() == SwitchProController.SWITCH_PRO_CONTROLLER_PID) {
return new SwitchProController(deviceIdentifier);
}else if(device.getHidDeviceInfo().getVendorId() == DS4NewController.DS4_NEW_CONTROLLER_VID &&
device.getHidDeviceInfo().getProductId() == DS4NewController.DS4_NEW_CONTROLLER_PID){
} else if (device.getHidDeviceInfo().getVendorId() == DS4NewController.DS4_NEW_CONTROLLER_VID
&& device.getHidDeviceInfo().getProductId() == DS4NewController.DS4_NEW_CONTROLLER_PID) {
return new DS4NewController(deviceIdentifier);
}else {
} else {
return new PureJavaHidController(deviceIdentifier);
}
}
@ -57,8 +58,7 @@ public class PureJavaHidController extends Controller implements InputReportList
protected int PACKET_LENGTH = 64;
@Getter @Setter(AccessLevel.PRIVATE)
private HidDevice hidDevice;
@Getter @Setter(AccessLevel.PRIVATE) private HidDevice hidDevice;
@Override
public boolean initController(String identifier) {
@ -100,9 +100,9 @@ public class PureJavaHidController extends Controller implements InputReportList
@Override
@Synchronized("dataLock")
public void onInputReport(HidDevice source, byte reportID, byte[] reportData, int reportLength) {
if(isActive()){
if (isActive()) {
int length = PACKET_LENGTH;
if(reportLength < length){
if (reportLength < length) {
length = reportLength;
}
currentData = Arrays.copyOfRange(reportData, 0, length);
@ -111,11 +111,11 @@ public class PureJavaHidController extends Controller implements InputReportList
@Override
public String getInfoText() {
//TODO:
if(getVID() == 0x57e){
if(getPID() == 0x2006){
// TODO:
if (getVID() == 0x57e) {
if (getPID() == 0x2006) {
return "Joy-Con (L) on " + getIdentifier();
}else if(getPID() == 0x2007){
} else if (getPID() == 0x2007) {
return "Joy-Con (R) on " + getIdentifier();
}
}

6
src/net/ash/HIDToVPADNetworkClient/controller/SwitchProController.java
View File

@ -29,13 +29,13 @@ public class SwitchProController extends PureJavaHidController {
public SwitchProController(String identifier) throws ControllerInitializationFailedException {
super(identifier);
//truncate package to 11;
// truncate package to 11;
this.PACKET_LENGTH = 11;
}
@Override
public byte[] pollLatestData() {
//remove unused data (because only changed data will be sent)
// remove unused data (because only changed data will be sent)
currentData[3] = 0;
currentData[5] = 0;
currentData[7] = 0;
@ -44,7 +44,7 @@ public class SwitchProController extends PureJavaHidController {
}
@Override
public String getInfoText(){
public String getInfoText() {
return "Switch Pro Controller on " + getIdentifier();
}
}

2
src/net/ash/HIDToVPADNetworkClient/controller/XInput13Controller.java
View File

@ -29,7 +29,7 @@ public class XInput13Controller extends XInputController {
}
@Override
public String getInfoText(){
public String getInfoText() {
return "XInput 1.3 on " + getIdentifier();
}
}

2
src/net/ash/HIDToVPADNetworkClient/controller/XInput14Controller.java
View File

@ -29,7 +29,7 @@ public class XInput14Controller extends XInputController {
}
@Override
public String getInfoText(){
public String getInfoText() {
return "XInput 1.4 on " + getIdentifier();
}
}

65
src/net/ash/HIDToVPADNetworkClient/controller/XInputController.java
View File

@ -36,7 +36,7 @@ import net.ash.HIDToVPADNetworkClient.exeption.ControllerInitializationFailedExc
import net.ash.HIDToVPADNetworkClient.util.Utilities;
public class XInputController extends Controller {
//the pad number will be appended to this String.
// the pad number will be appended to this String.
public static final String XINPUT_INDENTIFER = "\\\\?\\XINPUT\\";
@Getter @Setter(AccessLevel.PRIVATE) private XInputDevice device;
@ -52,41 +52,58 @@ public class XInputController extends Controller {
try {
device = XInputDevice.getDeviceFor(pad);
} catch (XInputNotLoadedException e) {
//TODO: Log?
// TODO: Log?
}
if(device == null) return false;
if (device == null)
return false;
setDevice(device);
return true;
}
@Override
public byte[] pollLatestData() {
if(device.poll()){
if (device.poll()) {
ByteBuffer data = ByteBuffer.allocate(8);
XInputComponents components = device.getComponents();
XInputButtons buttons = components.getButtons();
int buttonState = 0;
if(buttons.a) buttonState |= (1 << 0);
if(buttons.b) buttonState |= (1 << 1);
if(buttons.x) buttonState |= (1 << 2);
if(buttons.y) buttonState |= (1 << 3);
if (buttons.a)
buttonState |= (1 << 0);
if (buttons.b)
buttonState |= (1 << 1);
if (buttons.x)
buttonState |= (1 << 2);
if (buttons.y)
buttonState |= (1 << 3);
if(buttons.left) buttonState |= (1 << 4);
if(buttons.up) buttonState |= (1 << 5);
if(buttons.right) buttonState |= (1 << 6);
if(buttons.down) buttonState |= (1 << 7);
if (buttons.left)
buttonState |= (1 << 4);
if (buttons.up)
buttonState |= (1 << 5);
if (buttons.right)
buttonState |= (1 << 6);
if (buttons.down)
buttonState |= (1 << 7);
if(buttons.back) buttonState |= (1 << 8);
if(buttons.start) buttonState |= (1 << 9);
if(buttons.lShoulder) buttonState |= (1 << 10);
if(buttons.rShoulder) buttonState |= (1 << 11);
if(buttons.lThumb) buttonState |= (1 << 12);
if(buttons.rThumb) buttonState |= (1 << 13);
if(buttons.unknown) buttonState |= (1 << 14);
if (buttons.back)
buttonState |= (1 << 8);
if (buttons.start)
buttonState |= (1 << 9);
if (buttons.lShoulder)
buttonState |= (1 << 10);
if (buttons.rShoulder)
buttonState |= (1 << 11);
if (buttons.lThumb)
buttonState |= (1 << 12);
if (buttons.rThumb)
buttonState |= (1 << 13);
if (buttons.unknown)
buttonState |= (1 << 14);
if (XInputDevice.isGuideButtonSupported()) {
if (buttons.guide) buttonState |= (1 << 15);
if (buttons.guide)
buttonState |= (1 << 15);
}
XInputAxes axes = components.getAxes();
@ -105,17 +122,17 @@ public class XInputController extends Controller {
buttonState |= axesDataShoulderButtons << 16;
data.putInt(axesData).putInt(buttonState);
return(data.array());
return (data.array());
}
return null;
}
@Override
public void destroyDriver() {
//not needed
// not needed
}
//TODO: Other values for VID/PID? I guess other people had this idea too...
// TODO: Other values for VID/PID? I guess other people had this idea too...
@Override
public short getVID() {
return 0x7331;
@ -127,7 +144,7 @@ public class XInputController extends Controller {
}
@Override
public String getInfoText(){
public String getInfoText() {
return "XInput on " + getIdentifier();
}
}

19
src/net/ash/HIDToVPADNetworkClient/gui/GuiCloseListener.java
View File

@ -36,21 +36,26 @@ public class GuiCloseListener implements WindowListener {
}
@Override
public void windowActivated(WindowEvent arg0) {}
public void windowActivated(WindowEvent arg0) {
}
@Override
public void windowClosed(WindowEvent arg0) {}
public void windowClosed(WindowEvent arg0) {
}
@Override
public void windowDeactivated(WindowEvent arg0) {}
public void windowDeactivated(WindowEvent arg0) {
}
@Override
public void windowDeiconified(WindowEvent arg0) {}
public void windowDeiconified(WindowEvent arg0) {
}
@Override
public void windowIconified(WindowEvent arg0) {}
public void windowIconified(WindowEvent arg0) {
}
@Override
public void windowOpened(WindowEvent arg0) {}
public void windowOpened(WindowEvent arg0) {
}
}

19
src/net/ash/HIDToVPADNetworkClient/gui/GuiControllerList.java
View File

@ -50,7 +50,7 @@ public class GuiControllerList extends JPanel {
innerScrollPanel.setLayout(new BoxLayout(innerScrollPanel, BoxLayout.PAGE_AXIS));
add(new JScrollPane(innerScrollPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
int delay = 1000; //milliseconds
int delay = 1000; // milliseconds
ActionListener taskPerformer = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
updateControllerList();
@ -60,7 +60,8 @@ public class GuiControllerList extends JPanel {
}
public synchronized void updateControllerList() {
//System.out.println("[GuiControllerList] Updating controller list..."); //XXX debug text
// System.out.println("[GuiControllerList] Updating controller
// list..."); //XXX debug text
boolean repaintNeeded = false;
@ -68,32 +69,32 @@ public class GuiControllerList extends JPanel {
List<GuiControllerListItem> newComponents = new ArrayList<GuiControllerListItem>();
Map<Controller,GuiControllerListItem> components = new HashMap<Controller,GuiControllerListItem>();
Map<Controller, GuiControllerListItem> components = new HashMap<Controller, GuiControllerListItem>();
for (Component component : innerScrollPanel.getComponents()) {
if (component instanceof GuiControllerListItem) {
GuiControllerListItem comp = (GuiControllerListItem) component;
Controller cont = comp.getController();
if(attachedControllers.contains(cont)){
components.put(cont,comp);
}else{//Controller removed
if (attachedControllers.contains(cont)) {
components.put(cont, comp);
} else {// Controller removed
repaintNeeded = true;
}
}
}
//Build new list of components.
// Build new list of components.
for (Controller controller : attachedControllers) {
GuiControllerListItem i = null;
if (components.containsKey(controller)) {
newComponents.add(components.get(controller));
}else{ //New controller was added
} else { // New controller was added
repaintNeeded = true;
i = new GuiControllerListItem(controller);
newComponents.add(i);
}
}
if(repaintNeeded){
if (repaintNeeded) {
innerScrollPanel.removeAll();
for (GuiControllerListItem component : newComponents) {
innerScrollPanel.add(component);

4
src/net/ash/HIDToVPADNetworkClient/gui/GuiControllerListItem.java
View File

@ -43,7 +43,7 @@ public class GuiControllerListItem extends JPanel implements ActionListener {
public GuiControllerListItem(Controller data) {
super(new BorderLayout());
setMinimumSize(new Dimension (300, 30));
setMinimumSize(new Dimension(300, 30));
setPreferredSize(new Dimension(300, 30));
setMaximumSize(new Dimension(2000, 30));
@ -54,7 +54,7 @@ public class GuiControllerListItem extends JPanel implements ActionListener {
checkbox.addActionListener(this);
add(checkbox);
int delay = 100; //milliseconds
int delay = 100; // milliseconds
ActionListener taskPerformer = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
checkbox.setEnabled(NetworkManager.getInstance().isConnected());

17
src/net/ash/HIDToVPADNetworkClient/gui/GuiInputControls.java
View File

@ -66,7 +66,6 @@ public class GuiInputControls extends JPanel implements ActionListener {
connectButton = new JButton(CONNECT);
connectButton.setAlignmentX(Component.CENTER_ALIGNMENT);
ipTextBox = new JTextField();
ipTextBox.setColumns(15);
ipTextBox.setText(Settings.getIpAddr());
@ -92,16 +91,16 @@ public class GuiInputControls extends JPanel implements ActionListener {
connectButton.addActionListener(this);
int delay = 100; //milliseconds
int delay = 100; // milliseconds
ActionListener taskPerformer = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
if(NetworkManager.getInstance().isReconnecting()){
if (NetworkManager.getInstance().isReconnecting()) {
connectButton.setText(RECONNECTING);
connectButton.setEnabled(false);
}else if(NetworkManager.getInstance().isConnected()){
} else if (NetworkManager.getInstance().isConnected()) {
connectButton.setText(DISCONNECT);
connectButton.setEnabled(true);
}else{
} else {
connectButton.setText(CONNECT);
connectButton.setEnabled(true);
}
@ -135,12 +134,12 @@ public class GuiInputControls extends JPanel implements ActionListener {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
Settings.setIpAddr(ipTextBox.getText());
if(NetworkManager.getInstance().isReconnecting()){
if (NetworkManager.getInstance().isReconnecting()) {
}else{
if(NetworkManager.getInstance().isConnected()){
} else {
if (NetworkManager.getInstance().isConnected()) {
NetworkManager.getInstance().disconnect();
}else{
} else {
NetworkManager.getInstance().connect(ipTextBox.getText());
}
}

1
src/net/ash/HIDToVPADNetworkClient/gui/GuiMain.java
View File

@ -50,6 +50,7 @@ public class GuiMain extends JPanel {
private GuiControllerList leftControllerList;
private GuiInputControls rightSideControls;
public GuiMain() {
super(new BorderLayout());

43
src/net/ash/HIDToVPADNetworkClient/manager/ActiveControllerManager.java
View File

@ -35,22 +35,22 @@ import net.ash.HIDToVPADNetworkClient.util.Settings;
import net.ash.HIDToVPADNetworkClient.util.Utilities;
@Log
public class ActiveControllerManager implements Runnable{
public class ActiveControllerManager implements Runnable {
private static ActiveControllerManager instance = new ActiveControllerManager();
private ActiveControllerManager(){
private ActiveControllerManager() {
}
public static ActiveControllerManager getInstance(){
public static ActiveControllerManager getInstance() {
return instance;
}
@Override
public void run() { //TODO: Add mechanism to stop these threads?
public void run() { // TODO: Add mechanism to stop these threads?
new Thread(new Runnable() {
@Override
public void run() {
while(true){
while (true) {
updateControllerStates();
ControllerManager.detectControllers();
Utilities.sleep(Settings.DETECT_CONTROLLER_INTERVAL);
@ -61,7 +61,7 @@ public class ActiveControllerManager implements Runnable{
new Thread(new Runnable() {
@Override
public void run() {
while(true){
while (true) {
handleControllerInputs();
Utilities.sleep(Settings.HANDLE_INPUTS_INTERVAL);
}
@ -69,25 +69,26 @@ public class ActiveControllerManager implements Runnable{
}).start();
}
private Map<Controller,NetworkHIDDevice> activeControllers = new HashMap<Controller,NetworkHIDDevice>();
private Map<Controller, NetworkHIDDevice> activeControllers = new HashMap<Controller, NetworkHIDDevice>();
public void updateControllerStates() {
List<Controller> currentControllers = ControllerManager.getActiveControllers();
List<Controller> toAdd = new ArrayList<Controller>();
List<Controller> toRemove = new ArrayList<Controller>();
synchronized (activeControllers) {
//Adding all missing.
// Adding all missing.
for(Controller c: currentControllers){
if(!activeControllers.containsKey(c)){
for (Controller c : currentControllers) {
if (!activeControllers.containsKey(c)) {
log.info("Added " + c);
toAdd.add(c);
}
}
//removing all old
for(Controller c : activeControllers.keySet()){
if(!currentControllers.contains(c)){
// removing all old
for (Controller c : activeControllers.keySet()) {
if (!currentControllers.contains(c)) {
log.info("Removed " + c);
toRemove.add(c);
}
@ -100,7 +101,7 @@ public class ActiveControllerManager implements Runnable{
private void removeController(List<Controller> toRemove) {
synchronized (activeControllers) {
for(Controller c : toRemove){
for (Controller c : toRemove) {
NetworkManager.getInstance().removeHIDDevice(activeControllers.get(c));
c.destroyDriver();
activeControllers.remove(c);
@ -110,20 +111,20 @@ public class ActiveControllerManager implements Runnable{
private void addController(List<Controller> toAdd) {
synchronized (activeControllers) {
for(Controller c : toAdd){
for (Controller c : toAdd) {
NetworkHIDDevice hiddevice = new NetworkHIDDevice(c.getVID(), c.getPID());
hiddevice.sendAttach();
NetworkManager.getInstance().addHIDDevice(hiddevice);
activeControllers.put(c,hiddevice);
activeControllers.put(c, hiddevice);
}
}
}
private void handleControllerInputs() {
synchronized (activeControllers) {
for(Entry<Controller, NetworkHIDDevice> entry : activeControllers.entrySet()){
for (Entry<Controller, NetworkHIDDevice> entry : activeControllers.entrySet()) {
byte[] data = entry.getKey().getLatestData();
if(data != null){
if (data != null) {
NetworkHIDDevice device = entry.getValue();
device.sendRead(data);
}
@ -133,7 +134,7 @@ public class ActiveControllerManager implements Runnable{
public void attachAllActiveControllers() {
synchronized (activeControllers) {
for(Entry<Controller, NetworkHIDDevice> entry : activeControllers.entrySet()){
for (Entry<Controller, NetworkHIDDevice> entry : activeControllers.entrySet()) {
NetworkHIDDevice device = entry.getValue();
device.sendAttach();
}
@ -146,8 +147,8 @@ public class ActiveControllerManager implements Runnable{
* @return returns the controller for the given handle. returns null if the controller with the given handle is not found.
*/
public Controller getControllerByHIDHandle(int HIDhandle) {
for(Entry<Controller, NetworkHIDDevice> entry: activeControllers.entrySet()){
if(entry.getValue().getHidHandle() == HIDhandle){
for (Entry<Controller, NetworkHIDDevice> entry : activeControllers.entrySet()) {
if (entry.getValue().getHidHandle() == HIDhandle) {
return entry.getKey();
}
}

85
src/net/ash/HIDToVPADNetworkClient/manager/ControllerManager.java
View File

@ -47,8 +47,8 @@ import net.ash.HIDToVPADNetworkClient.util.PureJavaHidApiManager;
import purejavahidapi.HidDeviceInfo;
import purejavahidapi.PureJavaHidApi;
public class ControllerManager{
private static Map<String,Controller> attachedControllers = new HashMap<String,Controller>();
public class ControllerManager {
private static Map<String, Controller> attachedControllers = new HashMap<String, Controller>();
/**
* Detects all attached controller.
@ -56,9 +56,9 @@ public class ControllerManager{
@Synchronized("attachedControllers")
public static void detectControllers() {
String os = System.getProperty("os.name");
//System.out.println("[ControllerDetector] OS: " + os);
// System.out.println("[ControllerDetector] OS: " + os);
Map<String,ControllerType> connectedDevices = new HashMap<String,ControllerType>();
Map<String, ControllerType> connectedDevices = new HashMap<String, ControllerType>();
if (os.contains("Linux")) {
connectedDevices.putAll(detectLinuxControllers());
@ -74,29 +74,29 @@ public class ControllerManager{
PureJavaHidApiManager.MAC_OS_X = false;
}
//Remove detached devices
// Remove detached devices
List<String> toRemove = new ArrayList<String>();
for(String s : attachedControllers.keySet()){
if(!connectedDevices.containsKey(s)){
for (String s : attachedControllers.keySet()) {
if (!connectedDevices.containsKey(s)) {
toRemove.add(s);
}
}
for(String remove : toRemove){
for (String remove : toRemove) {
attachedControllers.get(remove).destroyAll();
attachedControllers.remove(remove);
}
//Add attached devices!
for(Entry<String, ControllerType> entry : connectedDevices.entrySet()){
// Add attached devices!
for (Entry<String, ControllerType> entry : connectedDevices.entrySet()) {
String deviceIdentifier = entry.getKey();
if(!attachedControllers.containsKey(deviceIdentifier)){
if (!attachedControllers.containsKey(deviceIdentifier)) {
Controller c = null;
switch(entry.getValue()){
switch (entry.getValue()) {
case PureJAVAHid:
try {
c= PureJavaHidController.getInstance(deviceIdentifier);
c = PureJavaHidController.getInstance(deviceIdentifier);
} catch (ControllerInitializationFailedException e) {
//e.printStackTrace();
// e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
@ -105,20 +105,18 @@ public class ControllerManager{
try {
c = new LinuxDevInputController(deviceIdentifier);
} catch (ControllerInitializationFailedException e) {
//e.printStackTrace();
// e.printStackTrace();
}
break;
/*
* TODO:
* Currently the XInput will be set active automatically.
* But this should move to something for the settings?
* TODO: Currently the XInput will be set active automatically. But this should move to something for the settings?
*/
case XINPUT14:
try {
c = new XInput14Controller(deviceIdentifier);
c.setActive(true);
} catch (ControllerInitializationFailedException e) {
//e.printStackTrace();
// e.printStackTrace();
}
break;
case XINPUT13:
@ -126,15 +124,16 @@ public class ControllerManager{
c = new XInput13Controller(deviceIdentifier);
c.setActive(true);
} catch (ControllerInitializationFailedException e) {
//e.printStackTrace();
// e.printStackTrace();
}
break;
default:
break;
}
if(c != null){ //I don't like that starting the Thread happens here =/
if (c != null) { // I don't like that starting the Thread
// happens here =/
new Thread(c).start();
attachedControllers.put(deviceIdentifier,c);
attachedControllers.put(deviceIdentifier, c);
}
}
}
@ -146,11 +145,11 @@ public class ControllerManager{
}
private static Map<String, ControllerType> detectHIDDevices() {
Map<String,ControllerType> connectedDevices = new HashMap<String,ControllerType>();
Map<String, ControllerType> connectedDevices = new HashMap<String, ControllerType>();
for (HidDeviceInfo info : PureJavaHidApi.enumerateDevices()) {
if(info.getUsagePage() == 0x05 || info.getUsagePage() == 0x04 || (info.getVendorId() == 0x57e) || (info.getVendorId() == 0x054c) ){
connectedDevices.put(info.getPath(),ControllerType.PureJAVAHid);
if (info.getUsagePage() == 0x05 || info.getUsagePage() == 0x04 || (info.getVendorId() == 0x57e) || (info.getVendorId() == 0x054c)) {
connectedDevices.put(info.getPath(), ControllerType.PureJAVAHid);
}
}
@ -158,11 +157,11 @@ public class ControllerManager{
}
private static Map<String, ControllerType> detectOSXHIDDevices() {
Map<String,ControllerType> connectedDevices = new HashMap<String,ControllerType>();
Map<String, ControllerType> connectedDevices = new HashMap<String, ControllerType>();
for (HidDeviceInfo info : PureJavaHidApi.enumerateDevices()) {
if(info.getUsagePage() == 0x05 || info.getUsagePage() == 0x04 || (info.getVendorId() == 0x57e) || (info.getVendorId() == 0x054c) ){
connectedDevices.put(info.getPath().substring(0, 13),ControllerType.PureJAVAHid);
if (info.getUsagePage() == 0x05 || info.getUsagePage() == 0x04 || (info.getVendorId() == 0x57e) || (info.getVendorId() == 0x054c)) {
connectedDevices.put(info.getPath().substring(0, 13), ControllerType.PureJAVAHid);
}
}
@ -170,21 +169,24 @@ public class ControllerManager{
}
private static Map<String, ControllerType> detectWindowsControllers() {
Map<String,ControllerType> result = new HashMap<String,ControllerType>();
Map<String, ControllerType> result = new HashMap<String, ControllerType>();
ControllerType type = ControllerType.XINPUT13;
if(XInputDevice.isAvailable() || XInputDevice14.isAvailable()) {
if(XInputDevice14.isAvailable()){
if (XInputDevice.isAvailable() || XInputDevice14.isAvailable()) {
if (XInputDevice14.isAvailable()) {
type = ControllerType.XINPUT14;
}
for(int i =0;i<4;i++){
for (int i = 0; i < 4; i++) {
XInputDevice device;
try {
device = XInputDevice.getDeviceFor(i);
if(device.poll() && device.isConnected()){ //Check if it is this controller is connected
if (device.poll() && device.isConnected()) { // Check if it
// is this
// controller
// is connected
result.put(XInputController.XINPUT_INDENTIFER + i, type);
}
} catch (XInputNotLoadedException e) {
//This shouln't happen?
// This shouln't happen?
e.printStackTrace();
}
}
@ -194,18 +196,19 @@ public class ControllerManager{
}
private static Map<String, ControllerType> detectLinuxControllers() {
Map<String,ControllerType> result = new HashMap<String,ControllerType>();
Map<String, ControllerType> result = new HashMap<String, ControllerType>();
File devInput = new File("/dev/input");
if (!devInput.exists()) return result;
if (!devInput.exists())
return result;
File[] linuxControllers = devInput.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.startsWith("js"); //js0, js1, etc...
return name.startsWith("js"); // js0, js1, etc...
}
});
for (File controller : linuxControllers) {
result.put(controller.getAbsolutePath(),ControllerType.LINUX);
result.put(controller.getAbsolutePath(), ControllerType.LINUX);
}
return result;
@ -214,8 +217,8 @@ public class ControllerManager{
@Synchronized("attachedControllers")
public static List<Controller> getActiveControllers() {
List<Controller> active = new ArrayList<Controller>();
for(Controller c : attachedControllers.values()){
if(c.isActive()){
for (Controller c : attachedControllers.values()) {
if (c.isActive()) {
active.add(c);
}
}
@ -224,7 +227,7 @@ public class ControllerManager{
@Synchronized("attachedControllers")
public static void deactivateAllAttachedControllers() {
for(Controller c : attachedControllers.values()){
for (Controller c : attachedControllers.values()) {
c.setActive(false);
}
}

24
src/net/ash/HIDToVPADNetworkClient/network/NetworkHIDDevice.java
View File

@ -35,7 +35,6 @@ import net.ash.HIDToVPADNetworkClient.network.commands.DetachCommand;
import net.ash.HIDToVPADNetworkClient.network.commands.DeviceCommand;
import net.ash.HIDToVPADNetworkClient.network.commands.ReadCommand;
import net.ash.HIDToVPADNetworkClient.util.HandleFoundry;
import net.ash.HIDToVPADNetworkClient.util.Utilities;
public class NetworkHIDDevice {
@Getter private final short vid;
@ -51,32 +50,33 @@ public class NetworkHIDDevice {
private Object readCommandLock = new Object();
public NetworkHIDDevice(short vid, short pid){
public NetworkHIDDevice(short vid, short pid) {
this.vid = vid;
this.pid = pid;
}
private void addCommand(DeviceCommand command){
private void addCommand(DeviceCommand command) {
this.commands.add(command);
}
private void clearCommands(){
private void clearCommands() {
this.commands.clear();
}
public void sendAttach(){
addCommand(new AttachCommand(getHidHandle(), getVid(), getPid(),this));
public void sendAttach() {
addCommand(new AttachCommand(getHidHandle(), getVid(), getPid(), this));
}
public void sendDetach(){
addCommand(new DetachCommand(getHidHandle(),this));
public void sendDetach() {
addCommand(new DetachCommand(getHidHandle(), this));
}
private byte[] lastdata = null;
public void sendRead(byte[] data){
if(!Arrays.equals(lastdata, data)){
public void sendRead(byte[] data) {
if (!Arrays.equals(lastdata, data)) {
synchronized (readCommandLock) {
setLatestRead(new ReadCommand(getHidHandle(),data, this)); //Only get the latest Value.
setLatestRead(new ReadCommand(getHidHandle(), data, this)); // Only get the latest Value.
}
lastdata = data.clone();
}
@ -88,7 +88,7 @@ public class NetworkHIDDevice {
DeviceCommand lastRead;
synchronized (readCommandLock) {
if((lastRead = getLatestRead()) != null){
if ((lastRead = getLatestRead()) != null) {
commands.add(lastRead);
setLatestRead(null);
}

118
src/net/ash/HIDToVPADNetworkClient/network/NetworkManager.java
View File

@ -21,6 +21,7 @@
*******************************************************************************/
package net.ash.HIDToVPADNetworkClient.network;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@ -37,7 +38,7 @@ import net.ash.HIDToVPADNetworkClient.util.Settings;
import net.ash.HIDToVPADNetworkClient.util.Utilities;
@Log
public class NetworkManager implements Runnable{
public class NetworkManager implements Runnable {
private final TCPClient tcpClient = new TCPClient();
private UDPClient udpClient = null;
@ -49,8 +50,8 @@ public class NetworkManager implements Runnable{
}
public static NetworkManager getInstance(){
if(instance == null){
public static NetworkManager getInstance() {
if (instance == null) {
instance = new NetworkManager();
}
return instance;
@ -58,8 +59,8 @@ public class NetworkManager implements Runnable{
@Getter private List<NetworkHIDDevice> devices = new ArrayList<NetworkHIDDevice>();
public void addHIDDevice(NetworkHIDDevice device){
if(!getDevices().contains(device)){
public void addHIDDevice(NetworkHIDDevice device) {
if (!getDevices().contains(device)) {
synchronized (devices) {
getDevices().add(device);
}
@ -70,6 +71,7 @@ public class NetworkManager implements Runnable{
* We want to remove them at the end of a cycle. To make sure the detach was send before removing.
*/
@Getter private List<NetworkHIDDevice> toRemove = new ArrayList<NetworkHIDDevice>();
@Synchronized("toRemove")
public void removeHIDDevice(NetworkHIDDevice device) {
device.sendDetach();
@ -79,10 +81,10 @@ public class NetworkManager implements Runnable{
@Override
public void run() {
int i = 0;
while(true){
while (true) {
proccessCommands();
Utilities.sleep(Settings.PROCESS_CMD_INTERVAL);
if(i++ > Settings.PING_INTERVAL / Settings.PROCESS_CMD_INTERVAL){
if (i++ > Settings.PING_INTERVAL / Settings.PROCESS_CMD_INTERVAL) {
ping();
i = 0;
}
@ -90,47 +92,51 @@ public class NetworkManager implements Runnable{
}
private void ping() {
if(isConnected() || tcpClient.isShouldRetry())sendingCommand(new PingCommand());
if (isConnected() || tcpClient.isShouldRetry())
sendingCommand(new PingCommand());
}
public void proccessCommands(){
public void proccessCommands() {
List<DeviceCommand> commands = new ArrayList<DeviceCommand>();
commands.addAll(ownCommands); //TODO: Does this need a synchronized block? It _should_ be only access from this thread. Need to think about it
commands.addAll(ownCommands); // TODO: Does this need a synchronized
// block? It _should_ be only access from
// this thread. Need to think about it
ownCommands.clear();
synchronized (toRemove) {
synchronized (devices) {
for(NetworkHIDDevice device : getDevices()){
for (NetworkHIDDevice device : getDevices()) {
commands.addAll(device.getCommandList());
}
}
}
if(commands.isEmpty())return;
if (commands.isEmpty())
return;
//Split up into "read commands" and other commands.
// Split up into "read commands" and other commands.
List<ReadCommand> readCommands = new ArrayList<ReadCommand>();
{
for(DeviceCommand command : commands){
if(command instanceof ReadCommand){
for (DeviceCommand command : commands) {
if (command instanceof ReadCommand) {
readCommands.add((ReadCommand) command);
}
}
commands.removeAll(readCommands);
}
if(!readCommands.isEmpty()){
if (!readCommands.isEmpty()) {
sendingRead(readCommands);
}
if(!commands.isEmpty()){
for(DeviceCommand command : commands){
if (!commands.isEmpty()) {
for (DeviceCommand command : commands) {
sendingCommand(command);
}
}
synchronized (toRemove) {
synchronized (devices) {
for(NetworkHIDDevice d: toRemove){
for (NetworkHIDDevice d : toRemove) {
commands.remove(d);
}
}
@ -139,33 +145,33 @@ public class NetworkManager implements Runnable{
private void sendingCommand(DeviceCommand command) {
boolean result = false;
if(isConnected() || tcpClient.isShouldRetry()){
if(command instanceof AttachCommand){
if (isConnected() || tcpClient.isShouldRetry()) {
if (command instanceof AttachCommand) {
result = sendAttach((AttachCommand) command);
}else if(command instanceof DetachCommand){
} else if (command instanceof DetachCommand) {
result = sendDetach((DetachCommand) command);
}else if(command instanceof PingCommand){
} else if (command instanceof PingCommand) {
sendPing((PingCommand) command);
result = true;
}else{
} else {
log.info("UNKNOWN COMMAND!");
result = true;
}
}else{
} else {
Utilities.sleep(Settings.SENDING_CMD_SLEEP_IF_NOT_CONNECTED);
}
//Add the command again on errors
if(!result){
// Add the command again on errors
if (!result) {
addCommand(command);
}
}
//TODO: PONG from WiiU? Hey Quark ;)
// TODO: PONG from WiiU? Hey Quark ;)
private void sendPing(PingCommand command) {
if(sendTCP(Protocol.getRawPingDataToSend(command))){
if (sendTCP(Protocol.getRawPingDataToSend(command))) {
log.info("PING");
}else{
} else {
log.info("Sending the PING failed");
}
}
@ -174,9 +180,9 @@ public class NetworkManager implements Runnable{
byte[] sendData;
try {
sendData = Protocol.getRawDetachDataToSend(command);
if(sendTCP(sendData)){
if (sendTCP(sendData)) {
log.info("Success detach command for device (" + command.getSender() + ") sent!");
}else{
} else {
log.info("Sending the detach command for device (" + command.getSender() + ") failed. sendTCP failed");
return false;
}
@ -187,29 +193,29 @@ public class NetworkManager implements Runnable{
return true;
}
//TODO: Maybe move it into the Protocol class?
// TODO: Maybe move it into the Protocol class?
private boolean sendAttach(AttachCommand command) {
//Send the TCP command
// Send the TCP command
byte[] sendData = null;
try {
sendData = Protocol.getRawAttachDataToSend(command);
}catch (IOException e) {
} catch (IOException e) {
log.info("Building the attach command for device (" + command.getSender() + ") failed." + e.getMessage());
return false;
}
if(sendTCP(sendData)){
if (sendTCP(sendData)) {
byte configFound = 0;
try {
configFound = recvTCPByte();
} catch (IOException e1) {
e1.printStackTrace();
}
if(configFound == Protocol.TCP_CMD_ATTACH_CONFIG_FOUND){
//log.info("Config on the console found!");
}else if(configFound == Protocol.TCP_CMD_ATTACH_CONFIG_NOT_FOUND){
if (configFound == Protocol.TCP_CMD_ATTACH_CONFIG_FOUND) {
// log.info("Config on the console found!");
} else if (configFound == Protocol.TCP_CMD_ATTACH_CONFIG_NOT_FOUND) {
log.info("NO CONFIG FOUND.");
return false;
}else if (configFound == 0){
} else if (configFound == 0) {
log.info("Failed to get byte.");
disconnect();
return false;
@ -221,18 +227,18 @@ public class NetworkManager implements Runnable{
} catch (IOException e1) {
e1.printStackTrace();
}
if(userDataOkay == Protocol.TCP_CMD_ATTACH_USERDATA_OKAY){
//log.info("userdata okay!");
}else if(userDataOkay == Protocol.TCP_CMD_ATTACH_USERDATA_BAD){
if (userDataOkay == Protocol.TCP_CMD_ATTACH_USERDATA_OKAY) {
// log.info("userdata okay!");
} else if (userDataOkay == Protocol.TCP_CMD_ATTACH_USERDATA_BAD) {
log.info("USERDATA BAD.");
return false;
}else if (userDataOkay == 0){
} else if (userDataOkay == 0) {
log.info("Failed to get byte.");
disconnect();
return false;
}
//We receive our device slot and pad slot
// We receive our device slot and pad slot
short deviceslot = -1;
byte padslot = -1;
try {
@ -243,24 +249,24 @@ public class NetworkManager implements Runnable{
return false;
}
if(deviceslot < 0 || padslot < 0){
if (deviceslot < 0 || padslot < 0) {
log.info("Recieving data after sending a attach failed for device (" + command.getSender() + ") failed. We need to disconnect =(");
disconnect();
return false;
}
//Let's save them for later.
// Let's save them for later.
NetworkHIDDevice sender = command.getSender();
if(sender != null){
if (sender != null) {
sender.setDeviceslot(deviceslot);
sender.setPadslot(padslot);
}else{
} else {
log.info("Something really went wrong. Got an attach event with out an " + NetworkHIDDevice.class.getSimpleName());
return false;
}
log.info("Attaching done!");
return true;
}else{
} else {
log.info("Sending the attach command for device (" + command.getSender() + ") failed. sendTCP failed");
return false;
}
@ -270,8 +276,8 @@ public class NetworkManager implements Runnable{
byte[] rawCommand;
try {
rawCommand = Protocol.getRawReadDataToSend(readCommands);
if(sendUDP(rawCommand) == true){
System.out.println("UDP Packet sent: "+ Utilities.ByteArrayToString(rawCommand));
if (sendUDP(rawCommand) == true) {
System.out.println("UDP Packet sent: " + Utilities.ByteArrayToString(rawCommand));
}
} catch (IOException e) {
System.out.println("Sending read data failed.");
@ -280,7 +286,7 @@ public class NetworkManager implements Runnable{
private boolean sendUDP(byte[] rawCommand) {
boolean result = false;
if(udpClient != null && isConnected()){
if (udpClient != null && isConnected()) {
try {
udpClient.send(rawCommand);
result = true;
@ -294,7 +300,7 @@ public class NetworkManager implements Runnable{
private boolean sendTCP(byte[] rawCommand) {
boolean result = false;
if(tcpClient != null){
if (tcpClient != null) {
try {
tcpClient.send(rawCommand);
result = true;
@ -306,7 +312,7 @@ public class NetworkManager implements Runnable{
}
public void disconnect() {
//ControllerManager.deactivateAllAttachedControllers();
// ControllerManager.deactivateAllAttachedControllers();
tcpClient.abort();
}
@ -329,7 +335,7 @@ public class NetworkManager implements Runnable{
tcpClient.connect(ip);
System.out.println("TCP Connected!");
udpClient = UDPClient.createUDPClient(ip);
if(udpClient != null){
if (udpClient != null) {
result = true;
}
} catch (Exception e) {

32
src/net/ash/HIDToVPADNetworkClient/network/Protocol.java
View File

@ -44,42 +44,32 @@ public class Protocol {
public static final byte TCP_CMD_ATTACH = 0x01;
public static final byte TCP_CMD_DETACH = 0x02;
public static final byte TCP_CMD_PING = (byte)0xF0;
public static final byte TCP_CMD_PING = (byte) 0xF0;
public static final byte UDP_CMD_DATA = 0x03;
public static final byte TCP_CMD_ATTACH_CONFIG_FOUND = (byte) 0xE0;
public static final byte TCP_CMD_ATTACH_CONFIG_NOT_FOUND = (byte) 0xE1;
public static final byte TCP_CMD_ATTACH_USERDATA_OKAY = (byte) 0xE8;
public static final byte TCP_CMD_ATTACH_USERDATA_BAD = (byte) 0xE9;
private Protocol(){}
private Protocol() {
}
public enum HandshakeReturnCode {
BAD_HANDSHAKE,
SAME_CLIENT,
NEW_CLIENT
BAD_HANDSHAKE, SAME_CLIENT, NEW_CLIENT
}
public static byte[] getRawAttachDataToSend(AttachCommand command) throws IOException {
return ByteBuffer.allocate(9)
.put(Protocol.TCP_CMD_ATTACH)
.putInt(command.getHandle())
.putShort(command.getVid())
.putShort(command.getPid())
.array();
return ByteBuffer.allocate(9).put(Protocol.TCP_CMD_ATTACH).putInt(command.getHandle()).putShort(command.getVid()).putShort(command.getPid()).array();
}
public static byte[] getRawDetachDataToSend(DetachCommand command) throws IOException {
return ByteBuffer.allocate(5)
.put(Protocol.TCP_CMD_DETACH)
.putInt(command.getHandle())
.array();
return ByteBuffer.allocate(5).put(Protocol.TCP_CMD_DETACH).putInt(command.getHandle()).array();
}
public static byte[] getRawPingDataToSend(PingCommand command){
return new byte[]{Protocol.TCP_CMD_PING};
public static byte[] getRawPingDataToSend(PingCommand command) {
return new byte[] { Protocol.TCP_CMD_PING };
}
public static byte[] getRawReadDataToSend(List<ReadCommand> readCommands) throws IOException {
@ -88,15 +78,15 @@ public class Protocol {
dos.writeByte(Protocol.UDP_CMD_DATA);
dos.writeByte(readCommands.size());
for(ReadCommand command : readCommands){
for (ReadCommand command : readCommands) {
NetworkHIDDevice sender = command.getSender();
byte[] data = command.getData();
if(data.length > 0xFF){
if (data.length > 0xFF) {
log.info("Tried to send too much data. Maximum is 0xFF bytes read command.");
continue;
}
byte newLength = (byte)(data.length & 0xFF);
byte newLength = (byte) (data.length & 0xFF);
dos.writeInt(command.getHandle());
dos.writeShort(sender.getDeviceslot());

48
src/net/ash/HIDToVPADNetworkClient/network/TCPClient.java
View File

@ -44,8 +44,7 @@ public class TCPClient {
private DataOutputStream out;
@Getter private int clientID = HandleFoundry.next();
@Getter @Setter(AccessLevel.PRIVATE)
private int shouldRetry = Settings.MAXIMUM_TRIES_FOR_RECONNECTING;
@Getter @Setter(AccessLevel.PRIVATE) private int shouldRetry = Settings.MAXIMUM_TRIES_FOR_RECONNECTING;
private String ip;
@ -60,15 +59,17 @@ public class TCPClient {
out = new DataOutputStream(sock.getOutputStream());
HandshakeReturnCode resultHandshake = doHandshake();
if(resultHandshake == HandshakeReturnCode.BAD_HANDSHAKE){
if (resultHandshake == HandshakeReturnCode.BAD_HANDSHAKE) {
log.info("[TCP] Handshaking failed");
throw new Exception();
}else{
if(resultHandshake == HandshakeReturnCode.NEW_CLIENT && this.ip != null){
//We check the IP to be sure it's the first time we connect to a WiiU. //TODO: Sending a ID from the WiiU which will be compared?
//we are new to the client.
} else {
if (resultHandshake == HandshakeReturnCode.NEW_CLIENT && this.ip != null) {
// We check the IP to be sure it's the first time we connect to
// a WiiU. //TODO: Sending a ID from the WiiU which will be
// compared?
// we are new to the client.
ActiveControllerManager.getInstance().attachAllActiveControllers();
}else if(resultHandshake == HandshakeReturnCode.SAME_CLIENT){
} else if (resultHandshake == HandshakeReturnCode.SAME_CLIENT) {
}
this.ip = ip;
@ -77,39 +78,42 @@ public class TCPClient {
}
private synchronized HandshakeReturnCode doHandshake() throws Exception {
if (recvByte() != Protocol.TCP_HANDSHAKE) return HandshakeReturnCode.BAD_HANDSHAKE;
if (recvByte() != Protocol.TCP_HANDSHAKE)
return HandshakeReturnCode.BAD_HANDSHAKE;
send(clientID);
log.info("[TCP] Handshaking...");
HandshakeReturnCode test = (recvByte() == Protocol.TCP_NEW_CLIENT) ? HandshakeReturnCode.NEW_CLIENT : HandshakeReturnCode.SAME_CLIENT;
return test;
}
public synchronized boolean abort(){
public synchronized boolean abort() {
try {
shouldRetry = Settings.MAXIMUM_TRIES_FOR_RECONNECTING;
sock.close();
clientID = HandleFoundry.next();
} catch (IOException e) {
System.out.println(e.getMessage()); //TODO: handle
System.out.println(e.getMessage()); // TODO: handle
return false;
}
return true;
}
public synchronized void send(byte[] rawCommand) throws IOException {
try{
try {
out.write(rawCommand);
out.flush();
}catch(IOException e){
} catch (IOException e) {
try {
if(shouldRetry++ < Settings.MAXIMUM_TRIES_FOR_RECONNECTING){
if (shouldRetry++ < Settings.MAXIMUM_TRIES_FOR_RECONNECTING) {
System.out.println("Trying again to connect! Attempt number " + shouldRetry);
connect(ip); //TODO: this is for reconnecting when the WiiU switches the application. But this breaks disconnecting, woops.
}else{
connect(ip); // TODO: this is for reconnecting when the WiiU
// switches the application. But this breaks
// disconnecting, woops.
} else {
abort();
}
} catch (Exception e1) {
//e1.printStackTrace();
// e1.printStackTrace();
}
throw e;
}
@ -120,24 +124,24 @@ public class TCPClient {
}
public synchronized byte recvByte() throws IOException {
try{
try {
return in.readByte();
}catch(IOException e){
} catch (IOException e) {
System.out.println(e.getMessage());
throw e;
}
}
public synchronized short recvShort() throws IOException {
try{
try {
return in.readShort();
}catch(IOException e){
} catch (IOException e) {
System.out.println(e.getMessage());
throw e;
}
}
public synchronized boolean isConnected(){
public synchronized boolean isConnected() {
return (sock != null && sock.isConnected() && !sock.isClosed());
}

7
src/net/ash/HIDToVPADNetworkClient/network/UDPClient.java
View File

@ -32,16 +32,17 @@ public class UDPClient {
private final DatagramSocket sock;
private final InetAddress host;
private UDPClient(String ip) throws SocketException, UnknownHostException{
private UDPClient(String ip) throws SocketException, UnknownHostException {
sock = new DatagramSocket();
host = InetAddress.getByName(ip);
}
public static UDPClient createUDPClient(String ip){
public static UDPClient createUDPClient(String ip) {
UDPClient result = null;
try {
result = new UDPClient(ip);
} catch (Exception e) {
//handle?
// handle?
}
return result;
}

5
src/net/ash/HIDToVPADNetworkClient/network/commands/AttachCommand.java
View File

@ -20,6 +20,7 @@
* SOFTWARE.
*******************************************************************************/
package net.ash.HIDToVPADNetworkClient.network.commands;
import lombok.Getter;
import net.ash.HIDToVPADNetworkClient.network.NetworkHIDDevice;
@ -28,13 +29,13 @@ public class AttachCommand extends DeviceCommand {
@Getter private final short pid;
public AttachCommand(int hidHandle, short vid, short pid, NetworkHIDDevice sender) {
super(hidHandle,sender);
super(hidHandle, sender);
this.vid = vid;
this.pid = pid;
}
@Override
public String toString() {
return "AttachCommand [vid=" + vid + ", pid=" + pid+ ", handle=" + getHandle() + ", sender=" + getSender() + "]";
return "AttachCommand [vid=" + vid + ", pid=" + pid + ", handle=" + getHandle() + ", sender=" + getSender() + "]";
}
}

6
src/net/ash/HIDToVPADNetworkClient/network/commands/DetachCommand.java
View File

@ -23,9 +23,9 @@ package net.ash.HIDToVPADNetworkClient.network.commands;
import net.ash.HIDToVPADNetworkClient.network.NetworkHIDDevice;
public class DetachCommand extends DeviceCommand{
public DetachCommand(int hidHandle, NetworkHIDDevice sender){
super(hidHandle,sender);
public class DetachCommand extends DeviceCommand {
public DetachCommand(int hidHandle, NetworkHIDDevice sender) {
super(hidHandle, sender);
}
@Override

3
src/net/ash/HIDToVPADNetworkClient/network/commands/DeviceCommand.java
View File

@ -20,6 +20,7 @@
* SOFTWARE.
*******************************************************************************/
package net.ash.HIDToVPADNetworkClient.network.commands;
import lombok.Data;
import net.ash.HIDToVPADNetworkClient.network.NetworkHIDDevice;
@ -29,7 +30,7 @@ public abstract class DeviceCommand {
private final NetworkHIDDevice sender;
private final Class<? extends DeviceCommand> type;
protected DeviceCommand(int hidHandle,NetworkHIDDevice sender){
protected DeviceCommand(int hidHandle, NetworkHIDDevice sender) {
this.handle = hidHandle;
this.sender = sender;
this.type = this.getClass();

3
src/net/ash/HIDToVPADNetworkClient/network/commands/PingCommand.java
View File

@ -25,8 +25,9 @@ import net.ash.HIDToVPADNetworkClient.network.NetworkHIDDevice;
public class PingCommand extends DeviceCommand {
public PingCommand() {
this((short) 0,null);
this((short) 0, null);
}
private PingCommand(int hidHandle, NetworkHIDDevice sender) {
super(hidHandle, sender);
}

5
src/net/ash/HIDToVPADNetworkClient/network/commands/ReadCommand.java
View File

@ -24,9 +24,10 @@ package net.ash.HIDToVPADNetworkClient.network.commands;
import lombok.Getter;
import net.ash.HIDToVPADNetworkClient.network.NetworkHIDDevice;
public class ReadCommand extends DeviceCommand{
public class ReadCommand extends DeviceCommand {
@Getter private final byte[] data;
public ReadCommand(int hidHandle,byte[] data, NetworkHIDDevice sender) {
public ReadCommand(int hidHandle, byte[] data, NetworkHIDDevice sender) {
super(hidHandle, sender);
this.data = data;
}

6
src/net/ash/HIDToVPADNetworkClient/util/HandleFoundry.java
View File

@ -28,10 +28,12 @@ package net.ash.HIDToVPADNetworkClient.util;
import java.util.Random;
public class HandleFoundry {
//We start with a random value, so we have at each startup a different clientID!
// We start with a random value, so we have at each startup a different
// clientID!
private static int h = new Random().nextInt();
private HandleFoundry(){}
private HandleFoundry() {
}
public static int next() {
return h++;

13
src/net/ash/HIDToVPADNetworkClient/util/PureJavaHidApiManager.java
View File

@ -30,25 +30,28 @@ import purejavahidapi.PureJavaHidApi;
public class PureJavaHidApiManager {
private PureJavaHidApiManager(){}
private PureJavaHidApiManager() {
}
public static boolean MAC_OS_X;
/**
* Searches the corresponding HIDDevice for the given path
* @param path Path of the HIDDevice
*
* @param path
* Path of the HIDDevice
* @return It the device is found, it will be returned. Otherwise null is returned.
* @throws IOException
*/
public static HidDevice getDeviceByPath(String path) throws IOException{
public static HidDevice getDeviceByPath(String path) throws IOException {
List<HidDeviceInfo> devList = PureJavaHidApi.enumerateDevices();
for (HidDeviceInfo info : devList) {
if (MAC_OS_X) {
if(info.getPath().substring(0, 13).equals(path)){
if (info.getPath().substring(0, 13).equals(path)) {
return PureJavaHidApi.openDevice(info);
}
} else {
if(info.getPath().equals(path)){
if (info.getPath().equals(path)) {
return PureJavaHidApi.openDevice(info);
}
}

6
src/net/ash/HIDToVPADNetworkClient/util/Settings.java
View File

@ -46,10 +46,10 @@ public class Settings {
public static final int PING_INTERVAL = 1000;
public static final int PROCESS_CMD_INTERVAL = 10;
@Getter @Setter
private static String ipAddr = "192.168.0.35"; //@Maschell, you're welcome
@Getter @Setter private static String ipAddr = "192.168.0.35"; // @Maschell, you're welcome
private Settings() {}
private Settings() {
}
public static void loadSettings() {
File configDir = new File(getConfigDir());

34
src/net/ash/HIDToVPADNetworkClient/util/Utilities.java
View File

@ -21,13 +21,16 @@
*******************************************************************************/
package net.ash.HIDToVPADNetworkClient.util;
public class Utilities{
public class Utilities {
private Utilities(){}
private Utilities() {
}
/**
* Let me just sleep!
* @param ms sleep duration in ms
*
* @param ms
* sleep duration in ms
*/
public static void sleep(int ms) {
try {
@ -38,13 +41,16 @@ public class Utilities{
/**
* Convert a byte array to a formated String
* @param ba byte array
*
* @param ba
* byte array
* @return String representing the binary data
*/
public static String ByteArrayToString(byte[] ba){
if(ba == null) return null;
public static String ByteArrayToString(byte[] ba) {
if (ba == null)
return null;
StringBuilder hex = new StringBuilder(ba.length * 2);
for(byte b : ba){
for (byte b : ba) {
hex.append(String.format("%02X", b));
}
return hex.toString();
@ -52,19 +58,23 @@ public class Utilities{
/**
* Converts a signed short value to a unsigned byte
* @param value short value
*
* @param value
* short value
* @return converted value
*/
public static short signedShortToByte(int value){
return (short) (((((short)value) + Short.MAX_VALUE + 1) >> 8) & 0xFF);
public static short signedShortToByte(int value) {
return (short) (((((short) value) + Short.MAX_VALUE + 1) >> 8) & 0xFF);
}
/**
* Converts a signed short value to a unsigned byte
* @param value short value
*
* @param value
* short value
* @return converted value
*/
public static short signedShortToByte(short value){
public static short signedShortToByte(short value) {
return signedShortToByte((int) value);
}
}