Skip to content

Conversation

@asifsardar26
Copy link
Contributor

I messed up my forked runtime repository by merging branches feature-encx24j600-wip (where I made enhancements to the emulator), master and Ivan's feature-hrtim branch (where he did enhancements for DABRI project).

So, I forked new runtime from Ell-i/Runtime and made the enhancements to emulator again, this time directly to the master branch (which had previous necessary merges from old commits in feature-encx24j600-wip e.g. makefiles enhancements, encx24j600 driver progress etc).

I have made a new pull request for the emulator enhancements to be reviewed by you (Pekka) and merge it to Ell-i/Runtime

@ghost
Copy link

ghost commented Mar 10, 2015

Hi, Asif,

Do you know what is the situation with Ell-i project? I sent an e-mail to
Ivan yesterday but haven't gotten the reply.

Br,
Anastasia L.

2015-02-24 23:21 GMT+02:00 Asif Sardar notifications@github.com:

I messed up my forked runtime repository by merging branches
feature-encx24j600-wip (where I made enhancements to the emulator), master
and Ivan's feature-hrtim branch (where he did enhancements for DABRI
project).

So, I forked new runtime from Ell-i/Runtime and made the enhancements to
emulator again, this time directly to the master branch (which had previous
necessary merges from old commits in feature-encx24j600-wip e.g. makefiles
enhancements, encx24j600 driver progress etc).

I have made a new pull request for the emulator enhancements to be

reviewed by you (Pekka) and merge it to Ell-i/Runtime

You can view, comment on, or merge this pull request online at:

#36
Commit Summary

  • Adding the emulator enhancement to the runtime
  • More emulator enhancements
  • Now the enhancements to emulator wouldn't give reference error to
    __peripheral_start & __peripheral_end

File Changes

Patch Links:


Reply to this email directly or view it on GitHub
#36.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants