hardsploit_gui 2.2 → 2.3

data/lib/class/Import.rb

@@ -0,0 +1,193 @@
+#===================================================
+#  Hardsploit GUI - By Opale Security
+#  www.opale-security.com || www.hardsploit.io
+#  License: GNU General Public License v3
+#  License URI: http://www.gnu.org/licenses/gpl.txt
+#===================================================
+
+require 'json'
+require_relative '../gui/gui_import'
+class Import < Qt::Widget
+  slots 'import()'
+  slots 'import_file()'
+
+  def initialize(cm, chip = 'none')
+    super()
+    @import_ui = Ui_Import.new
+    centerWindow(self)
+    @import_ui.setupUi(self)
+    @chip = chip
+    @cm = cm
+    @import_ui.lbl_import.setText("Import:")
+  end
+
+  def import_file
+    @filepath = Qt::FileDialog.getOpenFileName(
+      self,
+      tr('Select a file'),
+      '/',
+      tr('JSON file (*.json)')
+    )
+  end
+
+  def import
+    unless @filepath.nil?
+      @file = File.read("#{@filepath}")
+      data_hash = JSON.parse(@file)
+      data_hash.each_with_index do |element, index|
+        @data_chip = element[1]['chip']
+        @data_commands =  element[1]['commands']
+        if @import_ui.rbn_both.isChecked
+            import_chip
+            import_commands
+        elsif @import_ui.rbn_comp.isChecked
+            import_chip
+        else
+            import_commands
+        end
+      end
+      @cm.feed_chip_array
+      Qt::MessageBox.new(
+        Qt::MessageBox::Information,
+        'Import status',
+        'Import complete'
+      ).exec
+      self.close
+    else
+      Qt::MessageBox.new(
+        Qt::MessageBox::Warning,
+        'File missing',
+        'Choose a file before importing'
+      ).exec
+    end
+  end
+
+  def import_package
+    package = Package.new
+    package.from_json(@data_chip['package'].to_json)
+    if Package.exists?(name: package.name)
+      return Package.find_by(name: package.name).id
+    else
+      Package.last.nil? ? package.id = 1 : package.id = Package.last.id.next
+      package.save
+      return package.id
+    end
+  end
+
+  def import_type
+    chip_type = ChipType.new
+    chip_type.from_json(@data_chip['chip_type'].to_json)
+    if ChipType.exists?(name: chip_type.name)
+      return ChipType.find_by(name: chip_type.name).id
+    else
+      ChipType.last.nil? ? chip_type.id = 1 : chip_type.id = ChipType.last.id.next
+      chip_type.save
+      return chip_type.id
+    end
+  end
+
+  def import_manufacturer
+    manufacturer = Manufacturer.new
+    manufacturer.from_json(@data_chip['manufacturer'].to_json)
+    if Manufacturer.exists?(name: manufacturer.name)
+      return Manufacturer.find_by(name: manufacturer.name).id
+    else
+      Manufacturer.last.nil? ? manufacturer.id = 1 : manufacturer.id = Manufacturer.last.id.next
+      manufacturer.save
+      return manufacturer.id
+    end
+  end
+
+  def import_chip
+    @chip = Chip.new
+    @chip.from_json(@data_chip['characteristics'].to_json)
+    if Chip.exists?(reference: @chip.reference)
+      Qt::MessageBox.new(
+        Qt::MessageBox::Warning,
+        'Import aborted',
+        'This component already exists'
+      ).exec
+      return 0
+    else
+      Chip.last.nil? ? @chip.id = 1 : @chip.id = Chip.last.id.next
+      @chip.package_id = import_package
+      @chip.chip_type_id = import_type
+      @chip.manufacturer_id = import_manufacturer
+      @chip.save
+      import_parallel_settings unless @data_chip['settings']['parallel'].nil?
+      import_spi_settings unless @data_chip['settings']['spi'].empty?
+      import_i2c_settings unless @data_chip['settings']['i2c'].empty?
+      import_swd_settings unless @data_chip['settings']['swd'].empty?
+      import_uart_settings unless @data_chip['settings']['uart'].empty?
+      import_pins
+    end
+  end
+
+  def import_pins
+    @data_chip['pins'].each do |data_pin|
+      pin = Pin.new
+      pin.from_json(data_pin.to_json)
+      pin.chip_id = @chip.id
+      Pin.last.nil? ? pin.id = 1 : pin.id = Pin.last.id.next
+      pin.save
+    end
+  end
+
+  def import_parallel_settings
+    parallel_settings = ParallelSetting.new
+    parallel_settings.from_json(@data_chip['settings']['parallel'].to_json)
+    parallel_settings.chip_id = @chip.id
+    ParallelSetting.last.nil? ? parallel_settings.id = 1 : parallel_settings.id = ParallelSetting.last.id.next
+    parallel_settings.save
+  end
+
+  def import_spi_settings
+    spi_settings = SpiSetting.new
+    spi_settings.from_json(@data_chip['settings']['spi'].to_json)
+    spi_settings.chip_id = @chip.id
+    SpiSetting.last.nil? ? spi_settings.id = 1 : spi_settings.id = SpiSetting.last.id.next
+    spi_settings.save
+  end
+
+  def import_i2c_settings
+    i2c_settings = I2cSetting.new
+    i2c_settings.from_json(@data_chip['settings']['i2c'].to_json)
+    i2c_settings.chip_id = @chip.id
+    I2cSetting.last.nil? ? i2c_settings.id = 1 : i2c_settings.id = I2cSetting.last.id.next
+    i2c_settings.save
+  end
+
+  def import_swd_settings
+    swd_settings = SwdSetting.new
+    swd_settings.from_json(@data_chip['settings']['swd'].to_json)
+    swd_settings.chip_id = @chip.id
+    SwdSetting.last.nil? ? swd_settings.id = 1 : swd_settings.id = SwdSetting.last.id.next
+    swd_settings.save
+  end
+
+  def import_uart_settings
+    uart_settings = UartSetting.new
+    uart_settings.from_json(@data_chip['settings']['uart'].to_json)
+    uart_settings.chip_id = @chip.id
+    UartSetting.last.nil? ? uart_settings.id = 1 : uart_settings.id = UartSetting.last.id.next
+    uart_settings.save
+  end
+
+  def import_commands
+    return 0 if @data_commands.empty?
+    @data_commands.each do |cmd_element|
+      cmd = Command.new
+      cmd.from_json(cmd_element[1]['characteristics'].to_json)
+      Command.last.nil? ? cmd.id = 1 : cmd.id = Command.last.id.next
+      cmd.chip_id = @chip.id
+      cmd.save
+      cmd_element[1]['bytes'].each do |byte_element|
+        byte = Byte.new
+        byte.from_json(byte_element.to_json)
+        Byte.last.nil? ? byte.id = 1 : byte.id = Byte.last.id.next
+        byte.command_id = cmd.id
+        byte.save
+      end
+    end
+  end
+end

