Merge branch 'master' of https://gitee.com/openLuat/LuatOS

luat/include/luat_can.h

@@ -126,7 +126,7 @@ int luat_can_set_filter(uint8_t can_id, uint8_t is_dual_mode, uint8_t ACR[4], ui
  * @param data，帧数据
  * @return 0成功，其他失败
  */
-int luat_can_tx_message(uint8_t can_id, uint32_t message_id, uint8_t is_extend_id, uint8_t is_RTR, uint8_t need_ack, uint8_t data_len, uint8_t *data);
+int luat_can_tx_message(uint8_t can_id, uint32_t message_id, uint8_t is_extend_id, uint8_t is_RTR, uint8_t need_ack, uint8_t data_len, const void *data);
 
 /**
  * @brief 停止未完成的消息发送

luat/vfs/luat_fs_mem.c

@@ -259,7 +259,7 @@ size_t luat_vfs_ram_fwrite(void* userdata, const void *ptr, size_t size, size_t
 
     // 计算最终需要的总大小
     size_t total_size = fd->offset + write_size;
-    size_t current_size = files[fd->fid]->size; // 当前文件大小
+//    size_t current_size = files[fd->fid]->size; // 当前文件大小
 
     // 先补齐block
     ram_file_block_t* block = files[fd->fid]->head;

luat/vfs/luat_inline_libs_64bit_size32.c

@@ -6,7 +6,7 @@
 const char luat_inline2_sys_64bit_size32[] = {
 
 0x1B, 0x4C, 0x75, 0x61, 0x53, 0x00, 0x19, 0x93, 
-0x0D, 0x0A, 0x1A, 0x0A, 0x04, 0x08, 0x04, 0x08, 
+0x0D, 0x0A, 0x1A, 0x0A, 0x04, 0x04, 0x04, 0x08, 
 0x08, 0x78, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x77, 
 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -953,7 +953,7 @@ const char luat_inline2_sys_64bit_size32[] = {
 const char luat_inline2_sysplus_64bit_size32[] = {
 
 0x1B, 0x4C, 0x75, 0x61, 0x53, 0x00, 0x19, 0x93, 
-0x0D, 0x0A, 0x1A, 0x0A, 0x04, 0x08, 0x04, 0x08, 
+0x0D, 0x0A, 0x1A, 0x0A, 0x04, 0x04, 0x04, 0x08, 
 0x08, 0x78, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x77, 
 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,