diff --git a/TxtFactoryClient/src/main.cpp b/TxtFactoryClient/src/main.cpp index 8367f1b..13e49ad 100644 --- a/TxtFactoryClient/src/main.cpp +++ b/TxtFactoryClient/src/main.cpp @@ -23,7 +23,7 @@ #include "spdlog/async.h" // Version info -#define VERSION_HEX ((0<<16)|(8<<8)|(0<<0)) +#define VERSION_HEX ((0<<16)|(8<<8)|(1<<0)) char TxtAppVer[32]; unsigned int DebugFlags; diff --git a/TxtFactoryMain/src/main.cpp b/TxtFactoryMain/src/main.cpp index e3c6841..dc0d155 100644 --- a/TxtFactoryMain/src/main.cpp +++ b/TxtFactoryMain/src/main.cpp @@ -40,7 +40,7 @@ std::string sts_vgr; std::string sts_sld; // Version info -#define VERSION_HEX ((0<<16)|(8<<8)|(0<<0)) +#define VERSION_HEX ((0<<16)|(8<<8)|(1<<0)) char TxtAppVer[32]; unsigned int DebugFlags; diff --git a/TxtParkPos/src/main.cpp b/TxtParkPos/src/main.cpp index 845ddc8..c803a86 100644 --- a/TxtParkPos/src/main.cpp +++ b/TxtParkPos/src/main.cpp @@ -10,6 +10,7 @@ #else #error Set CLIENT_XXX define first! #endif +#include "TxtSound.h" #include "KeLibTxtDl.h" // TXT Lib #include "FtShmem.h" // TXT Transfer Area @@ -27,7 +28,7 @@ unsigned int DebugFlags; FILE *DebugFile; // Version info -#define VERSION_HEX ((0<<16)|(2<<8)|(0<<0)) +#define VERSION_HEX ((0<<16)|(8<<8)|(1<<0)) char TxtAppVer[32]; FISH_X1_TRANSFER* pTArea = NULL; @@ -134,10 +135,12 @@ int main(int argc, char* argv[]) ft::TxtPanTiltUnit ptu(&T); ptu.init(); ptu.moveHome(); + ptu.movePanCenter(); + ptu.moveTiltPos(100); #else #error Set CLIENT_XXX define first! #endif - + ft::TxtSound::play(pTArea,1); } StopTxtDownloadProg(); } diff --git a/TxtSmartFactoryLib/doc/Doxyfile b/TxtSmartFactoryLib/doc/Doxyfile index 1d3e16c..42e5bdd 100644 --- a/TxtSmartFactoryLib/doc/Doxyfile +++ b/TxtSmartFactoryLib/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = TxtSmartFactoryLib # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.8.0 +PROJECT_NUMBER = 0.8.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/TxtSmartFactoryLib/include/TxtPanTiltUnit.h b/TxtSmartFactoryLib/include/TxtPanTiltUnit.h index 72099f2..f761a9c 100644 --- a/TxtSmartFactoryLib/include/TxtPanTiltUnit.h +++ b/TxtSmartFactoryLib/include/TxtPanTiltUnit.h @@ -134,6 +134,9 @@ class TxtPanTiltUnit : public SubjectObserver { void moveStepTiltUp(); void moveStepTiltDown(); + bool movePanPos(uint16_t pPan); + bool moveTiltPos(uint16_t pTilt); + protected: void configInputs(uint8_t ch); @@ -149,9 +152,6 @@ class TxtPanTiltUnit : public SubjectObserver { void moveTiltUp(uint16_t steps); void moveTiltDown(uint16_t steps); - bool movePanPos(uint16_t pPan); - bool moveTiltPos(uint16_t pTilt); - TxtTransfer* pT; bool stopAllReq; /* status */ diff --git a/TxtSmartFactoryLib/src/TxtVacuumGripperRobot.cpp b/TxtSmartFactoryLib/src/TxtVacuumGripperRobot.cpp index 17d43e3..6a16b90 100644 --- a/TxtSmartFactoryLib/src/TxtVacuumGripperRobot.cpp +++ b/TxtSmartFactoryLib/src/TxtVacuumGripperRobot.cpp @@ -19,7 +19,7 @@ TxtVacuumGripperRobot::TxtVacuumGripperRobot(TxtTransfer* pT, ft::TxtMqttFactory calibPos(VGRCALIB_DSI), calibColor(ft::WP_TYPE_NONE), axisX("VGR_X", pT, 0, 0, 1500), axisY("VGR_Y", pT, 1, 1, 900), - axisZ("VGR_Z", pT, 2, 2, 950), + axisZ("VGR_Z", pT, 2, 2, 1100), vgripper(pT, 6, 7), target(""), dps(pT, mqttclient), reqQuit(false), reqOrder(false), reqWP_order(), diff --git a/bin/TxtFactoryHBW b/bin/TxtFactoryHBW index 0e2e7c3..d42e6c4 100755 Binary files a/bin/TxtFactoryHBW and b/bin/TxtFactoryHBW differ diff --git a/bin/TxtFactoryHBW_Debug b/bin/TxtFactoryHBW_Debug new file mode 100755 index 0000000..d7d7c81 Binary files /dev/null and b/bin/TxtFactoryHBW_Debug differ diff --git a/bin/TxtFactoryMPO b/bin/TxtFactoryMPO index c22239b..a7935ce 100755 Binary files a/bin/TxtFactoryMPO and b/bin/TxtFactoryMPO differ diff --git a/bin/TxtFactoryMPO_Debug b/bin/TxtFactoryMPO_Debug new file mode 100755 index 0000000..eabc191 Binary files /dev/null and b/bin/TxtFactoryMPO_Debug differ diff --git a/bin/TxtFactoryMain.cloud b/bin/TxtFactoryMain.cloud index 54a8d5b..a7deda7 100755 Binary files a/bin/TxtFactoryMain.cloud and b/bin/TxtFactoryMain.cloud differ diff --git a/bin/TxtFactoryMain_Debug.cloud b/bin/TxtFactoryMain_Debug.cloud new file mode 100755 index 0000000..b4e13e7 Binary files /dev/null and b/bin/TxtFactoryMain_Debug.cloud differ diff --git a/bin/TxtFactorySLD b/bin/TxtFactorySLD index c327257..542bcb4 100755 Binary files a/bin/TxtFactorySLD and b/bin/TxtFactorySLD differ diff --git a/bin/TxtFactorySLD_Debug b/bin/TxtFactorySLD_Debug new file mode 100755 index 0000000..be5e5a7 Binary files /dev/null and b/bin/TxtFactorySLD_Debug differ diff --git a/bin/TxtFactoryVGR b/bin/TxtFactoryVGR index 234654f..cdb658f 100755 Binary files a/bin/TxtFactoryVGR and b/bin/TxtFactoryVGR differ diff --git a/bin/TxtFactoryVGR_Debug b/bin/TxtFactoryVGR_Debug new file mode 100755 index 0000000..b83cc93 Binary files /dev/null and b/bin/TxtFactoryVGR_Debug differ diff --git a/bin/TxtParkPosHBW b/bin/TxtParkPosHBW index 05acc3d..9bc2f6d 100755 Binary files a/bin/TxtParkPosHBW and b/bin/TxtParkPosHBW differ diff --git a/bin/TxtParkPosMPO b/bin/TxtParkPosMPO index df84e31..00556cd 100755 Binary files a/bin/TxtParkPosMPO and b/bin/TxtParkPosMPO differ diff --git a/bin/TxtParkPosSSC b/bin/TxtParkPosSSC index 25156d2..d15d17b 100755 Binary files a/bin/TxtParkPosSSC and b/bin/TxtParkPosSSC differ diff --git a/bin/TxtParkPosVGR b/bin/TxtParkPosVGR index 05ff2f3..fd1d17f 100755 Binary files a/bin/TxtParkPosVGR and b/bin/TxtParkPosVGR differ