You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2020/11/06 10:07:29 UTC
[GitHub] [incubator-nuttx] fckruegel opened a new pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
fckruegel opened a new pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230
MAX11612: 4 channels VCC=5V0 Int VRef=4.096V
MAX11613: 4 channels VCC=3V3 Int VRef=2.048V
MAX11614: 8 channels VCC=5V0 Int VRef=4.096V
MAX11615: 8 channels VCC=3V3 Int VRef=2.048V
MAX11616: 12 channels VCC=5V0 Int VRef=4.096V
MAX11617: 12 channels VCC=3V3 Int VRef=2.048V
Note: The chips' auto-scanning feature is not supported in this revision.
## Summary
## Impact
## Testing
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727528758
>
>
> @fckruegel please cherry-pick this patch to your master to resolve the conflict:
> [xiaoxiang781216@4fbe15d](https://github.com/xiaoxiang781216/incubator-nuttx/commit/4fbe15d9cfa599bd0440cf304c28dbb1d1f18f92)
> I don't have the right to update your git.
I'm not very familiar with git and github right now. Can you tell me what steps I need to perform?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] justinmclean commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
justinmclean commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-723304174
Hi,
If it’s 3rd party code under the Apache license then it fine to have a copyright line and an author tag and needs to be mentioned in the LICENSE file. If the code that belongs to the project / ASF the header should not have a copyright line or an author tag.
Thanks,
Justin
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-726783833
@fckruegel could you resolve the conflict?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727558211
> how about this:
>
> ```
> git remote remove xiaoxiang781216
> git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
> git fetch xiaoxiang781216
> ``
> ```
`
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote remove xiaoxiang781216
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote -v
origin https://github.com/fckruegel/incubator-nuttx-1 (fetch)
origin https://github.com/fckruegel/incubator-nuttx-1 (push)
upstream https://github.com/apache/incubator-nuttx (fetch)
upstream https://github.com/apache/incubator-nuttx (push)
xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git (fetch)
xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git (push)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git fetch xiaoxiang781216
remote: Enumerating objects: 275, done.
remote: Counting objects: 100% (275/275), done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 309 (delta 260), reused 259 (delta 253), pack-reused 34
Receiving objects: 100% (309/309), 48.57 KiB | 8.09 MiB/s, done.
Resolving deltas: 100% (261/261), completed with 180 local objects.
From https://github.com/xiaoxiang781216/incubator-nuttx
* [new branch] fckruegel-master -> xiaoxiang781216/fckruegel-master
* [new branch] idle -> xiaoxiang781216/idle
* [new branch] master -> xiaoxiang781216/master
* [new branch] openamp -> xiaoxiang781216/openamp
* [new branch] uname -> xiaoxiang781216/uname
* [new branch] wchar -> xiaoxiang781216/wchar
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git cherry-pick xiaoxiang781216/fckruegel-master
Auto-merging include/nuttx/analog/ioctl.h
[master 12365e6e79] Support for MAX1161X family of I2C 12 bit ADC chips: MAX11612: 4 channels VCC=5V0 Int VRef=4.096V MAX11613: 4 channels VCC=3V3 Int VRef=2.048V MAX11614: 8 channels VCC=5V0 Int VRef=4.096V MAX11615: 8 channels VCC=3V3 Int VRef=2.048V MAX11616: 12 channels VCC=5V0 Int VRef=4.096V MAX11617: 12 channels VCC=3V3 Int VRef=2.048V Note: The chips' auto-scanning feature is not supported in this revision.
Date: Fri Nov 6 11:01:03 2020 +0100
1 file changed, 2 insertions(+), 3 deletions(-)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git push -f origin master
Username for 'https://github.com': fckruegel
Password for 'https://fckruegel@github.com':
Enumerating objects: 551, done.
Counting objects: 100% (469/469), done.
Delta compression using up to 16 threads
Compressing objects: 100% (104/104), done.
Writing objects: 100% (308/308), 59.82 KiB | 5.44 MiB/s, done.
Total 308 (delta 252), reused 239 (delta 193)
remote: Resolving deltas: 100% (252/252), completed with 119 local objects.
To https://github.com/fckruegel/incubator-nuttx-1
c79bda6e4f..12365e6e79 master -> master
`
Looks good. Thank you very much.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 closed pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 closed pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
acassis commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-725495928
Thank you very much @fckruegel !
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727557464
how about this:
```
git remote remove xiaoxiang781216
git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
git fetch xiaoxiang781216
``
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
acassis commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-726063580
> > @fckruegel hmm, there is a conflict in the include/nuttx/analog/ioctl.h did you see that? I think it was modified since you submit the original PR.
>
> Yes, I know. This affects the IOCTL code allocations. The STM32G4 codes came in in the meantime. Just put my block of numbers after these.
>
> Maybe we should add another system call analog_get_ioctl_range(), which would allow the OS to allocate the ranges dynamically. Linux switches to this model from a staic allocation of device major numbers after they ran out of number space.
Yes, it could be a good idea. But I suggest you just fix the ioctl using the static approach and then propose to make the ioctl definition more dynamic. What do you think? Makes sense?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 edited a comment on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 edited a comment on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727537020
run the following commands in your local git:
```
git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
git checkout master
git cherry-pick xiaoxiang781216/fckruegel-master
git push -f origin master
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-725500676
>
>
> @fckruegel hmm, there is a conflict in the include/nuttx/analog/ioctl.h did you see that? I think it was modified since you submit the original PR.
Yes, I know. This affects the IOCTL code allocations. The STM32G4 codes came in the meantime. Just put my block of numbers after these.
Maybe we should add another system call analog_get_ioctl_range(), which would allow the OS to allocate the ranges dynamically. Linux switches to this model from a staic allocation of device major numbers after they ran out of number space.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727554117
>
>
> pleaase run "git fetch xiaoxiang781216" and cherry-pick again.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git fetch xiaoxiang781216
The authenticity of host 'github.com (140.82.121.4)' can't be established.
RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
Warning: Permanently added 'github.com,140.82.121.4' (RSA) to the list of known hosts.
git@github.com: Permission denied (publickey).
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git config user.name
Frank-Christian Kruegel
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git config user.email
fchk@istda.com
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727537020
```
git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
git checkout master
git cherry-pick xiaoxiang781216/fckruegel-master
git push -f origin master
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727553547
pleaase run "git fetch xiaoxiang781216" and cherry-pick again.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
acassis commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-723066612
Thank you very much @fckruegel I really like when people put good comments on drivers. You did it and include nice tables.
I just need to confirm with other if it is OK to include the author together in the Apache license. @justinmclean @btashton @v01d @xiaoxiang781216 @gregory-nutt Is it possible to include the Author name in the Apache License? Please note that he didn't include the word Copyright.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
patacongo commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-723076650
> I just need to confirm with other if it is OK to include the author
> together in the Apache license. @justinmclean
> <https://github.com/justinmclean> @btashton
> <https://github.com/btashton> @v01d <https://github.com/v01d>
> @xiaoxiang781216 <https://github.com/xiaoxiang781216> @gregory-nutt
> <https://github.com/gregory-nutt> Is it possible to include the Author
> name in the Apache License? Please note that he didn't include the
> word Copyright.
>
I think it would make more sense to put additional information such as
authorship, references, technical description, etc. outside of the
copyright header in separate comments somewhere after the copyright header.
For one thing, the copyright header must have a very strict format so
that it can be automatically parsed and verified by tools like RAT. So
it is not a good place for free-form comments.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
acassis commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-723297604
Thank you @v01d and @gregory-nutt it make sense. What do you suggest? Could we add an AUTHORS file at root of NuttX and let people to include their name and what driver or contribution they did?
@fckruegel Please remove the Author line from the Apache license file. We should fine another way the list the authors.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel edited a comment on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel edited a comment on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727558211
> how about this:
>
> ```
> git remote remove xiaoxiang781216
> git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
> git fetch xiaoxiang781216
> ``
> ```
```
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote remove xiaoxiang781216
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote -v
origin https://github.com/fckruegel/incubator-nuttx-1 (fetch)
origin https://github.com/fckruegel/incubator-nuttx-1 (push)
upstream https://github.com/apache/incubator-nuttx (fetch)
upstream https://github.com/apache/incubator-nuttx (push)
xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git (fetch)
xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git (push)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git fetch xiaoxiang781216
remote: Enumerating objects: 275, done.
remote: Counting objects: 100% (275/275), done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 309 (delta 260), reused 259 (delta 253), pack-reused 34
Receiving objects: 100% (309/309), 48.57 KiB | 8.09 MiB/s, done.
Resolving deltas: 100% (261/261), completed with 180 local objects.
From https://github.com/xiaoxiang781216/incubator-nuttx
* [new branch] fckruegel-master -> xiaoxiang781216/fckruegel-master
* [new branch] idle -> xiaoxiang781216/idle
* [new branch] master -> xiaoxiang781216/master
* [new branch] openamp -> xiaoxiang781216/openamp
* [new branch] uname -> xiaoxiang781216/uname
* [new branch] wchar -> xiaoxiang781216/wchar
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git cherry-pick xiaoxiang781216/fckruegel-master
Auto-merging include/nuttx/analog/ioctl.h
[master 12365e6e79] Support for MAX1161X family of I2C 12 bit ADC chips: MAX11612: 4 channels VCC=5V0 Int VRef=4.096V MAX11613: 4 channels VCC=3V3 Int VRef=2.048V MAX11614: 8 channels VCC=5V0 Int VRef=4.096V MAX11615: 8 channels VCC=3V3 Int VRef=2.048V MAX11616: 12 channels VCC=5V0 Int VRef=4.096V MAX11617: 12 channels VCC=3V3 Int VRef=2.048V Note: The chips' auto-scanning feature is not supported in this revision.
Date: Fri Nov 6 11:01:03 2020 +0100
1 file changed, 2 insertions(+), 3 deletions(-)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git push -f origin master
Username for 'https://github.com': fckruegel
Password for 'https://fckruegel@github.com':
Enumerating objects: 551, done.
Counting objects: 100% (469/469), done.
Delta compression using up to 16 threads
Compressing objects: 100% (104/104), done.
Writing objects: 100% (308/308), 59.82 KiB | 5.44 MiB/s, done.
Total 308 (delta 252), reused 239 (delta 193)
remote: Resolving deltas: 100% (252/252), completed with 119 local objects.
To https://github.com/fckruegel/incubator-nuttx-1
c79bda6e4f..12365e6e79 master -> master
```
Looks good. Thank you very much.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel edited a comment on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel edited a comment on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727554117
>
>
> pleaase run "git fetch xiaoxiang781216" and cherry-pick again.
```
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git fetch xiaoxiang781216
The authenticity of host 'github.com (140.82.121.4)' can't be established.
RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
Warning: Permanently added 'github.com,140.82.121.4' (RSA) to the list of known hosts.
git@github.com: Permission denied (publickey).
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git config user.name
Frank-Christian Kruegel
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git config user.email
fchk@istda.com
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727293112
@fckruegel please cherry-pick this patch to your master to resolve the conflict:
https://github.com/xiaoxiang781216/incubator-nuttx/commit/4fbe15d9cfa599bd0440cf304c28dbb1d1f18f92
I don't have the right to update your git.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
acassis commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-725497315
@fckruegel hmm, there is a conflict in the include/nuttx/analog/ioctl.h did you see that? I think it was modified since you submit the original PR.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727547685
> run the following commands in your local git:
>
> ```
> git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
> git checkout master
> git cherry-pick xiaoxiang781216/fckruegel-master
> git push -f origin master
> ```
Oops- I get an error message.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote -v
origin https://github.com/fckruegel/incubator-nuttx-1 (fetch)
origin https://github.com/fckruegel/incubator-nuttx-1 (push)
upstream https://github.com/apache/incubator-nuttx (fetch)
upstream https://github.com/apache/incubator-nuttx (push)
xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git (fetch)
xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git (push)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git cherry-pick xiaoxiang781216/fckruegel-master
fatal: bad revision 'xiaoxiang781216/fckruegel-master'
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
I'm stuck.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel edited a comment on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel edited a comment on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-725500676
>
>
> @fckruegel hmm, there is a conflict in the include/nuttx/analog/ioctl.h did you see that? I think it was modified since you submit the original PR.
Yes, I know. This affects the IOCTL code allocations. The STM32G4 codes came in in the meantime. Just put my block of numbers after these.
Maybe we should add another system call analog_get_ioctl_range(), which would allow the OS to allocate the ranges dynamically. Linux switches to this model from a staic allocation of device major numbers after they ran out of number space.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] v01d commented on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
v01d commented on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-723068620
But what is the motivation behind it? Is it a previously existing file being shared to us (pre existing copyright)?
See here: https://www.apache.org/legal/src-headers.html
IMHO the goal is to have the Apache header unchanged for original works contributed to NuttX
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fckruegel edited a comment on pull request #2230: Support for MAX1161X family of I2C 12 bit ADC chips:
Posted by GitBox <gi...@apache.org>.
fckruegel edited a comment on pull request #2230:
URL: https://github.com/apache/incubator-nuttx/pull/2230#issuecomment-727547685
> run the following commands in your local git:
>
> ```
> git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
> git checkout master
> git cherry-pick xiaoxiang781216/fckruegel-master
> git push -f origin master
> ```
Oops- I get an error message.
```
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote add xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git remote -v
origin https://github.com/fckruegel/incubator-nuttx-1 (fetch)
origin https://github.com/fckruegel/incubator-nuttx-1 (push)
upstream https://github.com/apache/incubator-nuttx (fetch)
upstream https://github.com/apache/incubator-nuttx (push)
xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git (fetch)
xiaoxiang781216 git@github.com:xiaoxiang781216/incubator-nuttx.git (push)
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$ git cherry-pick xiaoxiang781216/fckruegel-master
fatal: bad revision 'xiaoxiang781216/fckruegel-master'
ubuntu@kruegel2:~/nuttx/incubator-nuttx-1$
```
I'm stuck.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org