WebSVN – tpanel – Diff – /trunk/tamxnet.h

 #define NSTATE_OFFLINE      0
 #define NSTATE_ONLINE       6
 #define NSTATE_CONNECTING   9
+#define WAIT_RESET          3   // Number of seconds to wait in case of connecting to another controller
+#define WAIT_RECONNECT      15  // Number of seconds to wait in case of reconnecting to the same controller
     typedef struct ANET_SEND
+    {
         uint16_t device{0};     // Device ID of panel
         uint16_t MC{0};         // message command number
         uint16_t port{0};       // port number
             explicit TAmxNet(const std::string& sn, const std::string& nm);
             ~TAmxNet();
             void Run();
             void stop(bool soft=false);
+            bool reconnect();
             void setCallback(std::function<void(const ANET_COMMAND&)> func) { callback = func; }
             void registerNetworkState(std::function<void(int)> registerNetwork, ulong handle);
             void registerTimer(std::function<void(const ANET_BLINK&)> registerBlink, ulong handle);
             void deregNetworkState(ulong handle);
             void setPanelID(int id) { panelID = id; }
             void setSerialNum(const std::string& sn);
             bool setupStatus() { return receiveSetup; }
             void setPanName(const std::string& nm) { panName.assign(nm); }
+            void setWaitTime(int secs);
+            int getWaitTime() { return mWaitTime; }
+            int swapWaitTime();
         protected:
             void start();
         private:
             enum R_TOKEN
             void sendAllFuncTimer(const ANET_BLINK& blink);
             std::function<void(const ANET_COMMAND&)> callback;
             std::function<bool(TAmxNet *)> cbWebConn;
-            std::atomic<bool> stopped_{false};
-            std::atomic<bool> mSendReady{false};
             TSocket *mSocket{nullptr};  // Pointer to socket class needed for communication
+            FILE *rcvFile{nullptr};
+            FILE *sndFile{nullptr};
+            size_t posRcv{0};
+            size_t lenRcv{0};
+            size_t posSnd{0};
+            size_t lenSnd{0};
+            std::thread mThread;
             std::string input_buffer_;
-            char buff_[BUF_SIZE];       // Internal used buffer for network communication
             std::string panName;        // The technical name of the panel
-            bool protError{false};      // true = error on receive --> disconnect
-//            std::atomic<int> reconCounter{0};   // Reconnect counter
-            uint16_t reqDevStatus{0};
-            ANET_COMMAND comm;          // received command
-            ANET_COMMAND mSend;          // answer / request
-            uint16_t sendCounter{0};    // Counter increment on every send
             std::vector<ANET_COMMAND> comStack; // commands to answer
-            bool initSend{false};       // TRUE = all init messages are send.
-            bool ready{false};          // TRUE = ready for communication
-            bool write_busy{false};
             std::vector<DEVICE_INFO> devInfo;
             std::string oldCmd;
-            int panelID{0};             // Panel ID of currently legalized panel.
             std::string serNum;
-            std::atomic<bool> receiveSetup{false};
             std::string sndFileName;
             std::string rcvFileName;
+            ANET_COMMAND comm;          // received command
+            ANET_COMMAND mSend;         // answer / request
+            int panelID{0};             // Panel ID of currently legalized panel.
+            int mWaitTime{3};           // [seconds]: Wait by default for 3 seconds
+            int mOldWaitTime{3};        // [seconds]: The previous wait time in case of change
-            FILE *rcvFile{nullptr};
+            FTRANSFER ftransfer;
+            uint16_t reqDevStatus{0};
+            uint16_t sendCounter{0};    // Counter increment on every send
+            std::atomic<bool> stopped_{false};
+            std::atomic<bool> mSendReady{false};
+            bool protError{false};      // true = error on receive --> disconnect
+            bool initSend{false};       // TRUE = all init messages are send.
+            bool ready{false};          // TRUE = ready for communication
-            FILE *sndFile{nullptr};
+            bool write_busy{false};
+            std::atomic<bool> receiveSetup{false};
             bool isOpenSnd{false};
             bool isOpenRcv{false};
-            size_t posRcv{0};
-            size_t lenRcv{0};
-            size_t posSnd{0};
-            size_t lenSnd{0};
-            FTRANSFER ftransfer;
             bool _retry{false};
-            std::thread mThread;
+            char buff_[BUF_SIZE];       // Internal used buffer for network communication
     };
+}
 #endif

Subversion Repositories tpanel

(root)/trunk/tamxnet.h @ 110 – Rev 92 → 93