data/lib/class/Progress_bar.rb

@@ -14,6 +14,7 @@ class Progress_bar < Qt::Widget
     centerWindow(self)
     @pgb_ui.setupUi(self)
     self.update_status(status)
+    @pgb_ui.lbl_close.setEnabled(false)
     self.display_time("Total duration:")
   end
 

data/lib/class/Signal_mapper.rb

@@ -0,0 +1,120 @@
+#===================================================
+#  Hardsploit GUI - By Opale Security
+#  www.opale-security.com || www.hardsploit.io
+#  License: GNU General Public License v3
+#  License URI: http://www.gnu.org/licenses/gpl.txt
+#===================================================
+
+require_relative '../gui/gui_signal_mapper'
+class Signal_mapper < Qt::Widget
+  slots 'check_mapping_value(QTableWidgetItem*)'
+  slots 'update_map_table(QString)'
+  slots 'save_signal_mapping()'
+
+  def initialize
+    super()
+    @view = Ui_Signal_mapper.new
+    centerWindow(self)
+    @view.setupUi(self)
+    init_bus_list
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def init_bus_list
+    Bus.all.each do |b|
+      @view.cbx_bus.addItem(b.name) unless b.name == "NA"
+    end
+  end
+
+  def check_mapping_value(item)
+    if item.column == 1
+      item.setText(item.text.upcase)
+      reg = Qt::RegExp.new("^[A-H]{1}[0-7]${1}")
+      reg_val = Qt::RegExpValidator.new(reg, self)
+      if reg_val.validate(item.text, item.text.length) == Qt::Validator::Invalid || item.text.nil?
+        item.setText('')
+        Qt::MessageBox.new(
+          Qt::MessageBox::Warning,
+          'Wrong data',
+          'Only values from A0 to H7 are accepted in this cell'
+        ).exec
+      end
+    end
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def update_map_table(bus_name)
+    unless bus_name == 'Bus...'
+      @view.map_table.clearContents
+      @view.map_table.setRowCount(0)
+      Bus.find_by(name: bus_name).signalls.each do |s|
+        @view.map_table.insertRow(@view.map_table.rowCount)
+        signal_cell = Qt::TableWidgetItem.new(s.name)
+        signal_cell.setFlags(Qt::ItemIsEnabled)
+        @view.map_table.setItem(@view.map_table.rowCount - 1, 0, signal_cell)
+        pin_cell = Qt::TableWidgetItem.new(s.pin)
+        @view.map_table.setItem(@view.map_table.rowCount - 1, 1, pin_cell)
+      end
+      resize_to_content
+    end
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def save_signal_mapping
+    return 0 unless are_values_ok?
+    @view.map_table.rowCount.times do |i|
+      current_signal = Signall.find_by(name: @view.map_table.item(i, 0).text)
+      if current_signal.name != @view.map_table.item(i, 1).text
+        current_signal.update(pin: @view.map_table.item(i, 1).text)
+      end
+    end
+    Qt::MessageBox.new(
+      Qt::MessageBox::Information,
+      'Save mapping',
+      'Pin mapping saved successfuly'
+    ).exec
+    close
+  end
+
+  def are_values_ok?
+    pins = []
+    @view.map_table.rowCount.times do |i|
+      pins.push(@view.map_table.item(i, 1).text)
+    end
+    return true if check_empty(pins) && check_duplicate(pins)
+  end
+
+  def check_empty(pins)
+    return true unless pins.include?('')
+    @view.map_table.setCurrentItem(@view.map_table.item(pins.index(''), 1))
+		Qt::MessageBox.new(
+      Qt::MessageBox::Warning,
+      'Empty pin',
+      'Empty pin value detected'
+    ).exec
+    return false
+  end
+
+  def check_duplicate(pins)
+    duplicate = pins.inject(Hash.new(0)) {|ha, e| ha[e] += 1 ; ha}.delete_if {|k, v| v == 1}.keys
+    unless duplicate.empty?
+      @view.map_table.setCurrentItem(@view.map_table.item(pins.index(duplicate[0]), 1))
+      Qt::MessageBox.new(
+        Qt::MessageBox::Warning,
+        'Wrong value',
+        "Duplicate values detected: #{duplicate[0]}"
+      ).exec
+      return false
+    end
+    return true
+  end
+
+  def resize_to_content
+    @view.map_table.resizeColumnsToContents
+    @view.map_table.resizeRowsToContents
+    @view.map_table.horizontalHeader.stretchLastSection = true
+  end
+end

