if ( checkformat[iiblk] & jjbit ) { // was set as formatted, unset as erase precedes usage
// Constants for file system structure optimized for flash.
uint16_t const BU16 = 128;
uint16_t const BU32 = 8192;
// Assume 512 byte sectors.
const uint16_t BYTES_PER_SECTOR = 512;
const uint16_t SECTORS_PER_MB = 0X100000/BYTES_PER_SECTOR;
const uint16_t FAT16_ROOT_ENTRY_COUNT = 512;
const uint16_t FAT16_ROOT_SECTOR_COUNT =
32*FAT16_ROOT_ENTRY_COUNT/BYTES_PER_SECTOR;WMXZ said:
#define MTP_TX_SIZE_480 512
#define MTP_RX_SIZE_480 512
#define MTP_TX_SIZE_12 64
#define MTP_RX_SIZE_12 64 bool MTPD::SendObject()
{
pull_packet(rx_data_buffer);
read(0,0);
// printContainer();
uint32_t len = ReadMTPHeader();
uint32_t index = sizeof(MTPHeader);
disk_pos=0;
// experiment to try setting the size of file up front
printf("MTPD::SendObject: len:%u\n", len);
while((int)len>0)
{ uint32_t bytes = MTP_RX_SIZE - index; // how many data in usb-packet
bytes = min(bytes,len); // loimit at end
uint32_t to_copy=min(bytes, DISK_BUFFER_SIZE-disk_pos); // how many data to copy to disk buffer
memcpy(disk_buffer+disk_pos, rx_data_buffer + index,to_copy);
disk_pos += to_copy;
bytes -= to_copy;
len -= to_copy;
//printf("a %d %d %d %d %d\n", len,disk_pos,bytes,index,to_copy);
//
[COLOR="#FF0000"]if(disk_pos==DISK_BUFFER_SIZE)[/COLOR]
{
elapsedMicros em = 0;
//[COLOR="#FF0000"]if(storage_->write((const char *)disk_buffer, DISK_BUFFER_SIZE)<DISK_BUFFER_SIZE) return false;[/COLOR]
size_t bytes_written = storage_->write((const char *)disk_buffer, DISK_BUFFER_SIZE);
printf("WR %u %u %u\n", DISK_BUFFER_SIZE, bytes_written, (uint32_t)em);
if (bytes_written < DISK_BUFFER_SIZE) return false;
disk_pos =0;
if(bytes) // we have still data in transfer buffer, copy to initial disk_buffer
{
memcpy(disk_buffer,rx_data_buffer+index+to_copy,bytes);
disk_pos += bytes;
len -= bytes;
}
//printf("b %d %d %d %d %d\n", len,disk_pos,bytes,index,to_copy);
}
if(len>0) // we have still data to be transfered
{ pull_packet(rx_data_buffer);
index=0;
}
}
//printf("len %d\n",disk_pos);
if(disk_pos)
{
elapsedMicros em = 0;
if(storage_->write((const char *)disk_buffer, disk_pos)<disk_pos) return false;
printf("WR %u %u\n", DISK_BUFFER_SIZE, (uint32_t)em);
}
storage_->close();
return true;
}Start Big write of 2048000 Bytes ... patience ...........................
Big write /0_bigftrunc.txt took 4.67 Sec for 2045952 Bytes : file3.size()=2045952
Big write KBytes per second 438.55
Bytes Used: 2060288, Bytes Total:67108864
#define DISK_BUFFER_SIZE 8*256.
[B] >>> New GITHUB :: See [URL="https://forum.pjrc.com/threads/58033-LittleFS-port-to-Teensy-SPIFlash?p=263058&viewfull=1#post263058"]post #566[/URL][/B]
. myfs.formatUnused( 1 ) ...
FMT 2021,
formatUnused :: Done Formatting Low Level in [B]319531[/B] us (last 2022).
[ 0.28 M](0.00533 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxf+-? loops left 0 >
myfs.formatUnused( 1 ) ...
FMT 2023,
formatUnused :: Done Formatting Low Level in [B]40282[/B] us (last 2024).FMT 3048,FMT 3049,FMT 3050,FMT 3051,FMT 3052,FMT 3055,FMT 3057,FMT 3059, #608
FMT 3062,
formatUnused :: Done Formatting Low Level in 26226905 us.Start Big write of 2048000 Bytes........................
Big write /0_2MBfile.txt took 5.02 Sec for 2045952 Bytes : file3.size()=2045952
Big write KBytes per second 407.48Thanks Kurt - that seemed to got it working - just hitting return in the Arduino IDE
Was playing with the buffer sizes and playing with the W25Q64 and W25Q128 flash chips. I have only one file that would give me problems and it seems to be working on the now on both chips. There is one caveat. I changed your buffersize - went smaller instead of larger.:
Code:#define DISK_BUFFER_SIZE 8*256
Reason - made it a multiple of the config.progsize in LFS. Out of curiosity can you give it a try with your problem child file.
int LittleFS_SPIFlash::erase(lfs_block_t block)
{
if (!port) return LFS_ERR_IO;
void *buffer = malloc(config.read_size);
if ( buffer != nullptr) {
if ( blockIsBlank(&config, block, buffer)) {
free(buffer);
return 0; // Already formatted exit no wait
}
free(buffer);
}git fetch upstream
git checkout main
git reset --hard upstream/main
git push origin main --forceThanks... But I don't see it... It probably created it as a Private Repository
Yes Github is fun (NOT)...
D:\GitHub\LittleFS>git remote -v
defragster https://github.com/defragster/LittleFS.git (fetch)
defragster https://github.com/defragster/LittleFS.git (push)
origin https://github.com/KurtE/LittleFS.git (fetch)
origin https://github.com/KurtE/LittleFS.git (push)
upstream https://github.com/PaulStoffregen/LittleFS.git (fetch)
upstream https://github.com/PaulStoffregen/LittleFS.git (push)
D:\GitHub\LittleFS>git remote add kurte https://github.com/KurtE/LittleFS.git
git fetch kurte
git checkout kurte/LFSintegrity
git push origin LFSintegrity --forcegit checkout LFSintegrity
git fetch defragster
git reset --hard defragster/LFSintegrity
git push origin LFSintegrity --force
For many years they always defaulted as public as you were required to have a paying account to have private ones, and then something like within the last year or so they now allow us to have some private ones....
So I did clone your new project and then used WinMerge to verify that my new branch matched the new project...
I then rebuilt the MTP-test program with it. And the 333kb file made it over no problem. So I then tried an image > 3MB and it also went no problem.
I then double clicked on the resulting file and the image file opened up in Photoshop
View attachment 22826
So it would be great if this got into the next beta!
[B]FMT 4708,FMT 4709,FMT 4710,FMT 4711,FMT 4712,FMT 4713,FMT 4715,FMT 4716, #8[/B]
FMT 4717,FMT 5419,FMT 5426,FMT 5434,FMT 5442,FMT 5446,FMT 5448,FMT 5450, #16
FMT 5452,FMT 5454,FMT 5457,FMT 5460,:: /Q_file.txt QSPI_DISK +++ Add +++ [sz 55296 add 18432] ++ Q Verify /Q_file.txt 73728B @KB/sec 2536.75
:: /R_file.txt QSPI_DISK +++ Add +++ [sz 58368 add 19456] ++ R Verify /R_file.txt 77824B @KB/sec 2527.90
:: /S_file.txt QSPI_DISK +++ Add +++ [sz 61440 add 20480] ++ S Verify /S_file.txt 81920B @KB/sec 2539.76
:: /T_file.txt QSPI_DISK +++ Add +++ [sz 64512 add 21504] ++ T Verify /T_file.txt 86016B @KB/sec 2554.07
:: /U_file.txt QSPI_DISK +++ Add +++ [sz 67584 add 22528] ++ U Verify /U_file.txt 90112B @KB/sec 2557.97
[B]FMT 5463,FMT 5466,FMT 5470,FMT 5474,FMT 5478,FMT 5482,FMT 5487,FMT 5492, #8[/B]
FMT 5497,FMT 5502,FMT 5508,FMT 5514,FMT 5520,FMT 5526,:: /V_file.txt QSPI_DISK +++ Add +++ [sz 70656 add 23552] ++ V Verify /V_file.txt 94208B @KB/sec 2547.61
:: /W_file.txt QSPI_DISK +++ Add +++ [sz 73728 add 24576] ++ W Verify /W_file.txt 98304B @KB/sec 2566.95
:: /X_file.txt QSPI_DISK +++ Add +++ [sz 76800 add 25600] ++ X Verify /X_file.txt 102400B @KB/sec 2577.79
:: /Y_file.txt QSPI_DISK +++ Add +++ [sz 79872 add 26624] ++ Y Verify /Y_file.txt 106496B @KB/sec 2556.68
:: /Z_file.txt QSPI_DISK +++ Add +++ [sz 82944 add 27648] ++ Z Verify /Z_file.txt 110592B @KB/sec 2546.21
[B]FMT 5533,FMT 5540,FMT 5547,FMT 5554,FMT 5562,[/B]:: /A_file.txt QSPI_DISK +++ Add +++ [sz 36864 add 12288] ++ A Verify /A_file.txt 49152B @KB/sec 2528.00:: /S_file.txt QSPI_DISK +++ Add [sz 20480 add 20480] @KB/sec 379.77 ++ S Verify /S_file.txt 40960B @KB/sec 2540.63
:: /T_file.txt QSPI_DISK +++ Add [sz 21504 add 21504] @KB/sec 361.73 ++ T Verify /T_file.txt 43008B @KB/sec 2541.54
:: /U_file.txt QSPI_DISK +++ Add [sz 22528 add 22528] @KB/sec 353.89 ++ U Verify /U_file.txt 45056B @KB/sec 2530.53
:: /V_file.txt QSPI_DISK +++ Add [sz 23552 add 23552] @KB/sec 339.12 ++ V Verify /V_file.txt 47104B @KB/sec 2531.79[ 28.03 M](0.01224 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 >5
:: /V_file.txt QSPI_DISK +++ Add [sz 23552 add 23552] @KB/sec 337.99 ++ V Verify /V_file.txt 47104B @KB/sec 2529.21
:: /W_file.txt QSPI_DISK +++ Add [sz 24576 add 24576] @KB/sec 390.13 ++ W Verify /W_file.txt 49152B @KB/sec 2537.79
:: /X_file.txt QSPI_DISK +++ Add [sz 25600 add 25600] @KB/sec 363.32 ++ X Verify /X_file.txt 51200B @KB/sec 2538.55
:: /Y_file.txt QSPI_DISK +++ Add [sz 26624 add 26624] @KB/sec 358.97 ++ Y Verify /Y_file.txt 53248B @KB/sec 2527.79
:: /Z_file.txt QSPI_DISK +++ Add [sz 27648 add 27648] @KB/sec 343.05 ++ Z Verify /Z_file.txt 55296B @KB/sec 2528.86
:: /A_file.txt QSPI_DISK +++ Add [sz 12288 add 12288] @KB/sec 368.58 ++ A Verify /A_file.txt 24576B @KB/sec 2442.46
:: /B_file.txt QSPI_DISK +++ Add [sz 6144 add 3072] @KB/sec 212.18 ++ B Verify /B_file.txt 9216B @KB/sec 2182.33
:: /C_file.txt QSPI_DISK +++ Add [sz 8192 add 4096] @KB/sec 73.80 ++ C Verify /C_file.txt 12288B @KB/sec 2260.49
:: /D_file.txt QSPI_DISK +++ Add [sz 10240 add 5120] @KB/sec 49.48 ++ D Verify /D_file.txt 15360B @KB/sec 2328.68
:: /E_file.txt QSPI_DISK +++ Add [sz 12288 add 6144] @KB/sec 39.32 ++ E Verify /E_file.txt 18432B @KB/sec 2489.13
:: /F_file.txt QSPI_DISK +++ Add [sz 14336 add 7168] @KB/sec 48.88 ++ F Verify /F_file.txt 21504B @KB/sec 2491.77
:: /G_file.txt QSPI_DISK +++ Add [sz 16384 add 8192] @KB/sec 57.82 ++ G Verify /G_file.txt 24576B @KB/sec 2500.86
:: /H_file.txt QSPI_DISK +++ Add [sz 18432 add 9216] @KB/sec 61.89 ++ H Verify /H_file.txt 27648B @KB/sec 2509.58
...[ 29.56 M](0.00021 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 >
myfs.formatUnused( 0 ) ...
FMT 2,FMT 3,FMT 4,FMT 5,FMT 6,FMT 7,FMT 8,FMT 9, #8
FMT 10,FMT 11,FMT 12,FMT 13,FMT 14,FMT 15,FMT 16,FMT 17, #16
FMT 18,FMT 19,FMT 20,FMT 21,FMT 22,FMT 23,FMT 24,FMT 25, #24
...
FMT 16354,FMT 16355,FMT 16356,FMT 16357,FMT 16358,FMT 16359,FMT 16360,FMT 16361, #16240
FMT 16362,FMT 16363,FMT 16364,FMT 16365,FMT 16366,FMT 16367,FMT 16368,FMT 16369, #16248
FMT 16370,FMT 16371,FMT 16372,FMT 16373,FMT 16374,FMT 16375,FMT 16376,FMT 16377, #16256
FMT 16378,FMT 16379,FMT 16380,FMT 16381,FMT 16382,FMT 16383,
formatUnused :: Done Formatting Low Level in 645399166 us.
[ 40.37 M](10.75665 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 > d
printDirectory QSPI_DISK
--------------
FILE A_file.txt 12288
FILE B_file.txt 6144
FILE C_file.txt 8192
FILE D_file.txt 10240
FILE E_file.txt 12288
FILE F_file.txt 7168
FILE G_file.txt 8192
FILE H_file.txt 9216
FILE I_file.txt 10240
FILE J_file.txt 11264
FILE K_file.txt 12288
FILE L_file.txt 13312
FILE M_file.txt 14336
FILE N_file.txt 15360
FILE O_file.txt 16384
FILE P_file.txt 17408
FILE Q_file.txt 18432
FILE R_file.txt 19456
FILE S_file.txt 20480
FILE T_file.txt 21504
FILE U_file.txt 22528
FILE V_file.txt 23552
FILE W_file.txt 24576
FILE X_file.txt 25600
FILE Y_file.txt 26624
FILE Z_file.txt 27648
0 dirs with 26 files of Size 414720 Bytes
Total 26 files of Size 414720 Bytes
Bytes Used: 499712, Bytes Total:67108864Start Big write of 2048000 Bytes........................
Big write /0_2MBfile.txt took 5.00 Sec for 2045952 Bytes : file3.size()=2045952
Big write KBytes per second 409.36
Bytes Used: 2568192, Bytes Total:67108864
[ 54.70 M](0.08343 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 >
Delete with read verify all #bigfile's
Verify /0_2MBfile.txt bytes 2045952 : .................................................. GOOD! >> bytes 2045952
Big read&compare KBytes per second 2484.52Start Big write of 2048000 Bytes........................
Big write /0_2MBfile.txt took 6.44 Sec for 2045952 Bytes : file3.size()=2045952
Big write KBytes per second 317.65
Bytes Used: 2891776, Bytes Total:67108864
[ 14.98 M](0.10837 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 >
Delete with read verify all #bigfile's
Verify /0_2MBfile.txt bytes 2045952 : .................................................. GOOD! >> bytes 2045952
Big read&compare KBytes per second 1236.57:: /7_dir/L_file.txt RAM_DISK +++ Add [sz 35328 add 11776] @KB/sec 1931.12 ++ L Verify /7_dir/L_file.txt 47104B @KB/sec 2496.37
:: /7_dir/M_file.txt RAM_DISK +++ Add [sz 38400 add 12800] @KB/sec 1490.97 ++ M Verify /7_dir/M_file.txt 51200B @KB/sec 2507.22
Start Big write of 2048000 Bytes........................
Big write /0_2MBfile.txt took 0.47 Sec for 2045952 Bytes : file3.size()=2045952
Big write KBytes per second 4308.58
Bytes Used: 7133184, Bytes Total:16777216
[102.80 M](0.00845 M elap) Awaiting input 0123456789RdchkFqvplmusSBbyYxfa+-? loops left 0 >
Delete with read verify all #bigfile's
Verify /0_2MBfile.txt bytes 2045952 : .................................................. GOOD! >> bytes 2045952
Big read&compare KBytes per second 2421.30 while (file_size) {
elapsedMicros em = 0;
int output_count = (file_size > write_size) ? write_size : file_size;
int bytes_output = f.write(buffer, output_count);
Serial.write('.');
if (output_count != bytes_output) {
Serial.printf(" %d - %d - %u\n", output_count, bytes_output, (uint32_t)em);
}
}
file_size -= bytes_output;
if (++write_counter == 80) {
Serial.printf("\n%08u:", file_size);
write_counter = 0;
}
}
elapsedMicros emClose = 0;
f.close();
Serial.printf("\n*** Closed: %u %u\n\n", (uint32_t)emTotal, (uint32_t)emClose);
}LFS_ERR_NOSPC = -28, // No space left on device