fly/flightgear
1
0
Fork 0
Code Activity

Add an additional option. Work around an inconsistency in hardware design.

Browse source
This commit is contained in:
curt 2009-01-20 17:44:26 +00:00 • committed by Tim Moore
parent d95f541528
commit c76aca9a3d
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Network/ATC-Inputs.cxx
View file

@ -420,6 +420,7 @@ bool FGATCInput::do_analog_in() {
int min = 0; int min = 0;
int max = 1023; int max = 1023;
int deadband = 0; int deadband = 0;
int hysteresis = 0;
float offset = 0.0; float offset = 0.0;
float factor = 1.0; float factor = 1.0;
if ( cname == "channel" ) { if ( cname == "channel" ) {
@ -459,6 +460,10 @@ bool FGATCInput::do_analog_in() {
if ( prop != NULL ) { if ( prop != NULL ) {
deadband = prop->getIntValue(); deadband = prop->getIntValue();
} }
prop = child->getChild( "hysteresis" );
if ( prop != NULL ) {
hysteresis = prop->getIntValue();
}
prop = child->getChild( "offset" ); prop = child->getChild( "offset" );
if ( prop != NULL ) { if ( prop != NULL ) {
offset = prop->getFloatValue(); offset = prop->getFloatValue();
@ -483,6 +488,22 @@ bool FGATCInput::do_analog_in() {
{ {
// "Cook" the raw value // "Cook" the raw value
float scaled_value = 0.0f; float scaled_value = 0.0f;
if ( hysteresis > 0 ) {
int last_raw_value = 0;
prop = child->getChild( "last-raw-value", 0, true );
last_raw_value = prop->getIntValue();
if ( abs(raw_value - last_raw_value) < hysteresis )
{
// not enough movement stay put
raw_value = last_raw_value;
} else {
// update last raw value
prop->setIntValue( raw_value );
}
}
if ( center >= 0 ) { if ( center >= 0 ) {
scaled_value = scale( center, deadband, scaled_value = scale( center, deadband,
min, max, raw_value ); min, max, raw_value );
@ -638,9 +659,13 @@ static void update_switch_matrix(
unsigned char switches = switch_data[row]; unsigned char switches = switch_data[row];
for( int column = 0; column < ATC_NUM_COLS; ++column ) { for( int column = 0; column < ATC_NUM_COLS; ++column ) {
switch_matrix[board][column][row] = switches & 1; if ( row < 8 ) {
switches = switches >> 1; switch_matrix[board][column][row] = switches & 1;
} } else {
switch_matrix[board][row-8][8+column] = switches & 1;
}
switches = switches >> 1;
}
} }
} }