changed version: 0.8.1; changed limit axis Z VGR 950->1100; changed P…

…arkPos: SSC new pos, play sound if finished
fischertechnik · Nov 29, 2019 · 257d5f1 · 257d5f1
1 parent b7d93aa
commit 257d5f1
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/bin/TxtFactoryHBW_Debug b/bin/TxtFactoryHBW_Debug
diff --git a/bin/TxtFactoryMPO b/bin/TxtFactoryMPO
diff --git a/bin/TxtFactoryMPO_Debug b/bin/TxtFactoryMPO_Debug
diff --git a/bin/TxtFactoryMain.cloud b/bin/TxtFactoryMain.cloud
diff --git a/bin/TxtFactoryMain_Debug.cloud b/bin/TxtFactoryMain_Debug.cloud
diff --git a/bin/TxtFactorySLD b/bin/TxtFactorySLD
diff --git a/bin/TxtFactorySLD_Debug b/bin/TxtFactorySLD_Debug
diff --git a/bin/TxtFactoryVGR b/bin/TxtFactoryVGR
diff --git a/bin/TxtFactoryVGR_Debug b/bin/TxtFactoryVGR_Debug
diff --git a/bin/TxtParkPosHBW b/bin/TxtParkPosHBW
diff --git a/bin/TxtParkPosMPO b/bin/TxtParkPosMPO
diff --git a/bin/TxtParkPosSSC b/bin/TxtParkPosSSC
diff --git a/bin/TxtParkPosVGR b/bin/TxtParkPosVGR