Merge pull request #15 from arduino/v1.4.4

V1.4.4 - Binary transfer, non-ascii, transfer speed

Author: ubidefeo

examples/07_save_file.js

@@ -4,6 +4,7 @@ let content = `
 """
 Test
 """
+# Emoji TEST 💩🤯🫶🏼
 
 from time import sleep
 from machine import Pin

examples/big_file.py

@@ -36,7 +36,7 @@
 # When the following number is sampled at four consecutive
 # even-numbered bits it will have two bits set, but sampling at four
 # consecutive odd-numbered bits will only yield one bit set.
-
+# 😌🥲🙏🏼💩
 _WAVE_MAGIC = 0b0000011100000111
 
 class Stepper:

examples/test.py

@@ -1,7 +1,7 @@
 """
 Test
 """
-
+# 🙏🏼
 from time import sleep
 
 print("start OK \r\n")

micropython.js

@@ -266,22 +266,17 @@ class MicroPythonBoard {
   async fs_put(src, dest, data_consumer) {
     data_consumer = data_consumer || function() {}
     if (src && dest) {
-      const contentBuffer = fs.readFileSync(path.resolve(src))
-      let contentString = contentBuffer.toString()
-      contentString = fixLineBreak(contentString)
-      const hexArray = contentString.split('').map(
-        c => c.charCodeAt(0).toString(16).padStart(2, '0')
-      )
+      const fileContent = fs.readFileSync(path.resolve(src), 'binary')
+      const contentBuffer =  Buffer.from(fileContent, 'binary')
       let out = ''
       out += await this.enter_raw_repl()
-      out += await this.exec_raw(`f=open('${dest}','w')\nw=f.write`)
+      out += await this.exec_raw(`f=open('${dest}','wb')\nw=f.write`)
       const chunkSize = 48
-      for (let i = 0; i < hexArray.length; i+= chunkSize) {
-        let slice = hexArray.slice(i, i+chunkSize)
-        let bytes = slice.map(h => `0x${h}`)
-        let line = `w(bytes([${bytes.join(',')}]))`
+      for (let i = 0; i < contentBuffer.length; i+= chunkSize) {
+        let slice = Uint8Array.from(contentBuffer.subarray(i, i+chunkSize))
+        let line = `w(bytes([${slice}]))`
         out += await this.exec_raw(line)
-        data_consumer( parseInt((i / hexArray.length) * 100) + '%')
+        data_consumer( parseInt((i / contentBuffer.length) * 100) + '%')
       }
       out += await this.exec_raw(`f.close()`)
       out += await this.exit_raw_repl()
@@ -293,20 +288,16 @@ class MicroPythonBoard {
   async fs_save(content, dest, data_consumer) {
     data_consumer = data_consumer || function() {}
     if (content && dest) {
-      let contentString = fixLineBreak(content)
-      const hexArray = contentString.split('').map(
-        c => c.charCodeAt(0).toString(16).padStart(2, '0')
-      )
+      const contentBuffer = Buffer.from(content, 'utf-8')
       let out = ''
       out += await this.enter_raw_repl()
-      out += await this.exec_raw(`f=open('${dest}','w')\nw=f.write`)
+      out += await this.exec_raw(`f=open('${dest}','wb')\nw=f.write`)
       const chunkSize = 48
-      for (let i = 0; i < hexArray.length; i+= chunkSize) {
-        let slice = hexArray.slice(i, i+chunkSize)
-        let bytes = slice.map(h => `0x${h}`)
-        let line = `w(bytes([${bytes.join(',')}]))`
+      for (let i = 0; i < contentBuffer.length; i+= chunkSize) {
+        let slice = Uint8Array.from(contentBuffer.subarray(i, i+chunkSize))
+        let line = `w(bytes([${slice}]))`
         out += await this.exec_raw(line)
-        data_consumer( parseInt((i / hexArray.length) * 100) + '%')
+        data_consumer( parseInt((i / contentBuffer.length) * 100) + '%')
       }
       out += await this.exec_raw(`f.close()`)
       out += await this.exit_raw_repl()

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "micropython.js",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Interpretation of pyboard.py in javascript",
   "main": "micropython.js",
   "scripts": {