data/lib/class/Wire_helper.rb

@@ -5,126 +5,39 @@
 #  License URI: http://www.gnu.org/licenses/gpl.txt
 #===================================================
 
-require_relative '../HardsploitAPI/HardsploitAPI'
 require_relative '../gui/gui_wire_helper'
+require_relative '../HardsploitAPI/Core/HardsploitAPI'
 
 class Wire_helper < Qt::Widget
   slots 'rotate_scene()'
 
-  def initialize(chip, api)
+  def initialize(chip)
     super()
     @wire_helper_gui = Ui_Wire_helper.new
     centerWindow(self)
     @wire_helper_gui.setupUi(self)
     @chip = chip
-    @api = api
-
-    # Default led position
-    api.setWiringLeds(0x0000000000000000)
-
-    # Draw the chip
-    scene = Qt::GraphicsScene.new
-    @wire_helper_gui.lbl_chip.setText("Your chip (#{chip.chip_reference}):")
-
-    # Get the pin total number
-    # UniqPin parameters: (scene, pinNum, pinChip, xSig, ySig, xNum, yNum, xRect, yRect, wRect, hRect, rotation)
-    total_pin_nbr = Pin.where(pin_chip: @chip.chip_id).count
-    # If it's a square
-    if Package.find_by(package_id: chip.chip_package).package_shape == 0
-      pin_by_side = total_pin_nbr / 4
-      cHeight = 14*(pin_by_side + 4)  # Chip's height (+4 because we add a space equal to one pin for each corner)
-      scene.addRect(Qt::RectF.new(0, 0, cHeight, cHeight))
-      y = 32
-      y2 = cHeight - 38
-      x = 32
-      x2 = cHeight - 38
-      (1..total_pin_nbr).each do |i|
-        # Face 1
-        if i <= pin_by_side
-          ySig = y
-          yNum = y
-          UniqPin.new(scene, i, @chip.chip_id, -70, ySig - 12, 0, yNum - 12, 0, y, -20, 6, false, api)
-          y = y + 14 # Space between each pin
-        elsif i > pin_by_side && i <= total_pin_nbr / 2
-        # Face 2
-          xSig2 = x
-          xNum2 = x
-          UniqPin.new(scene, i, @chip.chip_id, xSig2 - 12, cHeight + 55, xNum2 - 12, cHeight, x, cHeight, 6, 20, true, api)
-          x = x + 14
-        elsif i > total_pin_nbr / 2 && i <= (total_pin_nbr - (pin_by_side))
-        # Face 3
-          xSig = cHeight + 24
-          ySig = y2
-          yNum = y2
-
-          if i < 10
-            xNum = cHeight - 20
-          elsif i >= 10 && i < 100
-            xNum = cHeight - 25
-          else
-            xNum = cHeight - 35
-          end
-          UniqPin.new(scene, i, @chip.chip_id, xSig, ySig - 12, xNum, yNum - 12, cHeight, y2, 20, 6, false, api)
-          y2 = y2 - 14
-        else
-        # Face 4
-          xSig2 = x2
-          xNum2 = x2
-
-          if i < 10
-            yNum2 = 20
-          elsif i >= 10 && i < 100
-            yNum2 = 30
-          else
-            yNum2 = 40
-          end
-          UniqPin.new(scene, i, @chip.chip_id, xSig2 - 12, -20, xNum2 - 12, yNum2, x2, 0, 6, -20, true, api)
-          x2 = x2 - 14
-        end
-      end
-    # If it's a rectangle
-    else
-      pin_by_side = total_pin_nbr / 2
-      cHeight = 14 * (pin_by_side + 2) # +2 because we add a space equal to one pin for each corner
-      scene.addRect(Qt::RectF.new(0, 0, cHeight, cHeight))
-      # Add the pins + text
-      y = 18
-      y2 = cHeight - 24
-      (1..total_pin_nbr).each do |i|
-        # Face 1
-        if i <= total_pin_nbr / 2
-          ySig = y
-          yNum = y
-          UniqPin.new(scene, i, @chip.chip_id, -70, ySig - 12, 0, yNum - 12, 0, y, -20, 6, false, api)
-          y = y + 14
-        # Face 2
-        else
-          xSig = cHeight + 24
-          ySig = y2
-          yNum = y2
-
-          if i < 10
-            xNum = cHeight - 20
-          elsif i >= 10 && i < 100
-            xNum = cHeight - 25
-          else
-            xNum = cHeight - 35
-          end
-          UniqPin.new(scene, i, @chip.chip_id, xSig, ySig - 12, xNum, yNum - 12, cHeight, y2, 20, 6, false, api)
-          y2 = y2 - 14
-        end
-      end
-    end
-    # Draw!
-    @wire_helper_gui.gView.setScene(scene)
+    HardsploitAPI.instance.setWiringLeds(value: 0x0000000000000000)
+    @scene = Qt::GraphicsScene.new
+    @wire_helper_gui.lbl_chip.setText("Your chip (#{chip.reference}):")
+    Package.find_by(id: chip.package_id).shape.zero? ? draw_square : draw_rect
+    @wire_helper_gui.gView.setScene(@scene)
+  rescue HardsploitAPI::ERROR::HARDSPLOIT_NOT_FOUND
+    ErrorMsg.new.hardsploit_not_found
+  rescue HardsploitAPI::ERROR::USB_ERROR
+    ErrorMsg.new.usb_error
   rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while drawing the chip. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def closeEvent(event)
