1. Fixed bug with 'too many files'

2. Changed handling of deframer options
3. Fixed 'command_handler.py' script
4. Temporarily removed rotctl_stop()

Author: stanislav-leanspace

command_handler.py

@@ -53,7 +53,7 @@ def send_email_notification(auth_file, attachments=[]):
     msg["From"] = client_login
     msg["Subject"] = subject
 
-    body = "Hi there, sending this email from Python!"
+    body = "Hi there, please find the results for another satellite!"
     msg.attach(MIMEText(body, "plain"))
 
     for f in attachments or []:
@@ -142,10 +142,10 @@ def action_pre_doit(args):
 def action_post_doit(args):
     print('== post doit ==')
     today = date.today()
-    files = glob.glob('*.dat')
+    files = glob.glob('*GMT.dat')
     send_email_notification('/etc/gsc/email.cfg', files)
-    os.system('mv -vf *.dat ' + RESULTS_PREFIX + str(today) + '/')
-    os.system('mv -vf *.raw ' + RESULTS_PREFIX + str(today) + '/')
+    os.system('mv -vf *GMT.dat ' + RESULTS_PREFIX + str(today) + '/')
+    os.system('mv -vf *GMT.raw ' + RESULTS_PREFIX + str(today) + '/')
     return
 
 actions = {

src/ev.c

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <strings.h>
+#include <errno.h>
 #include <json-c/json.h>
 
 #include "ev.h"
@@ -71,6 +72,7 @@ void _ev_read_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
 		ev_handler.buf_idx = 0;
 		ev_handler.cont_length = 0;
 		ev_io_stop(ev_handler.loop, watcher);
+		close(watcher->fd);
 		free(watcher);
 		return;
 	}
