Antennaheight works now

Author: keesverruijt

TODO.md

@@ -1,6 +1,15 @@
 ### TODO.md
 
 
+Gui changes to do:
+
+- doppler on kills image
+- antenna height is NaN NM?
+- fix padding/border in read only values
+- check why hours are rounded to a half hour
+- fix double enable checkboxes in NoTransmitSector
+
+
 A list of things still to do before this code has caught back up with Dirk's vibe coded version:
 
 1. Check and finagle the Furuno code back into operation. It should work, but hasn't been tested.

src/bin/mayara-server/web/signalk/v2.rs

@@ -473,7 +473,7 @@ async fn control_stream_handler(
     Query(params): Query<SignalKWebSocket>,
     ws: WebSocketUpgrade,
 ) -> Response {
-    log::info!(
+    log::debug!(
         "stream request for \"/signalk/v2/api/vessels/self/radars/stream\" from {} params={:?}",
         addr,
         params
@@ -556,7 +556,7 @@ async fn ws_signalk_delta(
     let (reply_tx, mut reply_rx) = tokio::sync::mpsc::channel::<ControlValue>(ControlId::COUNT);
     let mut meta_radar_data_sent = Vec::new();
 
-    log::info!(
+    log::debug!(
         "Starting /signalk/v2/api/vessels/self/radars/stream websocket subscribe={:?} send_cached_values={:?}",
         subscribe,
         send_cached_values
@@ -813,7 +813,7 @@ async fn send_all_subscribed(
     if subscriptions.mode == Subscribe::Some {
         rcvs.retain(|x| subscriptions.is_subscribed(x, true));
     }
-    log::info!("Sending {} subscribed controls", rcvs.len());
+    log::debug!("Sending {} subscribed controls", rcvs.len());
     if rcvs.len() > 0 {
         let mut delta: SignalKDelta = SignalKDelta::new();
         delta.add_updates(rcvs);

src/lib/brand/furuno/report.rs

@@ -130,7 +130,7 @@ impl FurunoReportReceiver {
         loop {
             tokio::select! {
                 _ = subsys.on_shutdown_requested() => {
-                    log::info!("{}: shutdown", self.common.key);
+                    log::debug!("{}: shutdown", self.common.key);
                     return Err(RadarError::Shutdown);
                 },
 

src/lib/brand/furuno/settings.rs

@@ -3,10 +3,10 @@ use std::collections::HashMap;
 use crate::{
     Cli,
     radar::settings::{
-        ControlId, HAS_AUTO_NOT_ADJUSTABLE, SharedControls, Units, new_auto, new_list, new_numeric,
+        ControlId, HAS_AUTO_NOT_ADJUSTABLE, SharedControls, new_auto, new_list, new_numeric,
         new_sector, new_string,
     },
-    radar::{RadarInfo, range::Ranges},
+    radar::{RadarInfo, range::Ranges, units::Units},
     stream::SignalKDelta,
 };
 

src/lib/brand/navico/command.rs

@@ -304,7 +304,7 @@ impl CommandSender for Command {
                 cmd.extend_from_slice(&value.to_le_bytes());
             }
             ControlId::AntennaHeight => {
-                let value = deci_value as u16;
+                let value = (value * 1000.) as u16;
                 cmd.extend_from_slice(&[0x30, 0xc1, 0x01, 0, 0, 0]);
                 cmd.extend_from_slice(&value.to_le_bytes());
                 cmd.extend_from_slice(&[0, 0]);

src/lib/brand/navico/mod.rs

@@ -291,7 +291,7 @@ impl NavicoLocator {
                 Ok(data) => {
                     log::debug!("{} sent NavicoBeaconDual {:?}", from, data);
                     if let Some(serial_no) = c_string(&data.header.serial_no) {
-                        log::info!(
+                        log::debug!(
                             "{} locating dual-range radar @ {}",
                             from,
                             data.header.radar_addr
@@ -358,7 +358,7 @@ impl NavicoLocator {
                 Ok(data) => {
                     log::debug!("{} sent NavicoBeaconSingle {:?}", from, data);
                     if let Some(serial_no) = c_string(&data.header.serial_no) {
-                        log::info!(
+                        log::debug!(
                             "{} locating single-range radar @ {}",
                             from,
                             data.header.radar_addr
@@ -404,7 +404,7 @@ impl NavicoLocator {
                     log::debug!("{} sent BR24Beacon {:?}", from, data);
 
                     if let Some(serial_no) = c_string(&data.serial_no) {
-                        log::info!("{} locating BR24 @ {}", from, data.radar_addr);
+                        log::debug!("{} locating BR24 @ {}", from, data.radar_addr);
                         let radar_addr: SocketAddrV4 = from.clone();
 
                         let radar_data: SocketAddrV4 = data.data.into();

src/lib/brand/navico/report.rs

@@ -1148,7 +1148,7 @@ impl NavicoReportReceiver {
             }
             _ => {
                 if self.model != model {
-                    log::info!("{}: Radar is model {}", self.common.key, model);
+                    log::debug!("{}: Radar is model {}", self.common.key, model);
                     let info2 = self.common.info.clone();
                     self.model = model;
                     super::settings::update_when_model_known(
@@ -1242,7 +1242,7 @@ impl NavicoReportReceiver {
             let start_angle = i16::from_le_bytes(blanking.start_angle);
             let end_angle = i16::from_le_bytes(blanking.end_angle);
             let enabled = Some(blanking.enabled > 0);
-            log::info!(
+            log::debug!(
                 "no_transmit_sector_{}: {}-{} en={:?}",
                 i,
                 start_angle,
@@ -1284,7 +1284,7 @@ impl NavicoReportReceiver {
         };
 
         if self.model != model {
-            log::info!("{}: Radar is model {}", self.common.key, model);
+            log::debug!("{}: Radar is model {}", self.common.key, model);
             let info2 = self.common.info.clone();
             self.model = model;
             super::settings::update_when_model_known(&mut self.common.info.controls, model, &info2);

src/lib/brand/navico/settings.rs

@@ -7,9 +7,10 @@ use crate::{
     Cli,
     radar::RadarInfo,
     radar::settings::{
-        AutomaticValue, ControlId, HAS_AUTO_NOT_ADJUSTABLE, SharedControls, Units, new_auto,
-        new_list, new_numeric, new_sector, new_string,
+        AutomaticValue, ControlId, HAS_AUTO_NOT_ADJUSTABLE, SharedControls, new_auto, new_list,
+        new_numeric, new_sector, new_string,
     },
+    radar::units::Units,
     stream::SignalKDelta,
 };
 
@@ -29,7 +30,7 @@ pub fn new(
             .set_string(model.unwrap().to_string());
     }
 
-    new_numeric(ControlId::AntennaHeight, 0., 99.)
+    new_numeric(ControlId::AntennaHeight, 0., 60.)
         .wire_scale_factor(1000., false)
         .wire_scale_step(0.1) // Allow control in decimeters
         .wire_units(Units::Meters)

src/lib/brand/raymarine/report.rs

@@ -56,7 +56,7 @@ pub(super) fn pixel_to_blob(legend: &Legend) -> PixelToBlobType {
             };
         }
     }
-    log::info!("Created pixel_to_blob from legend {:?}", legend);
+    log::debug!("Created pixel_to_blob from legend {:?}", legend);
     lookup
 }
 
@@ -157,7 +157,7 @@ impl RaymarineReportReceiver {
             let timeout = self.report_request_timeout;
             tokio::select! {
                 _ = subsys.on_shutdown_requested() => {
-                    log::info!("{}: shutdown", self.common.key);
+                    log::debug!("{}: shutdown", self.common.key);
                     return Err(RadarError::Shutdown);
                 },
                 _ = sleep_until(timeout) => {

src/lib/brand/raymarine/report/quantum.rs

@@ -332,7 +332,7 @@ pub(super) fn process_info_report(receiver: &mut RaymarineReportReceiver, data:
 
     match RaymarineModel::try_into(&model_serial) {
         Some(model) => {
-            log::info!(
+            log::debug!(
                 "{}: Detected model: {} with serial {}",
                 receiver.common.key,
                 model.name,