diff --git a/src/main/drivers/sonar_hcsr04.c b/src/main/drivers/sonar_hcsr04.c
index 4f4581b49d..43d662f4a9 100644
--- a/src/main/drivers/sonar_hcsr04.c
+++ b/src/main/drivers/sonar_hcsr04.c
@@ -63,7 +63,7 @@ void hcsr04_extiHandler(extiCallbackRec_t* cb)
     }
 }
 
-void hcsr04_init(sonarRange_t *sonarRange, sonarConfig_t *sonarConfig)
+void hcsr04_init(const sonarConfig_t *sonarConfig, sonarRange_t *sonarRange)
 {
     sonarRange->maxRangeCm = HCSR04_MAX_RANGE_CM;
     sonarRange->detectionConeDeciDegrees = HCSR04_DETECTION_CONE_DECIDEGREES;
diff --git a/src/main/drivers/sonar_hcsr04.h b/src/main/drivers/sonar_hcsr04.h
index 397803580e..820810186b 100644
--- a/src/main/drivers/sonar_hcsr04.h
+++ b/src/main/drivers/sonar_hcsr04.h
@@ -37,6 +37,6 @@ typedef struct sonarRange_s {
 #define HCSR04_DETECTION_CONE_DECIDEGREES 300 // recommended cone angle30 degrees, from HC-SR04 spec sheet
 #define HCSR04_DETECTION_CONE_EXTENDED_DECIDEGREES 450 // in practice 45 degrees seems to work well
 
-void hcsr04_init(sonarRange_t *sonarRange, sonarConfig_t *sonarConfig);
+void hcsr04_init(const sonarConfig_t *sonarConfig, sonarRange_t *sonarRange);
 void hcsr04_start_reading(void);
 int32_t hcsr04_get_distance(void);
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index be183c7f03..8756d8502d 100755
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -3691,6 +3691,10 @@ const cliResourceValue_t resourceTable[] = {
     { OWNER_PPMINPUT, &masterConfig.ppmConfig.ioTag, 0 },
     { OWNER_PWMINPUT, &masterConfig.pwmConfig.ioTags[0], PWM_INPUT_PORT_COUNT },
 #endif 
+#ifdef SONAR
+    { OWNER_SONAR_TRIGGER, &masterConfig.sonarConfig.triggerTag, 0 },
+    { OWNER_SONAR_ECHO, &masterConfig.sonarConfig.echoTag, 0 },
+#endif
 };
 
 static void cliResource(char *cmdline)
diff --git a/src/main/sensors/sonar.c b/src/main/sensors/sonar.c
index dd154d968f..6c7b18143c 100644
--- a/src/main/sensors/sonar.c
+++ b/src/main/sensors/sonar.c
@@ -54,7 +54,7 @@ void sonarInit(const sonarConfig_t *sonarConfig)
 {
     sonarRange_t sonarRange;
 
-    hcsr04_init(&sonarRange, sonarConfig);
+    hcsr04_init(sonarConfig, &sonarRange);
 
     sensorsSet(SENSOR_SONAR);
     sonarMaxRangeCm = sonarRange.maxRangeCm;