Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi_flash: Improve Python3 compatibility 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-10-07 19:34:36 -04:00
parent 64cb8d9820
commit 1a4d655a18
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/spi_flash/spi_flash.py
View File

@ -16,6 +16,7 @@ import traceback
import json import json
import board_defs import board_defs
import fatfs_lib import fatfs_lib
import util
import reactor import reactor
import serialhdl import serialhdl
import clocksync import clocksync
@ -274,7 +275,7 @@ class FatFS:
def remove_item(self, sd_path): def remove_item(self, sd_path):
# Can be path to directory or file # Can be path to directory or file
ret = self.ffi_lib.fatfs_remove(sd_path) ret = self.ffi_lib.fatfs_remove(sd_path.encode())
if ret != 0: if ret != 0:
raise OSError("flash_sdcard: Error deleting item at path '%s'," raise OSError("flash_sdcard: Error deleting item at path '%s',"
" result: %s" " result: %s"
@ -282,7 +283,7 @@ class FatFS:
def get_file_info(self, sd_file_path): def get_file_info(self, sd_file_path):
finfo = self.ffi_main.new("struct ff_file_info *") finfo = self.ffi_main.new("struct ff_file_info *")
ret = self.ffi_lib.fatfs_get_fstats(finfo, sd_file_path) ret = self.ffi_lib.fatfs_get_fstats(finfo, sd_file_path.encode())
if ret != 0: if ret != 0:
raise OSError( raise OSError(
"flash_sdcard: Failed to retreive file info for path '%s'," "flash_sdcard: Failed to retreive file info for path '%s',"
@ -292,7 +293,7 @@ class FatFS:
def list_sd_directory(self, sd_dir_path): def list_sd_directory(self, sd_dir_path):
flist = self.ffi_main.new("struct ff_file_info[128]") flist = self.ffi_main.new("struct ff_file_info[128]")
ret = self.ffi_lib.fatfs_list_dir(flist, 128, sd_dir_path) ret = self.ffi_lib.fatfs_list_dir(flist, 128, sd_dir_path.encode())
if ret != 0: if ret != 0:
raise OSError("flash_sdcard: Failed to retreive file list at path" raise OSError("flash_sdcard: Failed to retreive file list at path"
" '%s', result: %s" " '%s', result: %s"
@ -357,7 +358,7 @@ class SDCardFile:
if self.fhdl is not None: if self.fhdl is not None:
# already open # already open
return return
self.fhdl = self.ffi_lib.fatfs_open(self.path, self.mode) self.fhdl = self.ffi_lib.fatfs_open(self.path.encode(), self.mode)
self.eof = False self.eof = False
if self.fhdl == self.ffi_main.NULL: if self.fhdl == self.ffi_main.NULL:
self.fhdl = None self.fhdl = None
@ -895,7 +896,7 @@ class MCUConnection:
SPI_CFG_CMD % (SPI_OID, cs_pin), SPI_CFG_CMD % (SPI_OID, cs_pin),
bus_cmd, bus_cmd,
] ]
config_crc = zlib.crc32('\n'.join(cfg_cmds)) & 0xffffffff config_crc = zlib.crc32('\n'.join(cfg_cmds).encode()) & 0xffffffff
cfg_cmds.append(FINALIZE_CFG_CMD % (config_crc,)) cfg_cmds.append(FINALIZE_CFG_CMD % (config_crc,))
for cmd in cfg_cmds: for cmd in cfg_cmds:
self._serial.send(cmd) self._serial.send(cmd)