Merge pull request #1453 from phl0/CATsupportOtherPropModes

CAT support other prop modes

application/config/migration.php

@@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 88;
+$config['migration_version'] = 90;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Radio.php

@@ -87,12 +87,14 @@
 			{
 
 
-				if($row->sat_name != "") {
+				if($row->prop_mode == "SAT") {
 					$uplink_freq = $row->uplink_freq;
 					$downlink_freq = $row->downlink_freq;
 
 					$power = $row->power;
 
+					$prop_mode = $row->prop_mode;
+
 					// Check Mode
 					if(strtoupper($row->uplink_mode) == "FMN"){
 						$mode = "FM";
@@ -118,11 +120,12 @@
 					}
 
 				} else {
-					$uplink_freq = $row->frequency;
+					$frequency = $row->frequency;
-					$downlink_freq = "";
 
 					$power = $row->power;
 
+					$prop_mode = $row->prop_mode;
+
 					// Check Mode
 					if(strtoupper($row->mode) == "FMN"){
 						$mode = "FM";
@@ -146,6 +149,7 @@
 				$updated_at = $minutes;
 
 				// Return Json data
+				if ($prop_mode == "SAT") {
 					echo json_encode(array(
 						"uplink_freq" => $uplink_freq,
 						"downlink_freq" => $downlink_freq,
@@ -153,8 +157,18 @@
 						"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);
+				}
 			}
 		}
 

application/migrations/089_add_propmode_to_cat.php

@@ -0,0 +1,28 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_add_propmode_to_cat
+ *
+ * Creates a varchar column in CAT table that holds value of propagation mode
+ * 
+ */
+
+class Migration_add_propmode_to_cat extends CI_Migration {
+
+        public function up()
+        {
+                if (!$this->db->field_exists('prop_mode', 'cat')) {
+                        $fields = array(
+                                'prop_mode VARCHAR(10) DEFAULT NULL',
+                        );
+                        $this->dbforge->add_column('cat', $fields, 'sat_name');
+                }
+        }
+
+        public function down()
+        {
+                $this->dbforge->drop_column('cat', 'propmode');
+        }
+}

application/migrations/090_make_mode_frequency_null.php

@@ -0,0 +1,54 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_make_mode_frequency_null
+ *
+ * Modify frequency and mode column so that NULL is allowed
+ * Basically for propmode != SAT
+ * 
+ */
+
+class Migration_make_mode_frequency_null extends CI_Migration {
+
+        public function up()
+        {
+                if ($this->db->field_exists('frequency', 'cat')) {
+                        $fields = array(
+                           'frequency' => array(
+                              'type' => 'VARCHAR(10) NULL',
+                           ),
+                        );
+                        $this->dbforge->modify_column('cat', $fields);
+                }
+                if ($this->db->field_exists('mode', 'cat')) {
+                        $fields = array(
+                           'mode' => array(
+                              'type' => 'VARCHAR(10) NULL',
+                           ),
+                        );
+                        $this->dbforge->modify_column('cat', $fields);
+                }
+        }
+
+        public function down()
+        {
+                if ($this->db->field_exists('frequency', 'cat')) {
+                        $fields = array(
+                           'frequency' => array(
+                              'type' => 'VARCHAR(10) NOT NULL',
+                           ),
+                        );
+                        $this->dbforge->modify_column('cat', $fields);
+                }
+                if ($this->db->field_exists('mode', 'cat')) {
+                        $fields = array(
+                           'mode' => array(
+                              'type' => 'VARCHAR(10) NOT NULL',
+                           ),
+                        );
+                        $this->dbforge->modify_column('cat', $fields);
+                }
+        }
+}

application/models/Cat.php

@@ -40,8 +40,12 @@
 					{
 						$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'],
@@ -50,6 +54,20 @@
 							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,
+							);
+							if (isset($result['power'])) {
+								$data['power'] = $result['power'];
+							}
+						}
 
 						$this->db->where('id', $radio_id);
 						$this->db->where('user_id', $user_id);
@@ -88,11 +106,13 @@
 						'user_id' => $user_id,
 					);
 				} else if($result['radio'] == "CloudLogCATQt") {
+					if ($result['prop_mode'] == "SAT") {
 						$data = array(
 							'radio' => $result['radio'],
-						'frequency' => $result['frequency'],
-						'mode' => $result['mode'],
 							'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'],
@@ -102,6 +122,22 @@
 						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'],
+							'downlink_freq' => NULL,
+							'downlink_mode' => NULL,
+							'uplink_freq' => NULL,
+							'uplink_mode' => NULL,
+							'user_id' => $user_id,
+						);
+						if (isset($result['power'])) {
+							$data['power'] = $result['power'];
+						}
+					}
 				} else {
 					$data = array(
 						'radio' => $result['radio'],

application/views/interface_assets/footer.php

@@ -1073,11 +1073,16 @@ $(document).on('keypress',function(e) {
               "satmode": "",
               "satname": "ES'HAIL-2"
               "power": "20"
+              "prop_mode": "SAT"
           }  */
-          if (data.uplink_freq != "")
+          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 != "")
           {
@@ -1099,8 +1104,9 @@ $(document).on('keypress',function(e) {
           $("#sat_name").val(data.satname);
           $("#sat_mode").val(data.satmode);
           if(data.power != 0) {
-            $("#power").val(data.power);
+            $("#transmit_power").val(data.power);
           }
+          $("#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->config->item('cat_timeout_interval'); ?> / 60);