e43ea7fc conflict mess up fix

2026-03-22 15:05:03 +01:00 · 2019-10-12 19:53:42 +02:00
parent e43ea7fcfe
commit 0e20ec7f08
5 changed files with 680 additions and 404 deletions
--- a/command.h
+++ b/command.h
@@ -126,6 +126,7 @@ enum class user_command {
    radiochanneldecrease,
    radiostopsend,
    radiostoptest,
+    radiocall3send,
    cabchangeforward,
    cabchangebackward,

@@ -237,6 +238,7 @@ enum class user_command {
 	springbrakeshutoffenable,
 	springbrakeshutoffdisable,
 	springbrakerelease,
+    distancecounteractivate,
 	speedcontrolincrease,
 	speedcontroldecrease,
 	speedcontrolpowerincrease,