msp430_bsl 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4348c30b38b554c1acc4ae87bf794d41b5b0e093187b0d943a549524bbdb524e
-  data.tar.gz: ed9d5f99c55f4f773d30aada91db6e581a4b2a2659b68cf478da4c3c348f4aed
+  metadata.gz: 35aba075d912b2875eecabcebfc4325f54af1cd3085d23249e9e54949797fe89
+  data.tar.gz: 18e8e770e7259aac7c1585f38f94adaeba67689589363ba12f8a143b5fd1b66b
 SHA512:
-  metadata.gz: c6d2884fb6079fb1a5211803dfcb9793316a69556287ffd3ddec8d6c9f0fab2f4972484b1eb7bcd97bf9ebf3ce89e46ad113f640ddc8c717ddd8ac7ad0de2724
-  data.tar.gz: 642e82aa7eb54c4b60b81f02e311b40e3891820e1b67e0ec51c120f4d99e10af9ae2714375aea899eac64e9bd0c668d09161e9716f768ae86f7075bce31d26a9
+  metadata.gz: 95a9fd34842399eb965857bb83284d82d4f3a8b72f8912459c92f3dd57402c2d4599f9671b95c7bb91ad82595bc1326151f8bcdda0787aab069eb1bbaf58051f
+  data.tar.gz: c24a4ba28dffbda9f6404c7bcbdfc2155cfe3a17c6f2c49d39a33c1c8fcdeb5e625c18f254d376e74e425b23d3c092c09bc912ffaecb4ff5ed16316371c599db

data/bin/upload_hex

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-Bundler.require
 require 'slop'
 require_relative '../lib/msp430_bsl'
 
@@ -10,7 +8,6 @@ STDOUT.sync = true
 
 include Msp430Bsl::Utils
 
-HIGH_SPEED_UART_BAUD = 115200.freeze
 MAX_WRITE_ATTEMPTS = 3
 
 @opts = {}
@@ -19,9 +16,10 @@ begin
     o.string '-d', '--device', 'Mandatory: Path to serial programmer device', required: true
     o.string '-f', '--hexfile', 'Mandatory: Path to HEX file to load', required: true
     o.string '-g', '--logfile', 'Path to logfile'
-    o.string '-l', '--loglevel', "Logger level. One of ['fatal', 'error', 'warn', 'info', 'debug']. Defaults to 'debug'", default: :debug
-    o.bool '-e', '--erase_info', 'Erase info memory', default: false  # TODO: implement
-    o.bool '-c', '--check', 'Verify flash content after each data block write', default: true
+    o.string '-l', '--loglevel', "Logger level. One of ['fatal', 'error', 'warn', 'info', 'debug']. Default: 'debug'", default: :debug
+    o.integer '-b', '--baud', 'BAUD rate with which communicate to BSL. Default: 115200', default: 115200
+    o.bool '-e', '--erase_info', 'Erase info memory. Default: false', default: false  # TODO: implement
+    o.bool '-c', '--check', 'Verify flash content after each data block write. Default: true', default: true
     o.bool '-h', '--help', 'Print this help' do
       puts "#{o}\n"
       exit
@@ -37,6 +35,12 @@ end
 
 logger = build_logger_from @opts
 
+unless Msp430Bsl::Configs::BAUD_RATES.include? @opts[:baud]
+  logger.error "BAUD rate #{@opts[:baud]} not supported. Available BAUD rates: #{ Msp430Bsl::Configs::BAUD_RATES.join ', ' }"
+  exit
+end
+
+# Build UART Connection
 @board = Msp430Bsl::Uart::Connection.new @opts[:device], logger: logger
 
 # Enter BSL
@@ -48,9 +52,9 @@ logger.info 'Mass erasing FLASH'
 logger.info "Unlocking BSL's password protected commands"
 @board.send_command :rx_password, data: Msp430Bsl::Configs::CMD_RX_PASSWORD
 # Switch UART to max speed
-logger.info 'Changing UART BAUD to 115200'
-@board.send_command :change_baud_rate, data: Msp430Bsl::Configs::BAUD_RATES[HIGH_SPEED_UART_BAUD]
-@board.set_uart_speed HIGH_SPEED_UART_BAUD
+logger.info "Changing UART BAUD to #{@opts[:baud]}"
+@board.send_command :change_baud_rate, data: Msp430Bsl::Configs::BAUD_RATES[@opts[:baud]]
+@board.set_uart_speed @opts[:baud]
 
 # If everything has gone well so far...
 hexfile = Msp430Bsl::HexFile.new @opts[:hexfile]
@@ -122,3 +126,4 @@ end
 
 logger.info 'Closing connection'
 @board.close_connection
+logger.info 'Upload done!'

data/lib/msp430_bsl/uart/connection.rb

@@ -8,12 +8,12 @@ module Msp430Bsl
 
       UART_CONFIGS = { data_bits: 8, stop_bits: 1, parity: SerialPort::EVEN }.transform_keys(&:to_s).freeze
 
-      WAIT_FOR_ACK_MAX      = 100.millis
-      WAIT_FOR_RESPONSE_MAX = 100.millis
+      WAIT_FOR_ACK_MAX      = 1000.millis
+      WAIT_FOR_RESPONSE_MAX = 1000.millis
 
       MEM_START_MAIN_FLASH      = 0x8000
 
-      CORE_COMMANDS_BUFFER_SIZE     = 260
+      CORE_COMMANDS_BUFFER_SIZE = 260
 
       attr_reader :serial_port, :device_path, :logger, :cmd_buff_size
 
@@ -23,6 +23,7 @@ module Msp430Bsl
         @cmd_buff_size = opts.fetch :cmd_buf_size, CORE_COMMANDS_BUFFER_SIZE
 
         @serial_port = SerialPort.new @device_path
+        @serial_port.flow_control = SerialPort::NONE
       end
 
       def close_connection

data/lib/msp430_bsl/uart/exceptions.rb

@@ -13,7 +13,11 @@ module Msp430Bsl
         end
         class MessageNotSupported < StandardError
           def initialize(value)
-            message = "message with value 0x#{value.to_hex_str} not supported"
+            message = if value
+                        "message with value 0x#{value.to_hex_str} not supported"
+                      else
+                        "message without a value"
+                      end
             super(message)
           end
         end

data/lib/msp430_bsl/version.rb

@@ -1,3 +1,3 @@
 module Msp430Bsl
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msp430_bsl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Texas Instrument MSP430 BSL Ruby library