clearing up code related errors in the build

robotastic · Dec 20, 2022 · 2d248ed · 2d248ed
1 parent 7152185
commit 2d248ed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/plugins/broadcastify_uploader/broadcastify_uploader.cc b/plugins/broadcastify_uploader/broadcastify_uploader.cc
@@ -66,7 +66,7 @@ class Broadcastify_Uploader : public Plugin_Api {
     }
 
     CURL *curl;
-    CURLcode res;
+    CURLcode res = CURLE_FAILED_INIT;
 
     struct curl_slist *headers = NULL;
 

diff --git a/plugins/unit_script/unit_script.cc b/plugins/unit_script/unit_script.cc
@@ -28,7 +28,7 @@ int unit_registration(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li on &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -40,7 +40,7 @@ int unit_deregistration(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li off &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -50,7 +50,7 @@ int unit_acknowledge_response(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li ackresp &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -70,7 +70,7 @@ int unit_group_affiliation(System *sys, long source_id, long talkgroup_num) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li join %li %s &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -81,7 +81,7 @@ int unit_data_grant(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li data &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -92,7 +92,7 @@ int unit_answer_request(System *sys, long source_id, long talkgroup) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li ans_req %li &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -112,7 +112,7 @@ int unit_location(System *sys, long source_id, long talkgroup_num) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li location %li %s &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -134,7 +134,7 @@ int call_start(Call *call) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li call %li %s &", system_script.c_str(), short_name.c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;

diff --git a/trunk-recorder/recorders/p25_recorder_qpsk_demod.cc b/trunk-recorder/recorders/p25_recorder_qpsk_demod.cc
@@ -61,12 +61,10 @@ void p25_recorder_qpsk_demod::initialize() {
   double costas_alpha = 0.008;
   double omega = double(system_channel_rate) / symbol_rate; // set to 6000 for TDMA, should be symbol_rate
   double gain_omega = 0.1 * gain_mu * gain_mu;
-  double alpha = costas_alpha;
-  double beta = 0.125 * alpha * alpha;
   double fmax = 3000; // Hz
   fmax = 2 * pi * fmax / double(system_channel_rate);
 
-  costas = gr::op25_repeater::costas_loop_cc::make(costas_alpha,  4, (2 * pi)/4 ); //beta, fmax, -fmax);
+  costas = gr::op25_repeater::costas_loop_cc::make(costas_alpha,  4, (2 * pi)/4 );
   clock = gr::op25_repeater::gardner_cc::make(omega, gain_mu, gain_omega);
   // QPSK: Perform Differential decoding on the constellation
   diffdec = gr::digital::diff_phasor_cc::make();

diff --git a/trunk-recorder/systems/p25_trunking.cc b/trunk-recorder/systems/p25_trunking.cc
@@ -198,16 +198,12 @@ void p25_trunking::initialize_qpsk() {
   double costas_alpha = 0.008;
   double omega = double(system_channel_rate) / symbol_rate; // set to 6000 for TDMA, should be symbol_rate
   double gain_omega = 0.1 * gain_mu * gain_mu;
-  double alpha = costas_alpha;
-  double beta = 0.125 * alpha * alpha;
   double fmax = 3000; // Hz
   fmax = 2 * pi * fmax / double(system_channel_rate);
 
-  //costas_clock = gr::op25_repeater::gardner_costas_cc::make(omega, gain_mu, gain_omega, alpha, beta, fmax, -fmax);
-  costas = gr::op25_repeater::costas_loop_cc::make(costas_alpha,  4, (2 * pi)/4 ); //beta, fmax, -fmax);
+  costas = gr::op25_repeater::costas_loop_cc::make(costas_alpha,  4, (2 * pi)/4 ); 
   clock = gr::op25_repeater::gardner_cc::make(omega, gain_mu, gain_omega);
 
-
   // QPSK: Perform Differential decoding on the constellation
   diffdec = gr::digital::diff_phasor_cc::make();