Changeset 20689

Show
Ignore:
Timestamp:
08/10/07 22:06:43 (9 months ago)
Author:
patrick
Message:

MFT r20685, r20688: Derive from a known gadget::InputMixer<S,T> instantiation.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveWrapper.h

    r19958 r20689  
    3737#include <gadget/Type/Digital.h> 
    3838#include <gadget/Type/InputMixer.h> 
     39#include <gadget/Type/InputBaseTypes.h> 
    3940#include <drivers/EssentialReality/P5Glove/P5GloveStandalone.h> 
    4041 
     
    4647 * Software interface to EssentialReality P5glove hardware. 
    4748 */ 
    48 class P5GloveWrapper : 
    49    public InputMixer<InputMixer<InputMixer<Input, Digital>, Analog>, Position> 
     49class P5GloveWrapper 
     50   : public input_glove_digital_analog_position_t 
    5051{ 
    5152public: 
  • juggler/branches/2.2/modules/gadgeteer/gadget/Type/BaseTypeFactory.cpp

    r20602 r20689  
    9898   REGISTER_CONSTRUCTOR_TYPE(input_analog_position_t); 
    9999   REGISTER_CONSTRUCTOR_TYPE(input_glove_digital_t); 
     100   REGISTER_CONSTRUCTOR_TYPE(input_glove_digital_analog_position_t); 
    100101   REGISTER_CONSTRUCTOR_TYPE(input_digital_analog_position_t); 
    101102   REGISTER_CONSTRUCTOR_TYPE(siminput_input_position); 
  • juggler/branches/2.2/modules/gadgeteer/gadget/Type/InputBaseTypes.h

    r20602 r20689  
    7171typedef InputMixer< InputMixer<Input, Analog>, Position> input_analog_position_t; 
    7272typedef InputMixer< InputMixer<Input, Glove>, Digital> input_glove_digital_t; 
     73typedef InputMixer< InputMixer< InputMixer< InputMixer<Input, Glove>, Digital>, Analog>, Position> input_glove_digital_analog_position_t; 
    7374typedef InputMixer< InputMixer< InputMixer<Input, Digital>, Analog>, Position> input_digital_analog_position_t; 
    7475typedef InputMixer< InputMixer<SimInput, Input>, Position> siminput_input_position;