Do you think you can do a clean code rebase in order to exclude from the history here all the commits that are already part of branch develop? Once we have a clean history, we'll give you some change requests.
Can I get a sequence of git commands to accomplish such a clean code rebase? I see that the develop branch has the changes for #1290 and #1283 already there. I am still a newbie at all of this baselining and pulls and merges. Thanks.
the sequence of those commands will depend on your local set up of things. Assuming that the main github repo is configured as "origin" in your local space then you want to at least
git checkout develop
git fetch origin
git merge origin/developAt this point your develop should be an exact copy of "our" develop
You will then want to check out the branch you used for your PR. I'll assume this is called contrib/simplelink-base-demo-enhanced
git checkout contrib/simplelink-base-demo-enhanced
git rebase -i developThis will trigger the interactive rebase process and will open an editor for you to change history. From that history you will want to exclude all commits that now already exist in develop, and to only include your own commits. Have a google around for interactive rebase with git to see how this works. From what I can see in your PR, you will want to only keep the commits starting from "changes to PR 1290..." onwards
Here is what I see if I run git remote -v
george https://github.com/g-oikonomou/contiki-ng.git (fetch)
george https://github.com/g-oikonomou/contiki-ng.git (push)
origin https://github.com/jsolderitsch/contiki-ng.git (fetch)
origin https://github.com/jsolderitsch/contiki-ng.git (push)
upstream https://github.com/contiki-ng/contiki-ng.git (fetch)
upstream https://github.com/contiki-ng/contiki-ng.git (push)My clone was made from a previous version of develop. So that is what is set as origin as I understand the meaning of that term. So I presume your first three commands should be what I follow?
git push origin develop would also synch "our" origin with "your" origin
@g-oikonomou I did these commands:
git checkout contrib/simplelink-base-demo-enhanced
git rebase -i developAnd I did not get any errors. I did see a message on my screen:
Successfully rebased and updated refs/heads/contrib/simplelink-base-demo-enhanced.Now what do I do? Do I need to push anything to any where? I believe I included only the real code changes for the PR in the rebasing. There were 2 commit hex values that I did not recognize as mine when the editor popped up and I just deleted the "pick" lines for them. I did not change commit messages at this time.
I occasionally can successfully ping the host from a node through the border router. Logs from the tunslip6 shows packets coming in and out of the tunnel. But the pings from host are never
accompanied by any packets coming back from the slip.
hello all,
One: I just want to push my sensor data to ubidots cloud. I’m Using Remote-RevB as MQTT Client and Orion Router as Edge Router (Border router).
Two: In the “Contiki-Zolartia-Pack” Repo MQTT-Client and Router .bin files(based on CETIC 6LBR) available for ubidots cloud and some more cloud. By making use of this, I was able to push my sensor data to Ubidots successfully
Three: But I don’t want to use “Contiki-Zolartia-Pack” Repo I want to achieve this only with Contiki-NG
Four: I have done many things to achieve this using Contiki-NG’s MQTT-Client. Firstly I have tried to connect to the Mosquitto Broker which is running on my Laptop. I faced some issues with IP addressing with the Help of @g-oikonomou I have achieved it. yes I was able to push the data to Mosquitto Broker
Five: Now I’m trying to push data to ubidots. I have tried in many ways. I have provided the correct IPv6 address and also the token. But it was not working mean the MQTT-Client was not connecting to the Router
MQTT-Client(Contiki-NG) +IP64 Router(Contiki-NG) =Ubidots Not Working
MQTT-Client(Contiki-Zolartia-Packs) +Cetic 6LBR (Contiki-Zolartia-Packs) =Ubidots Working
Six: Now from zolertia-packs I took ubidots related things and compiled with Contiki-ng, though the connection was not happening even I modified MQTT-client. c(Contiki-ng) hence I used complete MQTT-node in Contiki-ng. But I am facing two issues
- WITH_IP64 = 1(the issue is solved if I comment it)
- “undefined reference to noncoresec_framer”
Seven: I'm here for the solution to achieve this with Contiki-NG. Did anyone has achieved this with Contiki-Ng? Even with other Cloud also fine but I have to do with Contiki-Ng
Do the Needful
Thank you
I am still having a "Permission denied: '/dev/ttyACM0'" error when the dongle switches to DFU so I need to run the command twice. I'll check udev config again. Thanks!
CHECK_RESULT(bignum_exp_mod_start(e,1,m,1,b,1 ,&state->rv,state->process));
PT_WAIT_UNTIL(&state->pt, pka_check_status());
CHECK_RESULT(bignum_exp_mod_get_result(l_result, 1, state->rv));
PT_END(&state->pt);