Menu
▾
▴
[Emc-commit] master: gmoccapy_0_9_9_7_1 - renamed spindle hal pins
|
From: Norbert S. <gi...@gi...> - 2013-12-29 16:20:37
|
gmoccapy_0_9_9_7_1 - renamed spindle hal pins - renamed hal pin gscreen.hal_hbar_spindle_feedback to be gscreen.spindle_feedback_bar gscreen.hal_led_spindle_at_speed to be gscreen.spindle_at_speed_led This way all spindle pins are together in halshow http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=842f726 --- configs/sim/gmoccapy/gmoccapy_postgui.hal | 4 +-- share/gscreen/skins/gmoccapy/gmoccapy.glade | 46 ++++++++++++------------ share/gscreen/skins/gmoccapy/gmoccapy_handler.py | 20 +++++------ share/gscreen/skins/gmoccapy/release_notes.txt | 4 +++ 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/configs/sim/gmoccapy/gmoccapy_postgui.hal b/configs/sim/gmoccapy/gmoccapy_postgui.hal index dd1e22f..eb40ae9 100644 --- a/configs/sim/gmoccapy/gmoccapy_postgui.hal +++ b/configs/sim/gmoccapy/gmoccapy_postgui.hal @@ -2,8 +2,8 @@ # moccapy_postgui.hal file from Norbert Schechner # ################################################################### -net spindle-speed-limited gscreen.hal_hbar_spindle_feedback -net spindle-at-speed gscreen.hal_led_spindle_at_speed +net spindle-speed-limited gscreen.spindle_feedback_bar +net spindle-at-speed gscreen.spindle_at_speed_led unlinkp iocontrol.0.tool-change unlinkp iocontrol.0.tool-changed diff --git a/share/gscreen/skins/gmoccapy/gmoccapy.glade b/share/gscreen/skins/gmoccapy/gmoccapy.glade index 707743b..5a5e148 100755 --- a/share/gscreen/skins/gmoccapy/gmoccapy.glade +++ b/share/gscreen/skins/gmoccapy/gmoccapy.glade @@ -481,12 +481,12 @@ <object class="Combi_DRO" id="Combi_DRO_x"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> - <property name="dtg_color">#ffffffff0000</property> - <property name="rel_color">#000000000000</property> - <property name="abs_color">#00000000ffff</property> - <property name="homed_color">#0000ffff0000</property> <property name="font_size">28</property> + <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> + <property name="abs_color">#00000000ffff</property> + <property name="dtg_color">#ffffffff0000</property> + <property name="rel_color">#000000000000</property> <signal name="system_changed" handler="on_Combi_DRO_system_changed"/> <signal name="units_changed" handler="on_Combi_DRO_units_changed"/> <signal name="clicked" handler="on_Combi_DRO_clicked"/> @@ -499,13 +499,13 @@ <object class="Combi_DRO" id="Combi_DRO_y"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> - <property name="dtg_color">#ffffffff0000</property> - <property name="rel_color">#000000000000</property> - <property name="abs_color">#00000000ffff</property> - <property name="homed_color">#0000ffff0000</property> <property name="font_size">28</property> + <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> + <property name="abs_color">#00000000ffff</property> <property name="joint_number">1</property> + <property name="dtg_color">#ffffffff0000</property> + <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> <packing> @@ -516,13 +516,13 @@ <object class="Combi_DRO" id="Combi_DRO_z"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> - <property name="dtg_color">#ffffffff0000</property> - <property name="rel_color">#000000000000</property> - <property name="abs_color">#00000000ffff</property> - <property name="homed_color">#0000ffff0000</property> <property name="font_size">28</property> + <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> + <property name="abs_color">#00000000ffff</property> <property name="joint_number">2</property> + <property name="dtg_color">#ffffffff0000</property> + <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> <packing> @@ -533,13 +533,13 @@ <object class="Combi_DRO" id="Combi_DRO_4"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> - <property name="dtg_color">#ffffffff0000</property> - <property name="rel_color">#000000000000</property> - <property name="abs_color">#00000000ffff</property> - <property name="homed_color">#0000ffff0000</property> <property name="font_size">28</property> + <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> + <property name="abs_color">#00000000ffff</property> <property name="joint_number">3</property> + <property name="dtg_color">#ffffffff0000</property> + <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> <packing> @@ -1769,27 +1769,27 @@ <object class="GtkHBox" id="hbox_spindle_bar"> <property name="visible">True</property> <child> - <object class="HAL_HBar" id="hal_hbar_spindle_feedback"> + <object class="HAL_HBar" id="spindle_feedback_bar"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">The feedback spindle speed</property> + <property name="z1_border">0.80000001192092896</property> <property name="target_color">#0000ffff0000</property> <property name="z0_color">#0000ffff0000</property> - <property name="max">6000</property> + <property name="z0_border">0.40000000596046448</property> + <property name="text_template">%i</property> <property name="target_value">-0.039999999105930328</property> <property name="z1_color">#0000ffff0000</property> <property name="bg_color">#bebebebebebe</property> - <property name="z0_border">0.40000000596046448</property> - <property name="z1_border">0.80000001192092896</property> <property name="z2_color">#0000ffff0000</property> - <property name="text_template">%i</property> - <signal name="hal_pin_changed" handler="on_hal_hbar_spindle_feedback_hal_pin_changed"/> + <property name="max">6000</property> + <signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/> </object> <packing> <property name="position">0</property> </packing> </child> <child> - <object class="HAL_LED" id="hal_led_spindle_at_speed"> + <object class="HAL_LED" id="spindle_at_speed_led"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Indicates if the spindle is at speed</property> <property name="on_color">green</property> diff --git a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py index ac02b5c..bacd016 100755 --- a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py +++ b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py @@ -227,8 +227,8 @@ class HandlerClass: self.max_spindle_rev = self.gscreen.prefs.getpref("spindle_bar_max", 6000.0, float) self.widgets.adj_spindle_bar_min.set_value((self.min_spindle_rev)) self.widgets.adj_spindle_bar_max.set_value((self.max_spindle_rev)) - self.widgets.hal_hbar_spindle_feedback.set_property("min",float(self.min_spindle_rev)) - self.widgets.hal_hbar_spindle_feedback.set_property("max",float(self.max_spindle_rev)) + self.widgets.spindle_feedback_bar.set_property("min",float(self.min_spindle_rev)) + self.widgets.spindle_feedback_bar.set_property("max",float(self.max_spindle_rev)) # Window position and size self.widgets.adj_x_pos.set_value(self.gscreen.prefs.getpref("x_pos", 10, float)) @@ -1460,13 +1460,13 @@ class HandlerClass: if self.log: self.gscreen.add_alarm_entry("rbt_reverse_clicked") if self.widgets.rbt_reverse.get_active(): self.widgets.rbt_reverse.set_image(self.widgets.img_reverse_on) - self.widgets.hal_hbar_spindle_feedback.set_property("max",float(self.min_spindle_rev)*-1) - self.widgets.hal_hbar_spindle_feedback.set_property("min",float(self.max_spindle_rev)*-1) + self.widgets.spindle_feedback_bar.set_property("max",float(self.min_spindle_rev)*-1) + self.widgets.spindle_feedback_bar.set_property("min",float(self.max_spindle_rev)*-1) self._set_spindle(widget) else: self.widgets.rbt_reverse.set_image(self.widgets.img_reverse) - self.widgets.hal_hbar_spindle_feedback.set_property("min",float(self.min_spindle_rev)) - self.widgets.hal_hbar_spindle_feedback.set_property("max",float(self.max_spindle_rev)) + self.widgets.spindle_feedback_bar.set_property("min",float(self.min_spindle_rev)) + self.widgets.spindle_feedback_bar.set_property("max",float(self.max_spindle_rev)) def on_rbt_stop_clicked(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_stop_clicked") @@ -1476,8 +1476,8 @@ class HandlerClass: else: self.widgets.rbt_stop.set_image(self.widgets.img_sstop) - def on_hal_hbar_spindle_feedback_hal_pin_changed(self, widget, data=None): - self.widgets.lbl_spindle_act.set_text("S %s"%int(self.widgets.hal_hbar_spindle_feedback.value)) + def on_spindle_feedback_bar_hal_pin_changed(self, widget, data=None): + self.widgets.lbl_spindle_act.set_text("S %s"%int(self.widgets.spindle_feedback_bar.value)) def on_btn_spindle_100_clicked(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("btn_spindle_100_clicked") @@ -1506,13 +1506,13 @@ class HandlerClass: if self.log: self.gscreen.add_alarm_entry("Spindle bar min has been set to %s"%widget.get_value()) self.gscreen.prefs.putpref("spindle_bar_min", widget.get_value(),float) self.widgets.adj_spindle_bar_min.set_value(widget.get_value()) - self.widgets.hal_hbar_spindle_feedback.set_property("min",widget.get_value()) + self.widgets.spindle_feedback_bar.set_property("min",widget.get_value()) def on_adj_spindle_bar_max_value_changed(self, widget, data = None): if self.log: self.gscreen.add_alarm_entry("Spindle bar max has been set to %s"%widget.get_value()) self.gscreen.prefs.putpref("spindle_bar_max", widget.get_value(),float) self.widgets.adj_spindle_bar_max.set_value(widget.get_value()) - self.widgets.hal_hbar_spindle_feedback.set_property("max",widget.get_value()) + self.widgets.spindle_feedback_bar.set_property("max",widget.get_value()) def _update_spindle_btn(self): if self.emcstat.task_mode == _AUTO and self.interpreter == _RUN: diff --git a/share/gscreen/skins/gmoccapy/release_notes.txt b/share/gscreen/skins/gmoccapy/release_notes.txt index 63d0142..653c71b 100755 --- a/share/gscreen/skins/gmoccapy/release_notes.txt +++ b/share/gscreen/skins/gmoccapy/release_notes.txt @@ -1,6 +1,10 @@ ver 0.9.9.7.1 - replaced the hal_scale_jog_vel with a normal scale, as there is no need for a additional hal pin +- renamed hal pin + gscreen.hal_hbar_spindle_feedback to be gscreen.spindle_feedback_bar + gscreen.hal_led_spindle_at_speed to be gscreen.spindle_at_speed_led + This way all spindle pins are together in halshow ver. 0.9.9.7 - make gmoccapy react to external mode changes, i.e. start program with |