Merge pull request #31 from PepperlFuchs/fix-dyn-params

fix ip_mode and layer_on
PepperlFuchs · Sep 25, 2020 · 5dd6919 · 5dd6919
2 parents 330a042 + c453707
commit 5dd6919
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pf_driver/cfg/PFDriverR2300.cfg b/pf_driver/cfg/PFDriverR2300.cfg
@@ -8,18 +8,18 @@ from dynamic_reconfigure.parameter_generator_catkin import *
 #----------R2300 Parameters------------------------------------------------------
 gen_r2300 = ParameterGenerator()
 
-ip_mode_enum = gen_r2300.enum([ gen_r2300.const("static", int_t, 0, "Static IP mode"),
-                          gen_r2300.const("dhcp",   int_t, 1, "DHCP IP mode"),
-                          gen_r2300.const("autoip", int_t, 2, "AutoIP mode")],
+ip_mode_enum = gen_r2300.enum([ gen_r2300.const("static", str_t, "static", "Static IP mode"),
+                          gen_r2300.const("dhcp",   str_t, "dhcp", "DHCP IP mode"),
+                          gen_r2300.const("autoip", str_t, "autoip", "AutoIP mode")],
                          "An enum to set IP mode")
-gen_r2300.add("ip_mode",              int_t,    1, "ip_mode value determines the method used by the device to determine its own IP and network conﬁguration.", 2, edit_method=ip_mode_enum)
+gen_r2300.add("ip_mode",              str_t,    1, "ip_mode value determines the method used by the device to determine its own IP and network conﬁguration.", "autoip", edit_method=ip_mode_enum)
 gen_r2300.add("ip_address",           str_t,    2, "IP address", "10.0.10.76")
 gen_r2300.add("subnet_mask",          str_t,    3, "IP netmask", "255.0.0.0")
 gen_r2300.add("gateway",              str_t,    4, "IP gateway", "0.0.0.0")
 gen_r2300.add("user_tag",             str_t,    5, "Short UTF8 string for user purposes, up to 32 bytes not chars! (32 chars on R2000)", "OMD10M-R2300")
 
 layer_enum = gen_r2300.enum([ gen_r2300.const("on_on_on_on",     str_t, "on,on,on,on", ""),
-                        gen_r2300.const("on_on_on_off",    str_t, "on_on_on_off", ""),
+                        gen_r2300.const("on_on_on_off",    str_t, "on,on,on,off", ""),
                         gen_r2300.const("on_on_off_on",    str_t, "on,on,off,on", ""),
                         gen_r2300.const("on_on_off_off",   str_t, "on,on,off,off", ""),
                         gen_r2300.const("on_off_on_on",    str_t, "on,off,on,on", ""),