diff --git a/src/components/development/MAVLinkInspector.vue b/src/components/development/MAVLinkInspector.vue
new file mode 100644
index 000000000..62afd082f
--- /dev/null
+++ b/src/components/development/MAVLinkInspector.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="flex flex-col gap-4">
+    <div class="flex flex-row gap-4 mb-4">
+      <div class="flex-1">
+        <div class="text-lg mb-2">Available Message Types</div>
+        <div class="mb-2">
+          <input
+            v-model="searchQuery"
+            type="text"
+            placeholder="Search messages..."
+            class="w-full px-3 py-2 bg-[#FFFFFF22] rounded-md text-white placeholder-gray-400 outline-none focus:ring-2 focus:ring-blue-500"
+          />
+        </div>
+        <div class="bg-[#FFFFFF11] rounded-md p-2 max-h-[300px] overflow-y-auto">
+          <div
+            v-for="type in filteredMessageTypes"
+            :key="type"
+            class="cursor-pointer hover:bg-[#FFFFFF22] p-1 rounded"
+            :class="{ 'bg-[#FFFFFF33]': trackedMessageTypes.has(type) }"
+            @click="toggleMessageTracking(type)"
+          >
+            {{ type }}
+          </div>
+          <div v-if="filteredMessageTypes.length === 0" class="text-gray-400 text-center p-2">No messages found</div>
+        </div>
+      </div>
+      <div class="flex-1">
+        <div class="text-lg mb-2">Message Values</div>
+        <div class="bg-[#FFFFFF11] rounded-md p-2 max-h-[340px] overflow-y-auto">
+          <div v-for="type in trackedMessageTypes" :key="type" class="mb-2">
+            <div class="font-bold">{{ type }}</div>
+            <div class="text-xs text-gray-400 mb-1">Incoming Messages:</div>
+            <pre class="text-sm whitespace-pre-wrap">{{
+              JSON.stringify(messageValues.get(`in:${type}`), null, 2)
+            }}</pre>
+            <div class="text-xs text-gray-400 mt-2 mb-1">Outgoing Messages:</div>
+            <pre class="text-sm whitespace-pre-wrap">{{
+              JSON.stringify(messageValues.get(`out:${type}`), null, 2)
+            }}</pre>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+
+import type { Package } from '@/libs/connection/m2r/messages/mavlink2rest'
+import { MAVLinkType } from '@/libs/connection/m2r/messages/mavlink2rest-enum'
+import { useMainVehicleStore } from '@/stores/mainVehicle'
+
+const mainVehicleStore = useMainVehicleStore()
+const searchQuery = ref('')
+
+const availableMessageTypes = computed(() => {
+  return Object.values(MAVLinkType).filter((type) => typeof type === 'string')
+})
+
+const filteredMessageTypes = computed(() => {
+  const query = searchQuery.value.toLowerCase()
+  if (!query) return availableMessageTypes.value
+  return availableMessageTypes.value.filter((type) => type.toLowerCase().includes(query))
+})
+
+const trackedMessageTypes = ref<Set<MAVLinkType>>(new Set())
+const messageValues = ref<Map<string, unknown>>(new Map())
+
+const toggleMessageTracking = (type: MAVLinkType): void => {
+  if (trackedMessageTypes.value.has(type)) {
+    trackedMessageTypes.value.delete(type)
+    messageValues.value.delete(`in:${type}`)
+    messageValues.value.delete(`out:${type}`)
+  } else {
+    trackedMessageTypes.value.add(type)
+    setupMessageListeners(type)
+  }
+}
+
+const setupMessageListeners = (type: MAVLinkType): void => {
+  try {
+    mainVehicleStore.listenToIncomingMessages(type, (pack: Package) => {
+      messageValues.value.set(`in:${type}`, pack.message)
+    })
+    mainVehicleStore.listenToOutgoingMessages(type, (pack: Package) => {
+      messageValues.value.set(`out:${type}`, pack.message)
+    })
+  } catch (error) {
+    console.error(`Failed to setup message listeners for type ${type}:`, error)
+  }
+}
+
+// Set up listeners for any already tracked message types
+onMounted(() => {
+  trackedMessageTypes.value.forEach(setupMessageListeners)
+})
+
+// Clean up when component is unmounted
+onUnmounted(() => {
+  trackedMessageTypes.value.clear()
+  messageValues.value.clear()
+})
+</script>
diff --git a/src/libs/connection/connection-manager.ts b/src/libs/connection/connection-manager.ts
index 5f72f4543..a3210aba8 100644
--- a/src/libs/connection/connection-manager.ts
+++ b/src/libs/connection/connection-manager.ts
@@ -14,6 +14,7 @@ export class ConnectionManager {
   // Signals
   static onMainConnection = new Signal<WeakRef<Connection.Abstract>>()
   static onRead = new Signal<Uint8Array>()
+  static onWrite = new Signal<Uint8Array>()
 
   /**
    * Return the connections available
@@ -69,7 +70,9 @@ export class ConnectionManager {
     }
 
     previousConnection?.onRead?.clear()
+    previousConnection?.onWrite?.clear()
     connection.onRead.add((data: Uint8Array) => this.onRead.emit_value(data))
+    connection.onWrite.add((data: Uint8Array) => this.onWrite.emit_value(data))
     ConnectionManager._mainConnection = new WeakRef(connection)
     // There is no constructor and updating the register is not expensive in this function
     ConnectionManager.onMainConnection.register_caller(
@@ -96,6 +99,7 @@ export class ConnectionManager {
    */
   static write(data: Uint8Array): boolean {
     ConnectionManager.mainConnection()?.write(data)
+    ConnectionManager.onWrite.emit_value(data)
     return true
   }
 }