@@ -166,7 +168,7 @@ void _ev_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
 {
 	struct sockaddr_in client_addr;
 	socklen_t client_len = sizeof(client_addr);
-	struct ev_io *w_client = (struct ev_io*) malloc(sizeof(struct ev_io));
+	struct ev_io *w_client = (struct ev_io *) malloc(sizeof(struct ev_io));
 
 	if (EV_ERROR & revents) {
 		LOG_I("got invalid event");
@@ -175,7 +177,7 @@ void _ev_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
 
 	ev_handler.client_sd = accept(watcher->fd, (struct sockaddr *)&client_addr, &client_len);
 	if (ev_handler.client_sd < 0) {
-		LOG_E("accept error");
+		LOG_E("accept error, %s", strerror(errno));
 		return;
 	}
 	/* fcntl(ev_handler.client_sd, F_SETFL, O_NONBLOCK); */

src/gnuradio.c

@@ -66,11 +66,11 @@ int sdr_prepare_config(cfg_t *cfg, satellite_t *sat, const char *filename)
 	snprintf(cfg_line, sizeof(cfg_line), 	"[main]\n"
 			"main_LPF_Cutoff_Freq=%d\n"
 			"main_Network_Stream_Address=%s\n"
-			"main_Network_Stream_Port=%s\n"
+			"main_Network_Stream_Port=%d\n"
 			"main_Result_File_Prefix=%s\n",
 			sat->bandwidth,
-			DEF_CONF_NETWORK_STREAM_ADDR,
-			DEF_CONF_NETWORK_STREAM_PORT,
+			sat->network_addr,
+			sat->network_port,
 			filename);
 
 	fwrite(cfg_line, strlen(cfg_line), 1, fd);
@@ -83,34 +83,35 @@ int sdr_prepare_config(cfg_t *cfg, satellite_t *sat, const char *filename)
 
 	fwrite(cfg_line, strlen(cfg_line), 1, fd);
 
+	snprintf(cfg_line, sizeof(cfg_line), "modulation_Short_Frames=%d\n"
+										 "modulation_G3RUH=%d\n"
+										 "modulation_CRC16=%d\n",
+			sat->shortFrames,
+			sat->g3ruh,
+			sat->crc16);
+
+	fwrite(cfg_line, strlen(cfg_line), 1, fd);
+
 	switch (sat->modulation) {
 		case MODULATION_BPSK:
 			snprintf(cfg_line, sizeof(cfg_line), "modulation_BPSK_Manchester=%d\n"
-					"modulation_BPSK_Differential=%d\n"
-					"modulation_BPSK_Short_Preamb=%d\n"
-					"modulation_BPSK_CRC16=%d\n",
+					"modulation_BPSK_Differential=%d\n",
 					sat->bpskManchester,
-					sat->bpskDifferential,
-					sat->bpskShort,
-					sat->bpskCRC16);
+					sat->bpskDifferential);
 
 			fwrite(cfg_line, strlen(cfg_line), 1, fd);
 			break;
 		case MODULATION_AFSK:
 			snprintf(cfg_line, sizeof(cfg_line), "modulation_AFSK_Audio_Carrier_Freq=%d\n"
-					"modulation_AFSK_Deviation=%d\n"
-					"modulation_G3RUH=%d\n",
+					"modulation_AFSK_Deviation=%d\n",
 					sat->afskAFC,
-					sat->afskDeviation,
-					sat->afskG3RUH);
+					sat->afskDeviation);
 
 			fwrite(cfg_line, strlen(cfg_line), 1, fd);
 			break;
 		case MODULATION_FSK:
-			snprintf(cfg_line, sizeof(cfg_line), "modulation_FSK_Sub_Audio=%d\n"
-					"modulation_G3RUH=%d\n",
-					sat->fskSubAudio,
-					sat->fskG3RUH);
+			snprintf(cfg_line, sizeof(cfg_line), "modulation_FSK_Sub_Audio=%d\n",
+					sat->fskSubAudio);
 
 			fwrite(cfg_line, strlen(cfg_line), 1, fd);
 			break;

src/rest_api.c

@@ -374,6 +374,23 @@ static int rest_api_set_observation(char *payload, char **reply_buf, const char
 				goto out;
 			}
 
+			sat->network_addr = strdup(json_get_string_by_key(jsatellitePart, "network_addr"));
+			if (!sat->network_addr) {
+				*error = "'/observation/satellite/network_addr' string is not specified!";
+				ret = -1;
+				goto out;
+			}
+
+			LOG_V("Network stream address: [ %s ]", sat->network_addr);
+
+			if (!json_get_int_by_key(jsatellitePart, "network_port", &sat->network_port)) {
+				*error = "'/observation/satellite/network_port' not specified";
+				ret = -1;
+				goto out;
+			}
+
+			LOG_V("Network stream port: [ %d ]", sat->network_port);
+
 			if (!json_get_int_by_key(jsatellitePart, "baud_rate", &sat->baudRate)) {
 				*error = "'/observation/satellite/baud_rate' not specified";
 				ret = -1;
@@ -390,6 +407,39 @@ static int rest_api_set_observation(char *payload, char **reply_buf, const char
 
 			LOG_V("Bandwidth: [ %d ]", sat->bandwidth);
 
+			/** optional */
+			json_object_object_get_ex(jsatellitePart, "short_frames", &valObj);
+
+			if (json_object_get_type(valObj) == json_type_boolean) {
+				sat->shortFrames = json_object_get_boolean(valObj);
+			} else {
+				sat->shortFrames = false;
+			}
+
+			LOG_V("Short Frames: [ %d ]", !!sat->shortFrames);
+
+			/** optional */
+			json_object_object_get_ex(jsatellitePart, "crc16", &valObj);
+
+			if (json_object_get_type(valObj) == json_type_boolean) {
+				sat->crc16 = json_object_get_boolean(valObj);
+			} else {
+				sat->crc16 = false;
+			}
+
+			LOG_V("CRC16: [ %d ]", !!sat->crc16);
+
+			/** optional */
+			json_object_object_get_ex(jsatellitePart, "g3ruh", &valObj);
+
+			if (json_object_get_type(valObj) == json_type_boolean) {
+				sat->g3ruh = json_object_get_boolean(valObj);
+			} else {
+				sat->g3ruh = false;
+			}
+
+			LOG_V("G3RUH: [ %d ]", !!sat->g3ruh);
+
 			if (streq(satModulation, "bpsk")) {
 				sat->modulation = MODULATION_BPSK;
 				if (!json_object_object_get_ex(jsatellitePart, "bpsk_manchester", &valObj)) {
@@ -424,38 +474,6 @@ static int rest_api_set_observation(char *payload, char **reply_buf, const char
 
 				LOG_V("BPSK Differential: [ %d ]", !!sat->bpskDifferential);
 
-				if (!json_object_object_get_ex(jsatellitePart, "bpsk_short_preamble", &valObj)) {
-					*error = "'/observation/satellite/bpsk_short_preamble' object is missing";
-					ret = -1;
-					goto out;
-				}
-
-				if (json_object_get_type(valObj) == json_type_boolean) {
-					sat->bpskShort = json_object_get_boolean(valObj);
-				} else {
-					*error = "'/observation/satellite/bpsk_short_preamble' isn't boolean";
-					ret = -1;
-					goto out;
-				}
-
-				LOG_V("BPSK Short Preamble: [ %d ]", !!sat->bpskShort);
-
-				if (!json_object_object_get_ex(jsatellitePart, "bpsk_crc16", &valObj)) {
-					*error = "'/observation/satellite/bpsk_crc16' object is missing";
-					ret = -1;
-					goto out;
-				}
-
-				if (json_object_get_type(valObj) == json_type_boolean) {
-					sat->bpskCRC16 = json_object_get_boolean(valObj);
-				} else {
-					*error = "'/observation/satellite/bpsk_crc16' isn't boolean";
-					ret = -1;
-					goto out;
-				}
-
-				LOG_V("BPSK CRC16: [ %d ]", !!sat->bpskCRC16);
-
 			} else if (streq(satModulation, "afsk")) {
 				sat->modulation = MODULATION_AFSK;
 				if (!json_get_int_by_key(jsatellitePart, "afsk_audio_freq_carrier", &sat->afskAFC)) {
@@ -474,22 +492,6 @@ static int rest_api_set_observation(char *payload, char **reply_buf, const char
 
 				LOG_V("AFSK Deviation: [ %d ]", sat->afskDeviation);
 
-				if (!json_object_object_get_ex(jsatellitePart, "afsk_g3ruh", &valObj)) {
-					*error = "'/observation/satellite/afsk_g3ruh' object is missing";
-					ret = -1;
-					goto out;
-				}
-
-				if (json_object_get_type(valObj) == json_type_boolean) {
-					sat->afskG3RUH = json_object_get_boolean(valObj);
-				} else {
-					*error = "'/observation/satellite/afsk_g3ruh' isn't boolean";
-					ret = -1;
-					goto out;
-				}
-
-				LOG_V("FSK G3RUH: [ %d ]", !!sat->afskG3RUH);
-
 			} else if (streq(satModulation, "fsk")) {
 				sat->modulation = MODULATION_FSK;
 
@@ -508,22 +510,6 @@ static int rest_api_set_observation(char *payload, char **reply_buf, const char
 				}
 
 				LOG_V("FSK subaudio: [ %d ]", !!sat->fskSubAudio);
-
-				if (!json_object_object_get_ex(jsatellitePart, "fsk_g3ruh", &valObj)) {
-					*error = "'/observation/satellite/fsk_g3ruh' object is missing";
-					ret = -1;
-					goto out;
-				}
-
-				if (json_object_get_type(valObj) == json_type_boolean) {
-					sat->fskG3RUH = json_object_get_boolean(valObj);
-				} else {
-					*error = "'/observation/satellite/fsk_g3ruh' isn't boolean";
-					ret = -1;
-					goto out;
-				}
-
-				LOG_V("FSK G3RUH: [ %d ]", !!sat->fskG3RUH);
 			}
 			else {
 				*error = "'/observation/satellite/modulation' only 'bpsk', 'fsk' and 'afsk' are supported";

src/rotctl.c

@@ -105,8 +105,10 @@ int rotctl_stop(observation_t *obs)
 
 	write(obs->cfg->cli.azimuth_conn_fd, buf, strlen(buf));
 	read(obs->cfg->cli.azimuth_conn_fd, rxbuf, sizeof(rxbuf));
+	/* LOG_I("rxbuf1=%s", rxbuf); */
 	write(obs->cfg->cli.elevation_conn_fd, buf, strlen(buf));
 	read(obs->cfg->cli.elevation_conn_fd, rxbuf, sizeof(rxbuf));
+	/* LOG_I("rxbuf2=%s", rxbuf); */
 
 	LOG_V("rotctl_stop() command done");
 	return ret;

src/sat.c

@@ -339,6 +339,8 @@ static void *sat_scheduler(void *opt)
 
 				if (sat->next_aos > 0) {
 					if ((current_time > (sat->next_aos - 300)) && sat->parked == false) {
+						/* rotctl_stop(obs); */
+
 						if (obs->cfg->calibrate && stats->satellites_tracked % obs->cfg->calibrate == 0) {
 							LOG_I("Performing the complete calibration");
 							rotctl_calibrate(obs, true, true);
@@ -347,7 +349,6 @@ static void *sat_scheduler(void *opt)
 
 						LOG_I("Parking antenna for the reception of %s", sat->name);
 						LOG_V("curr time = %ld, aos time = %ld", current_time, sat->next_aos);
-						rotctl_stop(obs);
 						if (!sat->zero_transition)
 							rotctl_send_and_wait(obs, sat->aos_az, 0);
 						else
@@ -405,6 +406,14 @@ static void *sat_scheduler(void *opt)
 					LOG_E("Couldn't stop SDR");
 				}
 
+				if (obs->active->frequency > LOW_VHF_BAND &&
+						obs->active->frequency < HIGH_VHF_BAND) {
+					stats->satellites_vhf++;
+				} else if (obs->active->frequency > LOW_UHF_BAND &&
+						obs->active->frequency < HIGH_UHF_BAND) {
+					stats->satellites_uhf++;
+				}
+
 				if ((post_doit(obs)) == -1) {
 					LOG_E("Error on post-do-it");
 				}
@@ -612,14 +621,6 @@ int sat_predict(satellite_t *sat)
 		}
 	}
 
-	if (sat->frequency > LOW_VHF_BAND &&
-			sat->frequency < HIGH_VHF_BAND) {
-		stats->satellites_vhf++;
-	} else if (sat->frequency > LOW_UHF_BAND &&
-			sat->frequency < HIGH_UHF_BAND) {
-		stats->satellites_uhf++;
-	}
-
 	return ret;
 }
 
@@ -704,6 +705,7 @@ static int sat_clear_all(observation_t *obs)
 	while (!LIST_EMPTY(&obs->satellites_list)) {
 		sat = LIST_FIRST(&obs->satellites_list);
 		predict_destroy_orbital_elements(sat->orbital_elements);
+		free((void *) sat->network_addr);
 		LIST_REMOVE(sat, entries);
 		free(sat);
 	}

src/sat.h

@@ -50,20 +50,27 @@ typedef struct satellite_t {
 
 	/** modulation */
   	modulation_t modulation;
+	const char *network_addr;
+	int network_port;
 	int baudRate;
 
 	/** bpsk */
 	bool bpskManchester;
 	bool bpskDifferential;
-	bool bpskShort;
-	bool bpskCRC16;
+
 	/** afsk */
 	int afskDeviation;
-	bool afskG3RUH;
 	int afskAFC; /** audio frequency carrier */
+
 	/** fsk */
 	bool fskSubAudio;
-	bool fskG3RUH;
+
+	/** deframing */
+	/** TODO: implement */
+	int syncword_threshold;
+	bool shortFrames;
+	bool g3ruh;
+	bool crc16;
 
 	double min_elevation;
 	double max_elevation;