Simulation handling

Author: ecmnet

MAVGCL/src/main/java/com/comino/flight/MainApp.java

@@ -327,8 +327,10 @@ else if(args.get("ip")!=null)
 
 			state.getConnectedProperty().addListener((e,o,n) -> {
 				if(n.booleanValue()) {
+				
 					//control.getStatusManager().reset();
-					wq.addSingleTask("LP",300, () -> {
+					wq.addSingleTask("LP",300, () -> {			
+						System.out.println("Is simulation: "+control.isSimulation());
 					//	control.getStatusManager().reset();
 						control.sendMAVLinkCmd(MAV_CMD.MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES, 1);
 						if(!control.getCurrentModel().sys.isStatus(Status.MSP_INAIR) && control.getCurrentModel().sys.isStatus(Status.MSP_ACTIVE)) {
@@ -352,8 +354,6 @@ else if(args.get("ip")!=null)
 			}
 
 
-
-
 			state.getLPOSAvailableProperty().addListener((v,o,n) -> {
 
 				// should check for homepos 

MAVGCL/src/main/java/com/comino/flight/observables/StateProperties.java

@@ -121,8 +121,6 @@ public static StateProperties getInstance(IMAVController control) {
 	private StateProperties(IMAVController control) {
 		this.control = control;
 		this.logger = MSPLogger.getInstance();
-
-		simulationProperty.set(control.isSimulation());
 
 		wq.addSingleTask("LP", 2000, () ->  isInitializedProperty.set(true) );
 

MAVGCL/src/main/java/com/comino/flight/ui/widgets/camera/CameraWidget.java

@@ -194,7 +194,7 @@ private void initialize() {
 		//		});
 
 		state.getRecordingProperty().addListener((o,ov,nv) -> {
-			if(!userPrefs.getBoolean(MAVPreferences.VIDREC, false) || !state.isAutoRecording().get() || state.getSimulationProperty().get())
+			if(!userPrefs.getBoolean(MAVPreferences.VIDREC, false) || !state.isAutoRecording().get() || control.isSimulation())
 				return;
 
 			if(nv.intValue()==AnalysisModelService.COLLECTING) {
@@ -264,7 +264,7 @@ protected void perform_action() {
 	private boolean connect() {
 		String url_string = null;
 
-		if(isConnected || state.getSimulationProperty().get())
+		if(isConnected)
 			return true;
 
 

MAVGCL/src/main/java/com/comino/video/src/impl/rtps/RTSPMjpegVideoSource.java

@@ -149,6 +149,7 @@ public void start() {
 		try {
 
 			RTSPsocket = new Socket(ServerIPAddr, ServerPort);
+			RTSPsocket.setSoTimeout(200);
 
 			try {
 				//construct a new DatagramSocket to receive RTP packets from the server, on port RTP_RCV_PORT

MAVGCL/src/main/java/com/comino/video/src/mp4/MP4Recorder.java

@@ -59,7 +59,7 @@ public MP4Recorder(String path, int width, int height) {
 				return;
 			try {
 				if(n.booleanValue()) {
-					System.out.println("MP4 recording started");
+					System.out.println("MP4 recording started - MP4");
 					encoder = new MSPSequenceEncoder(new File(path+"/video.mp4"));
 				}
 				else {