search

chmorgan / esphttpd-freertos

freertos example of libesphttpd for esp32 and esp8266
53 stars 14 forks source link

VFS additions #12

Open phatpaul opened 5 years ago

phatpaul commented 5 years ago

Adding a vfs_upload example GUI. Depends on https://github.com/chmorgan/libesphttpd/pull/48 (already merged)

Also add helper script to generate filesystem images (stolen from loboris/MicroPython_ESP32_psRAM_LoBo). (I only got FatFS to work so far, and I don't have time right now to troubleshoot SPIFFS and LittleFS. I put a disclaimer in the readme to this effect)

The example still builds and runs fine without any of this VFS stuff turned on. (the filesystem upload functions just fail if used)

image

chmorgan commented 5 years ago

@phatpaul it may take a little while to discuss with igrr and jkearins but lets see how that goes first. If there is some impasse then we can discuss working around it. Does that sound ok?

chmorgan commented 5 years ago

@phatpaul have you had any luck with those guys? To clarify my concerns if we merge back changes here we'll be copying or relying on forks of external repositories. If we can get those repositories adjusted then we can include them directly and won't have to worry about maintaining forks or copied files. Would it help if I reached out to them? I'd like to do what I can to facilitate getting your PR merged in as soon as possible.

phatpaul commented 5 years ago

Yes please feel free help out. I have been busy at work finishing my esp32-based product.

On Sat, Dec 8, 2018, 8:39 PM Chris Morgan notifications@github.com wrote:

@phatpaul https://github.com/phatpaul have you had any luck with those guys? To clarify my concerns if we merge back changes here we'll be copying or relying on forks of external repositories. If we can get those repositories adjusted then we can include them directly and won't have to worry about maintaining forks or copied files. Would it help if I reached out to them? I'd like to do what I can to facilitate getting your PR merged in as soon as possible.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/chmorgan/esphttpd-freertos/pull/12#issuecomment-445503460, or mute the thread https://github.com/notifications/unsubscribe-auth/ADVVdzW8TxIBtZlhdiLTc27smRmR9NPnks5u3GnMgaJpZM4Ycame .

chmorgan commented 5 years ago

@jkearns, @igrr, can you take a look at the comments above? We are trying to integrate mkspiffs and mkfatfs in this project as submodules but we are having trouble doing so. Are we missing something?

chmorgan commented 5 years ago

@jkearns have you see the request here to split the mkfatfs into a separate repository so it can be included as a component of another project? (As least that’s what I think the request was, @phatpaul can correct me)

chmorgan commented 5 years ago

@phatpaul ahh ok this PR from a while back. The changes to mkspiffs were integrated by igrr right?

@jkearns just pinging again to see if you saw the request about splitting things up.

phatpaul commented 5 years ago

@chmorgan I will split this up to leave out the building local fs stuff.

I would like to merge this in - The UI for VFS is in here and it does not depend on the mkfatfs.

phatpaul commented 5 years ago

Actually it is already split into 2 commits. What's the best way to merge in just the first commit? Do I need to update the pull-request? Or rewind the branch? I would like to leave the 2nd commit in this or another pull-request.

chmorgan commented 5 years ago

Hi @phatpaul. I'd do something like:

git branch vfs_upload_full
git rebase -i master
git push --force

The branch makes a copy of your current branch and during the rebase you'd drop the commit you'd like to lose. The rebased branch with the single commit should show up here replacing the previous commits after the force push.