Fix a typo and added missing "else" in the nvs code for "int" type

nkolban / duktape-esp32

A JavaScript runtime for the ESP32 based on Duktape.

Apache License 2.0

238 stars 44 forks source link

Fix a typo and added missing "else" in the nvs code for "int" type #28

Closed dashxdr closed 6 years ago

dashxdr commented 6 years ago

I'm not an expert on merging, I want to get some of my changes to merge in because the original tree is wrong, but my tree is kind of customized for my uses.

Specifically these ought to be merged: filesystem/Bluetooth.js main/module_nvs.c main/modules.c

This is just a useful function for viewing js objects: filesystem/treeify.js

These should NOT be merged: Makefile sdkconfig partitions.csv

nkolban commented 6 years ago

It has conflicts.

dashxdr commented 6 years ago

I don't know how to resolve the conflict. My copy of partitions.csv can be abandoned. I wish I could just say, "These X files are part of the pull request". Google search for how to resolve conflicts seems to focus on the owner's side of things (meaning you).

dashxdr commented 6 years ago

crap I want to just delete this entire attempt...

dashxdr commented 6 years ago

OK this should be good to go. I wanted to create a new branch on my fork but messed it up... thanks for your patience. treeify.js is optional but I included it in the PR. Thanks--