X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.h;h=78b360018de17c245629059b789ab6be55c9ba4d;hb=c1f45677ffbe9ded079df99f998d8e2abfe548de;hp=d68a149a9275c957b5207e906d4f9586e3d63e9b;hpb=a44355019e5a27da0d5e5287aae74864e4122e1f;p=r2c2.git diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h index d68a149..78b3600 100644 --- a/source/libr2c2/arducontrol.h +++ b/source/libr2c2/arducontrol.h @@ -45,6 +45,7 @@ private: MFX_SEARCH = 0x23, MFX_ASSIGN_ADDRESS = 0x24, MFX_PING = 0x25, + MFX_READ = 0x26, MFX_SPEED = 0x28, MFX_SPEED_FUNCS8 = 0x29, MFX_SPEED_FUNCS16 = 0x2A, @@ -63,7 +64,8 @@ private: POWER_STATE = 0xC2, S88_DATA = 0xD0, MFX_SEARCH_FEEDBACK = 0xD1, - MFX_PING_FEEDBACK = 0xD2 + MFX_PING_FEEDBACK = 0xD2, + MFX_READ_FEEDBACK = 0xD3 }; struct Tag @@ -331,6 +333,13 @@ private: unsigned misses; Queue queue; + MfxInfo *pending_info; + unsigned read_array; + unsigned read_offset; + unsigned read_length; + char read_data[0x40]; + unsigned block_size; + public: MfxSearchTask(ArduControl &); @@ -437,6 +446,7 @@ public: virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &); private: MfxInfoArray::iterator add_mfx_info(const MfxInfo &); + MfxInfo *find_mfx_info(unsigned); public: virtual void remove_loco(unsigned); virtual void set_loco_speed(unsigned, unsigned);