-    @api.setWiringLeds(0xFF00FF00FF00FF00)
+    HardsploitAPI.instance.setWiringLeds(value: 0xFF00FF00FF00FF00)
+  rescue HardsploitAPI::ERROR::HARDSPLOIT_NOT_FOUND
+    ErrorMsg.new.hardsploit_not_found
+  rescue HardsploitAPI::ERROR::USB_ERROR
+    ErrorMsg.new.usb_error
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def rotate_scene
@@ -132,13 +45,104 @@ class Wire_helper < Qt::Widget
   end
 end
 
+def draw_square
+  total_pin_nbr = Pin.where(chip_id: @chip.id).count
+  pin_by_side = total_pin_nbr / 4
+  cHeight = 14*(pin_by_side + 4)  # Chip's height (+4 because we add a space equal to one pin for each corner)
+  @scene.addRect(Qt::RectF.new(0, 0, cHeight, cHeight))
+  y = 32
+  y2 = cHeight - 38
+  x = 32
+  x2 = cHeight - 38
+  (1..total_pin_nbr).each do |i|
+    # Face 1
+    if i <= pin_by_side
+      ySig = y
+      yNum = y
+      UniqPin.new(@scene, i, @chip.id, -70, ySig - 12, 0, yNum - 12, 0, y, -20, 6, false)
+      y = y + 14 # Space between each pin
+    elsif i > pin_by_side && i <= total_pin_nbr / 2
+    # Face 2
+      xSig2 = x
+      xNum2 = x
+      UniqPin.new(@scene, i, @chip.id, xSig2 - 12, cHeight + 55, xNum2 - 12, cHeight, x, cHeight, 6, 20, true)
+      x = x + 14
+    elsif i > total_pin_nbr / 2 && i <= (total_pin_nbr - (pin_by_side))
+    # Face 3
+      xSig = cHeight + 24
+      ySig = y2
+      yNum = y2
+
+      if i < 10
+        xNum = cHeight - 20
+      elsif i >= 10 && i < 100
+        xNum = cHeight - 25
+      else
+        xNum = cHeight - 35
+      end
+      UniqPin.new(@scene, i, @chip.id, xSig, ySig - 12, xNum, yNum - 12, cHeight, y2, 20, 6, false)
+      y2 = y2 - 14
+    else
+    # Face 4
+      xSig2 = x2
+      xNum2 = x2
+
+      if i < 10
+        yNum2 = 20
+      elsif i >= 10 && i < 100
+        yNum2 = 30
+      else
+        yNum2 = 40
+      end
+      UniqPin.new(@scene, i, @chip.id, xSig2 - 12, -20, xNum2 - 12, yNum2, x2, 0, 6, -20, true)
+      x2 = x2 - 14
+    end
+  end
+end
+
+def draw_rect
+  total_pin_nbr = Pin.where(chip_id: @chip.id).count
+  pin_by_side = total_pin_nbr / 2
+  cHeight = 14 * (pin_by_side + 2) # +2 because we add a space equal to one pin for each corner
+  @scene.addRect(Qt::RectF.new(0, 0, cHeight, cHeight))
+  # Add the pins + text
+  y = 18
+  y2 = cHeight - 24
+  (1..total_pin_nbr).each do |i|
+    # Face 1
+    if i <= total_pin_nbr / 2
+      ySig = y
+      yNum = y
+      UniqPin.new(@scene, i, @chip.id, -70, ySig - 12, 0, yNum - 12, 0, y, -20, 6, false)
+      y = y + 14
+    # Face 2
+    else
+      xSig = cHeight + 24
+      ySig = y2
+      yNum = y2
+
+      if i < 10
+        xNum = cHeight - 20
+      elsif i >= 10 && i < 100
+        xNum = cHeight - 25
+      else
+        xNum = cHeight - 35
+      end
+      UniqPin.new(@scene, i, @chip.id, xSig, ySig - 12, xNum, yNum - 12, cHeight, y2, 20, 6, false)
+      y2 = y2 - 14
+    end
+  end
+end
+
+
 #
 # Custom Item - To trigger events on the graphics text items
 #
 class CustomItem < Qt::GraphicsTextItem
 