diff --git a/src/libs/connection/connection.ts b/src/libs/connection/connection.ts
index 562065c0c..b2c321b06 100644
--- a/src/libs/connection/connection.ts
+++ b/src/libs/connection/connection.ts
@@ -64,6 +64,7 @@ export abstract class Abstract {
 
   // Signals
   public onRead = new Signal<Uint8Array>()
+  public onWrite = new Signal<Uint8Array>()
 
   /**
    * Return the connection uri
diff --git a/src/libs/vehicle/ardupilot/ardupilot.ts b/src/libs/vehicle/ardupilot/ardupilot.ts
index 2e8269425..63ee867d4 100644
--- a/src/libs/vehicle/ardupilot/ardupilot.ts
+++ b/src/libs/vehicle/ardupilot/ardupilot.ts
@@ -82,7 +82,8 @@ export abstract class ArduPilotVehicle<Modes> extends Vehicle.AbstractVehicle<Mo
 
   _messages: MAVLinkMessageDictionary = new Map()
 
-  onMAVLinkMessage = new SignalTyped()
+  onIncomingMAVLinkMessage = new SignalTyped()
+  onOutgoingMAVLinkMessage = new SignalTyped()
   _flying = false
 
   protected currentSystemId = 1
@@ -270,11 +271,31 @@ export abstract class ArduPilotVehicle<Modes> extends Vehicle.AbstractVehicle<Mo
     ]
   }
 
+  /**
+   * Log outgoing messages
+   * @param {Uint8Array} message
+   */
+  onOutgoingMessage(message: Uint8Array): void {
+    const textDecoder = new TextDecoder()
+    let mavlink_message: Package
+    const text_message = textDecoder.decode(message)
+    try {
+      mavlink_message = JSON.parse(text_message) as Package
+      this.onOutgoingMAVLinkMessage.emit_value(mavlink_message.message.type, mavlink_message)
+    } catch (error) {
+      const pattern = /Ok\((\d+)\)/
+      const match = pattern.exec(text_message)
+      if (match) return
+      console.error(`Failed to parse mavlink message: ${text_message}`)
+      return
+    }
+  }
+
   /**
    *  Decode incoming message
    * @param {Uint8Array} message
    */
-  onMessage(message: Uint8Array): void {
+  onIncomingMessage(message: Uint8Array): void {
     const textDecoder = new TextDecoder()
     let mavlink_message: Package
     const text_message = textDecoder.decode(message)
@@ -350,7 +371,7 @@ export abstract class ArduPilotVehicle<Modes> extends Vehicle.AbstractVehicle<Mo
 
     // TODO: Maybe create a signal class to deal with MAVLink only
     // Where add will use the template argument type to define the lambda argument type
-    this.onMAVLinkMessage.emit_value(mavlink_message.message.type, mavlink_message)
+    this.onIncomingMAVLinkMessage.emit_value(mavlink_message.message.type, mavlink_message)
 
     if (Object.keys(this._usedGenericVariablesdMessagePaths).includes(mavlink_message.message.type)) {
       this._usedGenericVariablesdMessagePaths[mavlink_message.message.type].forEach((path) => {
diff --git a/src/libs/vehicle/vehicle-factory.ts b/src/libs/vehicle/vehicle-factory.ts
index 37b3427f4..b85e2e086 100644
--- a/src/libs/vehicle/vehicle-factory.ts
+++ b/src/libs/vehicle/vehicle-factory.ts
@@ -44,7 +44,8 @@ export class VehicleFactory {
       return undefined
     }
 
-    ConnectionManager.onRead.add((message) => vehicle?.onMessage(message))
+    ConnectionManager.onRead.add((message) => vehicle?.onIncomingMessage(message))
+    ConnectionManager.onWrite.add((message) => vehicle?.onOutgoingMessage(message))
 
     VehicleFactory._vehicles.push(new WeakRef(vehicle))
     VehicleFactory.onVehicles.register_caller(this.vehicles)
diff --git a/src/libs/vehicle/vehicle.ts b/src/libs/vehicle/vehicle.ts
index 5ecf77585..83f46ef7d 100644
--- a/src/libs/vehicle/vehicle.ts
+++ b/src/libs/vehicle/vehicle.ts
@@ -169,7 +169,8 @@ export abstract class AbstractVehicle<Modes> {
     }
   }
 
-  abstract onMessage(message: Uint8Array): void
+  abstract onIncomingMessage(message: Uint8Array): void
+  abstract onOutgoingMessage(message: Uint8Array): void
 
   abstract arm(): Promise<void>
   abstract altitude(): Altitude
diff --git a/src/stores/mainVehicle.ts b/src/stores/mainVehicle.ts
index 19f9b2bf2..506371f42 100644
--- a/src/stores/mainVehicle.ts
+++ b/src/stores/mainVehicle.ts
@@ -495,7 +495,7 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
       }
     }, 1000)
 
-    mainVehicle.value.onMAVLinkMessage.add(MAVLinkType.HEARTBEAT, (pack: Package) => {
+    mainVehicle.value.onIncomingMAVLinkMessage.add(MAVLinkType.HEARTBEAT, (pack: Package) => {
       if (pack.header.component_id != 1) {
         return
       }
@@ -533,6 +533,20 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     })
   })
 
+  const listenToIncomingMessages = (messageType: string, callback: (pack: Package) => void): void => {
+    if (!mainVehicle.value) {
+      throw new Error('No vehicle available to listen for incoming messages.')
+    }
+    mainVehicle.value?.onIncomingMAVLinkMessage.add(messageType, callback)
+  }
+
+  const listenToOutgoingMessages = (messageType: string, callback: (pack: Package) => void): void => {
+    if (!mainVehicle.value) {
+      throw new Error('No vehicle available to listen for outgoing messages.')
+    }
+    mainVehicle.value?.onOutgoingMAVLinkMessage.add(messageType, callback)
+  }
+
   // Allow us to set custom commands to be used in the browser
   // Expert mode
   watch(mainVehicle, async (newVehicle) => {
@@ -618,5 +632,7 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     genericVariables,
     availableGenericVariables,
     registerUsageOfGenericVariable,
+    listenToIncomingMessages,
+    listenToOutgoingMessages,
   }
 })
diff --git a/src/views/ConfigurationDevelopmentView.vue b/src/views/ConfigurationDevelopmentView.vue
index 557a8a5b5..266dcec6b 100644
--- a/src/views/ConfigurationDevelopmentView.vue
+++ b/src/views/ConfigurationDevelopmentView.vue
@@ -54,6 +54,12 @@
             thumb-label="hover"
           />
         </div>
+        <ExpansiblePanel :is-expanded="!interfaceStore.isOnPhoneScreen">
+          <template #title>MAVLink Inspector</template>
+          <template #content>
+            <MAVLinkInspector />
+          </template>
+        </ExpansiblePanel>
         <ExpansiblePanel :is-expanded="!interfaceStore.isOnPhoneScreen">
           <template #title>
             <div class="flex justify-between">
@@ -97,6 +103,7 @@ import { saveAs } from 'file-saver'
 import { onBeforeMount } from 'vue'
 import { ref } from 'vue'
 
+import MAVLinkInspector from '@/components/development/MAVLinkInspector.vue'
 import ExpansiblePanel from '@/components/ExpansiblePanel.vue'
 import { type SystemLog, cockpitSytemLogsDB } from '@/libs/system-logging'
 import { reloadCockpit } from '@/libs/utils'