msp430_bsl 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04be185fd24cfefaaf6f4d2ca3c0aa5fc919b912aebd0db25e0ac71a4308d10e
-  data.tar.gz: 228d4f5fe568b5d22e1072d169f8e5292803639b994a407872ed05ef93ad8ee5
+  metadata.gz: 6f8dd8c87262211f1ebb94d9399262f04b57d713d02e78c5b0409ef21d01fe55
+  data.tar.gz: 58a14360aa3a75747cb57a1c74f73ce9ac2509169e1ccb661328632a720316be
 SHA512:
-  metadata.gz: f3597deabec5b77da55ae9d5d89f577c09d351fe4bf376178927c3b8d90f957d3e64e6b8d8a0430a6249c1fb0cc27d9ff0c62d1d3620ee34c4c09aa57d3f8060
-  data.tar.gz: 88c10187a3049aa22a9a3083341399b683d5ad0475e4bbb6d292430f2fdf7ead9b5e723f359442e4706f31d828912a4ae8d5d1f105c19d09e5b5ee38cfb034cf
+  metadata.gz: 634b16289e8c5ba1d14c207e0f57f4a51e057a87081d3a699e18e145c09d23432a09c55317e7e19d5eb26d97dcb51eb3f87d156aa6834e1d0b322e58ab244a75
+  data.tar.gz: 42ee1e8a9b67ea7a316f429a4ba70784f58b1513548fb1e29ba0da476c3dd67d271701480da31e9177af6920ac72b291230665a01243ffe3a413d934fbb264ae

data/bin/upload_hex

@@ -10,7 +10,6 @@ STDOUT.sync = true
 
 include Msp430Bsl::Utils
 
-HIGH_SPEED_UART_BAUD = 115200.freeze
 MAX_WRITE_ATTEMPTS = 3
 
 @opts = {}
@@ -19,9 +18,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 +37,7 @@ end
 
 logger = build_logger_from @opts
 
+# Build UART Connection
 @board = Msp430Bsl::Uart::Connection.new @opts[:device], logger: logger
 
 # Enter BSL
@@ -48,9 +49,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]
@@ -98,7 +99,7 @@ line_groups.each do |group|
     if curr_data_packet.empty?
       # Use current line's addr as packet addr
       curr_data_packet << line
-      curr_data_size += 2 + line.data_length  # 2 is the addr size (2 bytes)
+      curr_data_size += line.data_length + Msp430Bsl::Uart::PeripheralInterface::TOTAL_SIZE
     elsif (curr_data_size + line.data_length) <= Msp430Bsl::Uart::Connection::CORE_COMMANDS_BUFFER_SIZE
       # If there's still room, append the line data
       curr_data_packet << line
@@ -122,3 +123,4 @@ end
 
 logger.info 'Closing connection'
 @board.close_connection
+logger.info 'Upload done!'

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/uart/peripheral_interface.rb

@@ -11,6 +11,7 @@ module Msp430Bsl
       HEADER_SIZE   = 1.freeze
       DATA_LEN_SIZE = 2.freeze
       CRC_SIZE      = 2.freeze
+      TOTAL_SIZE    = (HEADER_SIZE + DATA_LEN_SIZE + CRC_SIZE).freeze
 
       class << self
         include Utils

data/lib/msp430_bsl/version.rb

@@ -1,3 +1,3 @@
 module Msp430Bsl
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msp430_bsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-30 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.4.6
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Texas Instrument MSP430 BSL Ruby library