-  def setPin(upin)
+  def setPin(upin, api_value)
     @UPin = upin
+    @api_value = api_value
   end
 
   def boundingRect
@@ -149,73 +153,55 @@ class CustomItem < Qt::GraphicsTextItem
     return rect
   end
 
-  def mouseDoubleClickEvent(event)
-    begin
+  def mousePressEvent(event)
       pin = self.instance_variable_get('@UPin')
       pin.setColor
-      pin.instance_variable_get('@api').signalHelpingWiring(pin.instance_variable_get('@signalId'))
       pin.instance_variable_get('@signalTxt').clearFocus
       pin.instance_variable_get('@nbrTxt').clearFocus
-    rescue
-      pin.instance_variable_get('@api').setWiringLeds(0x0000000000000000)
+      return false if @api_value == 'NA'
+      pin_group = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
+      hardsploit_pin_number = pin_group.index(@api_value.pin[0]) * 8 + @api_value.pin[1].to_i
+      HardsploitAPI.instance.setWiringLeds(value: 2**hardsploit_pin_number)
+    rescue HardsploitAPI::ERROR::HARDSPLOIT_NOT_FOUND
+      ErrorMsg.new.hardsploit_not_found
+    rescue HardsploitAPI::ERROR::USB_ERROR
+      ErrorMsg.new.usb_error
+    rescue Exception => msg
+      HardsploitAPI.instance.setWiringLeds(value: 0x0000000000000000)
       pin.instance_variable_get('@signalTxt').clearFocus
       pin.instance_variable_get('@nbrTxt').clearFocus
