From a60885f2eda5765083751f5e1cc72deaf9c0c52b Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:21:56 +0000
Subject: [PATCH 01/11] Unify radio API

Radio API should not depend on the name
Remove further occurrence of SatPC32 and CloudlogCatQt
---
 application/models/Cat.php                    | 175 ++++++------------
 application/views/dashboard/index.php         |   2 +-
 application/views/interface_assets/footer.php |   8 +-
 3 files changed, 59 insertions(+), 126 deletions(-)

diff --git a/application/models/Cat.php b/application/models/Cat.php
index 815f7a1c..77b0692d 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -10,132 +10,42 @@
 				$timestamp = gmdate("Y-m-d H:i:s");
 			}
 
+			if (isset($result['prop_mode'])) {
+				$prop_mode = $result['prop_mode'];
+			} else {
+				// For backward compatibility, SatPC32 does not set propergation mode
+				if (isset($result['sat_name'])) {
+					$prop_mode = "SAT";
+				} else {
+					$prop_mode = NULL;
+				}
+			}
+
 			$this->db->where('radio', $result['radio']);
 			$this->db->where('user_id', $user_id);
 			$query = $this->db->get('cat');
 
 			if ($query->num_rows() > 0)
 			{
-				if($result['radio'] == "SatPC32") {
-					// Update the record
-					foreach ($query->result() as $row)
-					{
-						$radio_id = $row->id;
+				// Update the record
+				foreach ($query->result() as $row)
+				{
+					$radio_id = $row->id;
 
+					if ($prop_mode == "SAT") {
 						$data = array(
+							'prop_mode' => $prop_mode,
 							'sat_name' => $result['sat_name'],
 							'downlink_freq' => $result['downlink_freq'],
 							'uplink_freq' => $result['uplink_freq'],
 							'downlink_mode' => $result['downlink_mode'],
 							'uplink_mode' => $result['uplink_mode'],
-							'prop_mode' => 'SAT',
 							'timestamp' => $timestamp,
-						);
-
-						$this->db->where('id', $radio_id);
-						$this->db->where('user_id', $user_id);
-						$this->db->update('cat', $data);
-					}
-				} else if($result['radio'] == "CloudLogCATQt") {
-					// Update the record
-					foreach ($query->result() as $row)
-					{
-						$radio_id = $row->id;
-
-						if ($result['prop_mode'] == "SAT") {
-							$data = array(
-								'sat_name' => $result['sat_name'],
-								'prop_mode' => $result['prop_mode'],
-								'mode' => NULL,
-								'frequency' => NULL,
-								'downlink_freq' => $result['downlink_freq'],
-								'uplink_freq' => $result['uplink_freq'],
-								'downlink_mode' => $result['downlink_mode'],
-								'uplink_mode' => $result['uplink_mode'],
-								'timestamp' => $timestamp,
-							);
-							if (isset($result['power'])) {
-								$data['power'] = $result['power'];
-							}
-						} else {
-							$data = array(
-								'prop_mode' => $result['prop_mode'],
-								'mode' => $result['mode'],
-								'frequency' => $result['frequency'],
-								'downlink_freq' => NULL,
-								'downlink_mode' => NULL,
-								'uplink_freq' => NULL,
-								'uplink_mode' => NULL,
-								'timestamp' => $timestamp,
-							);
-							if (isset($result['power'])) {
-								$data['power'] = $result['power'];
-							}
-						}
-
-						$this->db->where('id', $radio_id);
-						$this->db->where('user_id', $user_id);
-						$this->db->update('cat', $data);
-					}
-				} else {
-					// Update the record
-					foreach ($query->result() as $row)
-					{
-						$radio_id = $row->id;
-
-						$data = array(
-						'frequency' => $result['frequency'],
-						'mode' => $result['mode'],
-						'timestamp' => $timestamp,
-						);
-
-						if (isset($result['power'])) {
-							$data['power'] = $result['power'];
-						}
-
-						$this->db->where('id', $radio_id);
-						$this->db->where('user_id', $user_id);
-						$this->db->update('cat', $data);
-					}
-				}
-			} else {
-				// Add a new record
-
-				if($result['radio'] == "SatPC32") {
-					$data = array(
-						'radio' => $result['radio'],
-						'frequency' => $result['frequency'],
-						'mode' => $result['mode'],
-						'sat_name' => $result['sat_name'],
-						'downlink_freq' => $result['downlink_freq'],
-						'uplink_freq' => $result['uplink_freq'],
-						'downlink_mode' => $result['downlink_mode'],
-						'uplink_mode' => $result['uplink_mode'],
-						'prop_mode' => 'SAT',
-						'user_id' => $user_id,
-						'timestamp' => $timestamp,
-					);
-				} else if($result['radio'] == "CloudLogCATQt") {
-					if ($result['prop_mode'] == "SAT") {
-						$data = array(
-							'radio' => $result['radio'],
-							'sat_name' => $result['sat_name'],
-							'prop_mode' => $result['prop_mode'],
 							'mode' => NULL,
 							'frequency' => NULL,
-							'downlink_freq' => $result['downlink_freq'],
-							'uplink_freq' => $result['uplink_freq'],
-							'downlink_mode' => $result['downlink_mode'],
-							'uplink_mode' => $result['uplink_mode'],
-							'user_id' => $user_id,
-							'timestamp' => $timestamp,
 						);
-						if (isset($result['power'])) {
-							$data['power'] = $result['power'];
-						}
 					} else {
 						$data = array(
-							'radio' => $result['radio'],
 							'prop_mode' => $result['prop_mode'],
 							'mode' => $result['mode'],
 							'frequency' => $result['frequency'],
@@ -143,25 +53,52 @@
 							'downlink_mode' => NULL,
 							'uplink_freq' => NULL,
 							'uplink_mode' => NULL,
-							'user_id' => $user_id,
 							'timestamp' => $timestamp,
 						);
-						if (isset($result['power'])) {
-							$data['power'] = $result['power'];
-						}
 					}
-				} else {
-					$data = array(
-						'radio' => $result['radio'],
-						'frequency' => $result['frequency'],
-						'mode' => $result['mode'],
-						'timestamp' => $timestamp,
-						'user_id' => $user_id,
-					);
 
 					if (isset($result['power'])) {
 						$data['power'] = $result['power'];
 					}
+
+					$this->db->where('id', $radio_id);
+					$this->db->where('user_id', $user_id);
+					$this->db->update('cat', $data);
+				}
+			} else {
+				// Add a new record
+
+				if ($prop_mode == "SAT") {
+					$data = array(
+						'radio' => $result['radio'],
+						'frequency' => NULL,
+						'mode' => NULL,
+						'sat_name' => $result['sat_name'],
+						'downlink_freq' => $result['downlink_freq'],
+						'uplink_freq' => $result['uplink_freq'],
+						'downlink_mode' => $result['downlink_mode'],
+						'uplink_mode' => $result['uplink_mode'],
+						'prop_mode' => $prop_mode,
+						'user_id' => $user_id,
+						'timestamp' => $timestamp,
+					);
+				} else {
+					$data = array(
+						'radio' => $result['radio'],
+						'prop_mode' => $prop_mode,
+						'mode' => $result['mode'],
+						'frequency' => $result['frequency'],
+						'downlink_freq' => NULL,
+						'downlink_mode' => NULL,
+						'uplink_freq' => NULL,
+						'uplink_mode' => NULL,
+						'user_id' => $user_id,
+						'timestamp' => $timestamp,
+					);
+				}
+
+				if (isset($result['power'])) {
+					$data['power'] = $result['power'];
 				}
 
 				$this->db->insert('cat', $data);
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 205bf042..28b0a24e 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -143,7 +143,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 					<tr>
 						<td><?php echo $row['radio']; ?></td>
 						<td>
-							<?php if($row['radio'] == "SatPC32" || $row['radio'] == "CloudLogCATQt") { ?>
+							<?php if($row['prop_mode'] == 'SAT') { ?>
 								<?php echo $row['sat_name']; ?>
 							<?php } else { ?>
 								<?php echo $this->frequency->hz_to_mhz($row['frequency']); ?> (<?php echo $row['mode']; ?>)
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 2eff6f66..35ecf420 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1209,21 +1209,17 @@ $(document).on('keypress',function(e) {
   // If a radios selected from drop down select radio update.
   $('.radios').change(updateFromCAT);
 
-  // If radio isn't SatPC32 or CloudLogCATQt clear sat_name and sat_mode
+  // If no radio is selected clear data
   $( ".radios" ).change(function() {
-      if ($(".radios option:selected").text() != "SatPC32" && $(".radios option:selected").text() != "CloudLogCATQt") {
+      if ($(".radios option:selected").val() == 0) {
         $("#sat_name").val("");
         $("#sat_mode").val("");
         $("#frequency").val("");
         $("#frequency_rx").val("");
         $("#band_rx").val("");
         $("#selectPropagation").val($("#selectPropagation option:first").val());
-      }
-
-      if ($(".radios option:selected").text() == "None") {
         $(".radio_timeout_error" ).remove();
       }
-
   });
   </script>
 

From 37ea7049d7723198a20d9fdd564df0c80eac5911 Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Sat, 27 Aug 2022 17:00:23 +0000
Subject: [PATCH 02/11] Radio API: Remove redundant data construction

---
 application/models/Cat.php | 94 +++++++++++++-------------------------
 1 file changed, 31 insertions(+), 63 deletions(-)

diff --git a/application/models/Cat.php b/application/models/Cat.php
index 77b0692d..8d7bcb2f 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -25,6 +25,35 @@
 			$this->db->where('user_id', $user_id);
 			$query = $this->db->get('cat');
 
+			if ($prop_mode == "SAT") {
+				$data = array(
+					'prop_mode' => $prop_mode,
+					'sat_name' => $result['sat_name'],
+					'downlink_freq' => $result['downlink_freq'],
+					'uplink_freq' => $result['uplink_freq'],
+					'downlink_mode' => $result['downlink_mode'],
+					'uplink_mode' => $result['uplink_mode'],
+					'timestamp' => $timestamp,
+					'mode' => NULL,
+					'frequency' => NULL,
+				);
+			} else {
+				$data = array(
+					'prop_mode' => $result['prop_mode'],
+					'mode' => $result['mode'],
+					'frequency' => $result['frequency'],
+					'downlink_freq' => NULL,
+					'downlink_mode' => NULL,
+					'uplink_freq' => NULL,
+					'uplink_mode' => NULL,
+					'timestamp' => $timestamp,
+				);
+			}
+
+			if (isset($result['power'])) {
+				$data['power'] = $result['power'];
+			}
+
 			if ($query->num_rows() > 0)
 			{
 				// Update the record
@@ -32,77 +61,16 @@
 				{
 					$radio_id = $row->id;
 
-					if ($prop_mode == "SAT") {
-						$data = array(
-							'prop_mode' => $prop_mode,
-							'sat_name' => $result['sat_name'],
-							'downlink_freq' => $result['downlink_freq'],
-							'uplink_freq' => $result['uplink_freq'],
-							'downlink_mode' => $result['downlink_mode'],
-							'uplink_mode' => $result['uplink_mode'],
-							'timestamp' => $timestamp,
-							'mode' => NULL,
-							'frequency' => NULL,
-						);
-					} else {
-						$data = array(
-							'prop_mode' => $result['prop_mode'],
-							'mode' => $result['mode'],
-							'frequency' => $result['frequency'],
-							'downlink_freq' => NULL,
-							'downlink_mode' => NULL,
-							'uplink_freq' => NULL,
-							'uplink_mode' => NULL,
-							'timestamp' => $timestamp,
-						);
-					}
-
-					if (isset($result['power'])) {
-						$data['power'] = $result['power'];
-					}
-
 					$this->db->where('id', $radio_id);
 					$this->db->where('user_id', $user_id);
 					$this->db->update('cat', $data);
 				}
 			} else {
 				// Add a new record
-
-				if ($prop_mode == "SAT") {
-					$data = array(
-						'radio' => $result['radio'],
-						'frequency' => NULL,
-						'mode' => NULL,
-						'sat_name' => $result['sat_name'],
-						'downlink_freq' => $result['downlink_freq'],
-						'uplink_freq' => $result['uplink_freq'],
-						'downlink_mode' => $result['downlink_mode'],
-						'uplink_mode' => $result['uplink_mode'],
-						'prop_mode' => $prop_mode,
-						'user_id' => $user_id,
-						'timestamp' => $timestamp,
-					);
-				} else {
-					$data = array(
-						'radio' => $result['radio'],
-						'prop_mode' => $prop_mode,
-						'mode' => $result['mode'],
-						'frequency' => $result['frequency'],
-						'downlink_freq' => NULL,
-						'downlink_mode' => NULL,
-						'uplink_freq' => NULL,
-						'uplink_mode' => NULL,
-						'user_id' => $user_id,
-						'timestamp' => $timestamp,
-					);
-				}
-
-				if (isset($result['power'])) {
-					$data['power'] = $result['power'];
-				}
+				$data['radio'] = $result['radio'];
+				$data['user_id'] = $user_id;
 
 				$this->db->insert('cat', $data);
-
 			}
 		}
 

From 1a122455f0f38230f28b6040708347a6917f343e Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Sun, 28 Aug 2022 18:03:58 +0000
Subject: [PATCH 03/11] .gitignore: Ignore vi swap files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d8f4eb30..ca591b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 .DS_Store
 sync.sh
 *.p12
+*.swp

From 4064340bc788aa8080f58e6a14cfa0109e0339d6 Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Mon, 29 Aug 2022 00:12:28 +0000
Subject: [PATCH 04/11] Unify varible naming

Replace uplink_freq by frequency.
Replace uplink_mode by mode
Replace downlink_freq by frequency_rx.
Replace downlink_mode by mode_rx
---
 application/controllers/Radio.php             | 81 +++++++------------
 application/models/Cat.php                    | 39 +++------
 application/views/interface_assets/footer.php | 30 +++----
 3 files changed, 53 insertions(+), 97 deletions(-)

diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index fa794999..ab6b4391 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -48,17 +48,23 @@
 			{
 				echo "<tr>";
 				echo "<td>".$row->radio."</td>";
-				if($row->frequency != "0" && $row->frequency != NULL) {
+
+				if (empty($row->frequency) || $row->frequency == "0") {
+					echo "<td>- / -</td>";
+				} elseif (empty($row->downlink_freq) || $row->downlink_freq == "0") {
 					echo "<td>".$this->frequency->hz_to_mhz($row->frequency)."</td>";
 				} else {
-					echo "<td>".$this->frequency->hz_to_mhz($row->downlink_freq)." / ".$this->frequency->hz_to_mhz($row->uplink_freq)."</td>";
+					echo "<td>".$this->frequency->hz_to_mhz($row->downlink_freq)." / ".$this->frequency->hz_to_mhz($row->frequency)."</td>";
 				}
 
-				if($row->mode != "non" && $row->mode != NULL) {
+				if (empty($row->mode) || $row->mode == "non") {
+					echo "<td>N/A</td>";
+				} elseif (empty($row->downlink_mode) || $row->downlink_mode == "non") {
 					echo "<td>".$row->mode."</td>";
 				} else {
-					echo "<td>".$row->downlink_mode." / ".$row->uplink_mode."</td>";
+					echo "<td>".$row->downlink_mode." / ".$row->mode."</td>";
 				}
+
 				$phpdate = strtotime($row->timestamp);
 				echo "<td>".date('H:i:s d-m-y', $phpdate)."</td>" ;
 				echo "<td><a href=\"".site_url('radio/delete')."/".$row->id."\" class=\"btn btn-danger\"> <i class=\"fas fa-trash-alt\"></i> Delete</a></td>" ;
@@ -86,22 +92,22 @@
 			foreach ($query->result() as $row)
 			{
 
+				$frequency = $row->frequency;
 
-				if($row->prop_mode == "SAT") {
-					$uplink_freq = $row->uplink_freq;
-					$downlink_freq = $row->downlink_freq;
+				$frequency_rx = $row->downlink_freq;
 
-					$power = $row->power;
+				$power = $row->power;
 
-					$prop_mode = $row->prop_mode;
+				$prop_mode = $row->prop_mode;
 
-					// Check Mode
-					if(strtoupper($row->uplink_mode) == "FMN"){
-						$mode = "FM";
-					} else {
-						$mode = strtoupper($row->uplink_mode);
-					}
+				// Check Mode
+				if(strtoupper($row->mode) == "FMN"){
+					$mode = "FM";
+				} else {
+					$mode = strtoupper($row->mode);
+				}
 
+				if ($row->prop_mode == "SAT") {
 					// Get Satellite Name
 					if($row->sat_name == "AO-07") {
 						$sat_name = "AO-7";
@@ -118,21 +124,7 @@
 					if ($uplink_mode != "" && $downlink_mode != "") {
 						$sat_mode = $uplink_mode."/".$downlink_mode;
 					}
-
 				} else {
-					$frequency = $row->frequency;
-
-					$power = $row->power;
-
-					$prop_mode = $row->prop_mode;
-
-					// Check Mode
-					if(strtoupper($row->mode) == "FMN"){
-						$mode = "FM";
-					} else {
-						$mode = strtoupper($row->mode);
-					}
-
 					$sat_name = "";
 					$sat_mode = "";
 				}
@@ -149,29 +141,18 @@
 				$updated_at = $minutes;
 
 				// Return Json data
-				if ($prop_mode == "SAT") {
-					echo json_encode(array(
-						"uplink_freq" => $uplink_freq,
-						"downlink_freq" => $downlink_freq,
-						"mode" => $mode,
-						"satmode" => $sat_mode,
-						"satname" => $sat_name,
-						"power" => $power,
-						"prop_mode" => $prop_mode,
-						"updated_minutes_ago" => $updated_at,
-					), JSON_PRETTY_PRINT);
-				} else {
-					echo json_encode(array(
-						"frequency" => $frequency,
-						"mode" => $mode,
-						"power" => $power,
-						"prop_mode" => $prop_mode,
-						"updated_minutes_ago" => $updated_at,
-					), JSON_PRETTY_PRINT);
-				}
+				echo json_encode(array(
+					"frequency" => $frequency,
+					"frequency_rx" => $frequency_rx,
+					"mode" => $mode,
+					"satmode" => $sat_mode,
+					"satname" => $sat_name,
+					"power" => $power,
+					"prop_mode" => $prop_mode,
+					"updated_minutes_ago" => $updated_at,
+				), JSON_PRETTY_PRINT);
 			}
 		}
-
 	}
 
 	function get_mode_designator($frequency)
diff --git a/application/models/Cat.php b/application/models/Cat.php
index 8d7bcb2f..4135f065 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -25,34 +25,17 @@
 			$this->db->where('user_id', $user_id);
 			$query = $this->db->get('cat');
 
-			if ($prop_mode == "SAT") {
-				$data = array(
-					'prop_mode' => $prop_mode,
-					'sat_name' => $result['sat_name'],
-					'downlink_freq' => $result['downlink_freq'],
-					'uplink_freq' => $result['uplink_freq'],
-					'downlink_mode' => $result['downlink_mode'],
-					'uplink_mode' => $result['uplink_mode'],
-					'timestamp' => $timestamp,
-					'mode' => NULL,
-					'frequency' => NULL,
-				);
-			} else {
-				$data = array(
-					'prop_mode' => $result['prop_mode'],
-					'mode' => $result['mode'],
-					'frequency' => $result['frequency'],
-					'downlink_freq' => NULL,
-					'downlink_mode' => NULL,
-					'uplink_freq' => NULL,
-					'uplink_mode' => NULL,
-					'timestamp' => $timestamp,
-				);
-			}
-
-			if (isset($result['power'])) {
-				$data['power'] = $result['power'];
-			}
+			// Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
+			$data = array(
+				'prop_mode' => $prop_mode,
+				'frequency' => $result['frequency'] ?? $result['uplink_freq'],
+				'downlink_freq' => $result['frequency_rx'] ?? $result['downlink_freq'],
+				'mode' => $result['mode'] ?? $result['uplink_mode'],
+				'downlink_mode' => $result['mode_rx'] ?? $result['downlink_mode'],
+				'power' => $result['power'],
+				'sat_name' => $result['sat_name'],
+				'timestamp' => $timestamp,
+			);
 
 			if ($query->num_rows() > 0)
 			{
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 35ecf420..763d21a7 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1143,33 +1143,25 @@ $(document).on('keypress',function(e) {
     </script>
 
     <script>
-        // Javascript for controlling rig frequency.
-  var updateFromCAT = function() {
+    // Javascript for controlling rig frequency.
+    var updateFromCAT = function() {
     if($('select.radios option:selected').val() != '0') {
       radioID = $('select.radios option:selected').val();
       $.getJSON( "radio/json/" + radioID, function( data ) {
           /* {
-              "uplink_freq": "2400210000",
-              "downlink_freq": "10489710000",
+              "frequency": "2400210000",
+              "frequency_rx": "10489710000",
               "mode": "SSB",
-              "satmode": "",
-              "satname": "ES'HAIL-2"
+              "satmode": "S/X",
+              "satname": "QO-100"
               "power": "20"
               "prop_mode": "SAT"
           }  */
-          if (data.prop_mode == "SAT")
-          //if (data.uplink_freq != "")
-          {
-            $('#frequency').val(data.uplink_freq);
-            $("#band").val(frequencyToBand(data.uplink_freq));
-          } else {
-            $('#frequency').val(data.frequency);
-            $("#band").val(frequencyToBand(data.frequency));
-          }
-          if (data.downlink_freq != "")
-          {
-            $('#frequency_rx').val(data.downlink_freq);
-            $("#band_rx").val(frequencyToBand(data.downlink_freq));
+          $('#frequency').val(data.frequency);
+          $("#band").val(frequencyToBand(data.frequency));
+          if (data.frequency_rx != "") {
+            $('#frequency_rx').val(data.frequency_rx);
+            $("#band_rx").val(frequencyToBand(data.frequency_rx));
           }
 
           old_mode = $(".mode").val();

From 99ce3d677f6ecdaef458d4ad673197fe6fa6036e Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Mon, 29 Aug 2022 00:15:46 +0000
Subject: [PATCH 05/11] Fix sat_mode

---
 application/controllers/Radio.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index ab6b4391..478d9cb4 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -121,8 +121,12 @@
 					$uplink_mode = $this->get_mode_designator($row->uplink_freq);
 					$downlink_mode = $this->get_mode_designator($row->downlink_freq);
 
-					if ($uplink_mode != "" && $downlink_mode != "") {
+					if (empty($uplink_mode)) {
+						$sat_mode = "";
+					} elseif ($uplink_mode !== $downlink_mode) {
 						$sat_mode = $uplink_mode."/".$downlink_mode;
+					} else {
+						$sat_mode = $uplink_mode;
 					}
 				} else {
 					$sat_name = "";

From 07b7930f64d07a141c1707e86dd2756301e6b9d2 Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Mon, 29 Aug 2022 00:16:12 +0000
Subject: [PATCH 06/11] Fix indentation

---
 application/views/interface_assets/footer.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 763d21a7..bc88c2c6 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1178,18 +1178,18 @@ $(document).on('keypress',function(e) {
           }
           $("#selectPropagation").val(data.prop_mode);
 
-          // Display CAT Timeout warnng based on the figure given in the config file
-            var minutes = Math.floor(<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?> / 60);
+          // Display CAT Timeout warning based on the figure given in the config file
+          var minutes = Math.floor(<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?> / 60);
 
-            if(data.updated_minutes_ago > minutes) {
-              if($('.radio_timeout_error').length == 0) {
-                $('.qso_panel').prepend('<div class="alert alert-danger radio_timeout_error" role="alert">Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
-              } else {
-                $('.radio_timeout_error').text('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
-              }
+          if(data.updated_minutes_ago > minutes) {
+            if($('.radio_timeout_error').length == 0) {
+              $('.qso_panel').prepend('<div class="alert alert-danger radio_timeout_error" role="alert">Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
             } else {
-              $(".radio_timeout_error" ).remove();
+              $('.radio_timeout_error').text('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
             }
+          } else {
+            $(".radio_timeout_error" ).remove();
+          }
 
       });
     }

From f39a561a3ac1d54fae499cf5f77c4476941666ee Mon Sep 17 00:00:00 2001
From: "Florian (DF2ET)" <github@florian-wolters.de>
Date: Thu, 29 Sep 2022 23:06:06 +0200
Subject: [PATCH 07/11] Handle non-SAT cases without throwing errors

* Also test mode and frequency for != "NULL"
* Remove useless code
* Forgotten change of variable name
* Set NULL as default for missing frequency
---
 application/controllers/Radio.php |  2 +-
 application/models/Cat.php        | 38 ++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 478d9cb4..9d987742 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -118,7 +118,7 @@
 					}
 
 					// Get Satellite Mode
-					$uplink_mode = $this->get_mode_designator($row->uplink_freq);
+					$uplink_mode = $this->get_mode_designator($row->frequency);
 					$downlink_mode = $this->get_mode_designator($row->downlink_freq);
 
 					if (empty($uplink_mode)) {
diff --git a/application/models/Cat.php b/application/models/Cat.php
index 4135f065..bcc0f81f 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -4,11 +4,7 @@
 
 		function update($result, $user_id) {
 
-			if ($result['timestamp'] != "") {
-				$timestamp = gmdate("Y-m-d H:i:s");
-			} else {
-				$timestamp = gmdate("Y-m-d H:i:s");
-			}
+			$timestamp = gmdate("Y-m-d H:i:s");
 
 			if (isset($result['prop_mode'])) {
 				$prop_mode = $result['prop_mode'];
@@ -28,14 +24,34 @@
 			// Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
 			$data = array(
 				'prop_mode' => $prop_mode,
-				'frequency' => $result['frequency'] ?? $result['uplink_freq'],
-				'downlink_freq' => $result['frequency_rx'] ?? $result['downlink_freq'],
-				'mode' => $result['mode'] ?? $result['uplink_mode'],
-				'downlink_mode' => $result['mode_rx'] ?? $result['downlink_mode'],
-				'power' => $result['power'],
-				'sat_name' => $result['sat_name'],
+				'power' => $result['power'] ?? 0,
+				'sat_name' => $result['sat_name'] ?? NULL,
 				'timestamp' => $timestamp,
 			);
+			if (isset($result['frequency']) && $result['frequency'] != "NULL") {
+				$data['frequency'] = $result['frequency'];
+			} else {
+				$data['frequency'] = $result['uplink_freq'];
+			}
+			if (isset($result['mode']) && $result['mode'] != "NULL") {
+				$data['mode'] = $result['mode'];
+			} else {
+				$data['mode'] = $result['uplink_mode'];
+			}
+			if (isset($result['frequency_rx'])) {
+				$data['downlink_freq'] = $result['frequency_rx'];
+			} else if (isset($result['downlink_freq'])) {
+				$data['downlink_freq'] = $result['downlink_freq'];
+			} else {
+				$data['downlink_freq'] = NULL;
+			}
+			if (isset($result['mode_rx'])) {
+				$data['downlink_mode'] = $result['mode_rx'];
+			} else if (isset($result['downlink_freq'])) {
+				$data['downlink_mode'] = $result['downlink_mode'];
+			} else {
+				$data['downlink_mode'] = NULL;
+			}
 
 			if ($query->num_rows() > 0)
 			{

From 49d1a13365eb78cae7a86d4585531a5cca7d3eb8 Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Thu, 29 Sep 2022 21:32:08 +0000
Subject: [PATCH 08/11] Some small API improvements

---
 application/models/Cat.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/models/Cat.php b/application/models/Cat.php
index bcc0f81f..484b3516 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -8,13 +8,11 @@
 
 			if (isset($result['prop_mode'])) {
 				$prop_mode = $result['prop_mode'];
+			// For backward compatibility, SatPC32 does not set propergation mode
+			} else if (isset($result['sat_name'])) {
+				$prop_mode = "SAT";
 			} else {
-				// For backward compatibility, SatPC32 does not set propergation mode
-				if (isset($result['sat_name'])) {
-					$prop_mode = "SAT";
-				} else {
-					$prop_mode = NULL;
-				}
+				$prop_mode = NULL;
 			}
 
 			$this->db->where('radio', $result['radio']);
@@ -24,7 +22,7 @@
 			// Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
 			$data = array(
 				'prop_mode' => $prop_mode,
-				'power' => $result['power'] ?? 0,
+				'power' => $result['power'] ?? NULL,
 				'sat_name' => $result['sat_name'] ?? NULL,
 				'timestamp' => $timestamp,
 			);

From 88982bcb09068260aee22f5d8c04a32ba51ca5ab Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Thu, 29 Sep 2022 23:24:10 +0000
Subject: [PATCH 09/11] [CAT] rename rx columns

---
 application/config/migration.php              |  2 +-
 application/controllers/Radio.php             | 19 ++++---
 .../migrations/100_update_cat_table.php       | 52 +++++++++++++++++++
 application/models/Cat.php                    | 12 ++---
 4 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 application/migrations/100_update_cat_table.php

diff --git a/application/config/migration.php b/application/config/migration.php
index 63903572..3090a89d 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 99;
+$config['migration_version'] = 100;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 9d987742..94c4b8e0 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -51,18 +51,18 @@
 
 				if (empty($row->frequency) || $row->frequency == "0") {
 					echo "<td>- / -</td>";
-				} elseif (empty($row->downlink_freq) || $row->downlink_freq == "0") {
+				} elseif (empty($row->frequency_rx) || $row->frequency_rx == "0") {
 					echo "<td>".$this->frequency->hz_to_mhz($row->frequency)."</td>";
 				} else {
-					echo "<td>".$this->frequency->hz_to_mhz($row->downlink_freq)." / ".$this->frequency->hz_to_mhz($row->frequency)."</td>";
+					echo "<td>".$this->frequency->hz_to_mhz($row->frequency_rx)." / ".$this->frequency->hz_to_mhz($row->frequency)."</td>";
 				}
 
 				if (empty($row->mode) || $row->mode == "non") {
 					echo "<td>N/A</td>";
-				} elseif (empty($row->downlink_mode) || $row->downlink_mode == "non") {
+				} elseif (empty($row->mode_rx) || $row->mode_rx == "non") {
 					echo "<td>".$row->mode."</td>";
 				} else {
-					echo "<td>".$row->downlink_mode." / ".$row->mode."</td>";
+					echo "<td>".$row->mode_rx." / ".$row->mode."</td>";
 				}
 
 				$phpdate = strtotime($row->timestamp);
@@ -94,22 +94,21 @@
 
 				$frequency = $row->frequency;
 
-				$frequency_rx = $row->downlink_freq;
+				$frequency_rx = $row->frequency_rx;
 
 				$power = $row->power;
 
 				$prop_mode = $row->prop_mode;
 
 				// Check Mode
-				if(strtoupper($row->mode) == "FMN"){
+				$mode = strtoupper($row->mode);
+				if ($mode == "FMN") {
 					$mode = "FM";
-				} else {
-					$mode = strtoupper($row->mode);
 				}
 
 				if ($row->prop_mode == "SAT") {
 					// Get Satellite Name
-					if($row->sat_name == "AO-07") {
+					if ($row->sat_name == "AO-07") {
 						$sat_name = "AO-7";
 					} elseif ($row->sat_name == "LILACSAT") {
 						$sat_name = "CAS-3H";
@@ -119,7 +118,7 @@
 
 					// Get Satellite Mode
 					$uplink_mode = $this->get_mode_designator($row->frequency);
-					$downlink_mode = $this->get_mode_designator($row->downlink_freq);
+					$downlink_mode = $this->get_mode_designator($row->frequency_rx);
 
 					if (empty($uplink_mode)) {
 						$sat_mode = "";
diff --git a/application/migrations/100_update_cat_table.php b/application/migrations/100_update_cat_table.php
new file mode 100644
index 00000000..1b7c45ef
--- /dev/null
+++ b/application/migrations/100_update_cat_table.php
@@ -0,0 +1,52 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+   Update CAT table
+*/
+
+class Migration_update_cat_table extends CI_Migration {
+
+    public function up()
+    {
+        if ($this->db->table_exists('cat')) {
+            if ($this->db->field_exists('uplink_freq', 'cat')) {
+                $this->dbforge->drop_column('cat', 'uplink_freq');
+            }
+            if ($this->db->field_exists('uplink_mode', 'cat')) {
+                $this->dbforge->drop_column('cat', 'uplink_mode');
+            }
+            if ($this->db->field_exists('downlink_freq', 'cat')) {
+                $this->db->query("ALTER TABLE cat RENAME COLUMN downlink_freq TO frequency_rx");
+            }
+            if ($this->db->field_exists('downlink_mode', 'cat')) {
+                $this->db->query("ALTER TABLE cat RENAME COLUMN downlink_mode TO mode_rx");
+            }
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->table_exists('cat')) {
+            if ($this->db->field_exists('frequency_rx', 'cat')) {
+                $this->db->query("ALTER TABLE cat RENAME COLUMN frequency_rx TO downlink_freq");
+            }
+            if ($this->db->field_exists('mode_rx', 'cat')) {
+                $this->db->query("ALTER TABLE cat RENAME COLUMN mode_rx TO downlink_mode");
+            }
+            if (!$this->db->field_exists('uplink_freq', 'cat')) {
+                $fields = array(
+                    'uplink_freq bigint(13) DEFAULT NULL AFTER `downlink_freq`',
+                );
+                $this->dbforge->add_column('cat', $fields);
+            }
+            if (!$this->db->field_exists('uplink_mode', 'cat')) {
+                $fields = array(
+                    'uplink_mode varchar(255) DEFAULT NULL AFTER `downlink_mode`',
+                );
+                $this->dbforge->add_column('cat', $fields);
+            }
+        }
+    }
+}
diff --git a/application/models/Cat.php b/application/models/Cat.php
index 484b3516..b1b5b20f 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -37,18 +37,18 @@
 				$data['mode'] = $result['uplink_mode'];
 			}
 			if (isset($result['frequency_rx'])) {
-				$data['downlink_freq'] = $result['frequency_rx'];
+				$data['frequency_rx'] = $result['frequency_rx'];
 			} else if (isset($result['downlink_freq'])) {
-				$data['downlink_freq'] = $result['downlink_freq'];
+				$data['frequency_rx'] = $result['downlink_freq'];
 			} else {
-				$data['downlink_freq'] = NULL;
+				$data['frequency_rx'] = NULL;
 			}
 			if (isset($result['mode_rx'])) {
-				$data['downlink_mode'] = $result['mode_rx'];
+				$data['mode_rx'] = $result['mode_rx'];
 			} else if (isset($result['downlink_freq'])) {
-				$data['downlink_mode'] = $result['downlink_mode'];
+				$data['mode_rx'] = $result['downlink_mode'];
 			} else {
-				$data['downlink_mode'] = NULL;
+				$data['mode_rx'] = NULL;
 			}
 
 			if ($query->num_rows() > 0)

From b081ab5449385560ace5a6500721e81212821766 Mon Sep 17 00:00:00 2001
From: kb-light <14014119+kb-light@users.noreply.github.com>
Date: Thu, 29 Sep 2022 23:46:54 +0000
Subject: [PATCH 10/11] Radio: Rename Sat mode vars to avoid confusion

---
 application/controllers/Radio.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 94c4b8e0..491d98c3 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -117,15 +117,15 @@
 					}
 
 					// Get Satellite Mode
-					$uplink_mode = $this->get_mode_designator($row->frequency);
-					$downlink_mode = $this->get_mode_designator($row->frequency_rx);
+					$sat_mode_uplink = $this->get_mode_designator($row->frequency);
+					$sat_mode_downlink = $this->get_mode_designator($row->frequency_rx);
 
-					if (empty($uplink_mode)) {
+					if (empty($sat_mode_uplink)) {
 						$sat_mode = "";
-					} elseif ($uplink_mode !== $downlink_mode) {
-						$sat_mode = $uplink_mode."/".$downlink_mode;
+					} elseif ($sat_mode_uplink !== $sat_mode_downlink) {
+						$sat_mode = $sat_mode_uplink."/".$sat_mode_downlink;
 					} else {
-						$sat_mode = $uplink_mode;
+						$sat_mode = $sat_mode_uplink;
 					}
 				} else {
 					$sat_name = "";

From 43f46f987981cae598eee65d51de1608d012b567 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Fri, 30 Sep 2022 11:11:11 +0200
Subject: [PATCH 11/11] Restore initial data type of frequency column in cat
 table

Signed-off-by: phl0 <github@florian-wolters.de>
---
 application/config/migration.php              |  2 +-
 .../101_make_frequency_bigint_again.php       | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 application/migrations/101_make_frequency_bigint_again.php

diff --git a/application/config/migration.php b/application/config/migration.php
index 3090a89d..da99decf 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 100;
+$config['migration_version'] = 101;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/migrations/101_make_frequency_bigint_again.php b/application/migrations/101_make_frequency_bigint_again.php
new file mode 100644
index 00000000..275c7bdd
--- /dev/null
+++ b/application/migrations/101_make_frequency_bigint_again.php
@@ -0,0 +1,45 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+   Restore initial field settings for frequency as it
+   broke with commit f6feea5
+*/
+
+class Migration_make_frequency_bigint_again extends CI_Migration {
+
+    public function up()
+    {
+        if ($this->db->table_exists('cat')) {
+            if ($this->db->field_exists('frequency', 'cat')) {
+                $fields = array(
+                    'frequency' => array(
+                        'name' => 'frequency',
+                        'type' => 'BIGINT',
+                        'null' => TRUE,
+                        'default' => NULL,
+                    ),
+                );
+                $this->dbforge->modify_column('cat', $fields);
+            }
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->table_exists('cat')) {
+            if ($this->db->field_exists('frequency', 'cat')) {
+                $fields = array(
+                    'frequency' => array(
+                        'name' => 'frequency',
+                        'type' => 'VARCHAR(10)',
+                        'null' => TRUE,
+                        'default' => NULL,
+                    ),
+                );
+                $this->dbforge->modify_column('cat', $fields);
+            }
+        }
+    }
+}