-      Qt::MessageBox.new(Qt::MessageBox::Critical, 'Signal not found', 'This signal is not handled by the board').exec
     end
-  end
 
-  def mousePressEvent(event)
-    begin
+    def mouseDoubleClickEvent(event)
       pin = self.instance_variable_get('@UPin')
-      pin.setColor
-      pin.instance_variable_get('@api').signalHelpingWiring(pin.instance_variable_get('@signalId'))
       pin.instance_variable_get('@signalTxt').clearFocus
       pin.instance_variable_get('@nbrTxt').clearFocus
-    rescue
-      pin.instance_variable_get('@api').setWiringLeds(0x0000000000000000)
-      pin.instance_variable_get('@signalTxt').clearFocus
-      pin.instance_variable_get('@nbrTxt').clearFocus
-      Qt::MessageBox.new(Qt::MessageBox::Critical, 'Signal not found', 'This signal is not handled by the board').exec
     end
-  end
 end
 
 #
 # UniqPin - Contain all data linked to one pin on the graphic
 #
 class UniqPin
-  def initialize(scene, pinNum, pinChip, xSig, ySig, xNum, yNum, xRect, yRect, wRect, hRect, rotation, api)
-    currentPin = Pin.where(pin_number: pinNum, pin_chip: pinChip).pluck(:pin_signal)[0]
-    currentSignal = Signall.where(signal_id: currentPin).pluck(:signal_name)[0]
-    # Set the signal id
-    @signalId = currentSignal
-
-    @api = api
-    # Signal text
-    @signalTxt = CustomItem.new(currentSignal)
+  def initialize(scene, pinNum, pinChip, xSig, ySig, xNum, yNum, xRect, yRect, wRect, hRect, rotation)
+    signal_name = Pin.find_by(number: pinNum, chip_id: pinChip).signall
+    @signalTxt = CustomItem.new(signal_name.name)
     @signalTxt.cursor = Qt::Cursor.new(Qt::PointingHandCursor)
-    @signalTxt.setPin(self)
+    @signalTxt.setPin(self, signal_name)
     @signalTxt.setTextInteractionFlags(Qt::TextSelectableByMouse)
     @signalTxt.setX(xSig)
     @signalTxt.setY(ySig)
-    if rotation
-      @signalTxt.rotation = 270.00
-    end
+    @signalTxt.rotation = 270.00 if rotation
     scene.addItem(@signalTxt)
 
-    # Number text
     @nbrTxt = CustomItem.new(pinNum.to_s)
     @nbrTxt.cursor = Qt::Cursor.new(Qt::PointingHandCursor)
-    @nbrTxt.setPin(self)
+    @nbrTxt.setPin(self, pinNum.to_s)
     @nbrTxt.setTextInteractionFlags(Qt::TextSelectableByMouse)
     @nbrTxt.setX(xNum)
     @nbrTxt.setY(yNum)
-    if rotation
-      @nbrTxt.rotation = 270.00
-    end
+    @nbrTxt.rotation = 270.00 if rotation
     scene.addItem(@nbrTxt)
-
-    # Pin graphic
     @pinGraphItem = scene.addRect(xRect, yRect, wRect, hRect)
   end
 
@@ -223,10 +209,8 @@ class UniqPin
     # Colors
     @on = Qt::Color.new(0, 0, 255)
     @off = Qt::Color.new(0, 0, 0)
-    # Disable the pin if a pin is already enabled
-    unless $pinEnabled.nil?
-      $pinEnabled.unsetColor
-    end
+    # Disable the pin if another pin is already enabled
+    $pinEnabled.unsetColor unless $pinEnabled.nil?
     # Light the new pin
     @nbrTxt.setDefaultTextColor(@on)
     @signalTxt.setDefaultTextColor(@on)