Support for MAX1161X family of I2C 12 bit ADC chips: #2230

fckruegel · 2020-11-06T10:07:11Z

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

acassis · 2020-11-06T12:56:15Z

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.

protobits · 2020-11-06T13:00:51Z

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

patacongo · 2020-11-06T13:19:20Z

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.

acassis · 2020-11-06T21:00:49Z

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.

justinmclean · 2020-11-06T21:18:30Z

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

acassis · 2020-11-11T15:42:36Z

Thank you very much @fckruegel !

acassis · 2020-11-11T15:45:03Z

@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.

fckruegel · 2020-11-11T15:50:58Z

@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.

acassis · 2020-11-12T13:01:46Z

@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?

xiaoxiang781216 · 2020-11-13T14:07:26Z

@fckruegel could you resolve the conflict?

xiaoxiang781216 · 2020-11-15T01:42:20Z

@fckruegel please cherry-pick this patch to your master to resolve the conflict:
xiaoxiang781216@4fbe15d
I don't have the right to update your git.

fckruegel · 2020-11-15T07:32:39Z

@fckruegel please cherry-pick this patch to your master to resolve the conflict:
xiaoxiang781216@4fbe15d
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?

xiaoxiang781216 · 2020-11-15T08:55:57Z

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

fckruegel · 2020-11-15T10:27:25Z

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.

xiaoxiang781216 · 2020-11-15T11:17:35Z

pleaase run "git fetch xiaoxiang781216" and cherry-pick again.

fckruegel · 2020-11-15T11:22:12Z

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$

xiaoxiang781216 · 2020-11-15T11:49:39Z

how about this:

git remote remove xiaoxiang781216
git remote add xiaoxiang781216 https://github.com/xiaoxiang781216/incubator-nuttx.git
git fetch xiaoxiang781216
``

fckruegel · 2020-11-15T11:55:39Z

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.

common/gnu/fork.S 29: unknown instruction .syntax unified --^ [asarm] (error apache#2230) common/gnu/fork.S 81: bad directive .type up_fork , function ------------------^ [asarm] (error apache#2067) armv7-m/arm_saveusercontext.S 31: unknown instruction .syntax unified --^ [asarm] (error apache#2230) armv7-m/arm_saveusercontext.S 55: bad directive .type up_saveusercontext , % function --^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 65: not within valid register range str r12 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 4 ) ) ] ------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 66: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 5 ) ) ] ------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 67: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 6 ) ) ] ------^ [asarm] (error apache#2014) armv7-m/arm_saveusercontext.S 72: expected a register str r1 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 7 ) ) ] ------------------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 75: not within valid register range add r1 , r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 8 ) ) -----------^ [asarm] (error apache#2071) armv7-m/arm_saveusercontext.S 89: bad parameter stmia r0 ! , { r2 - r11 } --------^ [asarm] (error apache#2014) armv7-m/arm_saveusercontext.S 93: expected a register mov r1 , - 1 -----------^ Signed-off-by: yanghuatao <yanghuatao@xiaomi.com>

CC: bch/bchlib_read.c [asarm] (error apache#2067) machine/arm/gnu/arch_setjmp.S 34: unknown instruction .syntax unified --^ [asarm] (error apache#2230) machine/arm/gnu/arch_setjmp.S 62: bad directive .type setjmp , function -----------------^ [asarm] (error) errors during processing Signed-off-by: guoshichao <guoshichao@xiaomi.com>

common/gnu/fork.S 29: unknown instruction .syntax unified --^ [asarm] (error apache#2230) common/gnu/fork.S 81: bad directive .type up_fork , function ------------------^ [asarm] (error apache#2067) armv7-m/arm_saveusercontext.S 31: unknown instruction .syntax unified --^ [asarm] (error apache#2230) armv7-m/arm_saveusercontext.S 55: bad directive .type up_saveusercontext , % function --^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 65: not within valid register range str r12 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 4 ) ) ] ------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 66: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 5 ) ) ] ------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 67: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 6 ) ) ] ------^ [asarm] (error apache#2014) armv7-m/arm_saveusercontext.S 72: expected a register str r1 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 7 ) ) ] ------------------^ [asarm] (error apache#2004) armv7-m/arm_saveusercontext.S 75: not within valid register range add r1 , r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 8 ) ) -----------^ [asarm] (error apache#2071) armv7-m/arm_saveusercontext.S 89: bad parameter stmia r0 ! , { r2 - r11 } --------^ [asarm] (error apache#2014) armv7-m/arm_saveusercontext.S 93: expected a register mov r1 , - 1 -----------^ Signed-off-by: yanghuatao <yanghuatao@xiaomi.com>

CC: bch/bchlib_read.c [asarm] (error apache#2067) machine/arm/gnu/arch_setjmp.S 34: unknown instruction .syntax unified --^ [asarm] (error apache#2230) machine/arm/gnu/arch_setjmp.S 62: bad directive .type setjmp , function -----------------^ [asarm] (error) errors during processing Signed-off-by: guoshichao <guoshichao@xiaomi.com>

common/gnu/fork.S 29: unknown instruction .syntax unified --^ [asarm] (error #2230) common/gnu/fork.S 81: bad directive .type up_fork , function ------------------^ [asarm] (error #2067) armv7-m/arm_saveusercontext.S 31: unknown instruction .syntax unified --^ [asarm] (error #2230) armv7-m/arm_saveusercontext.S 55: bad directive .type up_saveusercontext , % function --^ [asarm] (error #2004) armv7-m/arm_saveusercontext.S 65: not within valid register range str r12 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 4 ) ) ] ------^ [asarm] (error #2004) armv7-m/arm_saveusercontext.S 66: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 5 ) ) ] ------^ [asarm] (error #2004) armv7-m/arm_saveusercontext.S 67: not within valid register range str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 6 ) ) ] ------^ [asarm] (error #2014) armv7-m/arm_saveusercontext.S 72: expected a register str r1 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 7 ) ) ] ------------------^ [asarm] (error #2004) armv7-m/arm_saveusercontext.S 75: not within valid register range add r1 , r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 8 ) ) -----------^ [asarm] (error #2071) armv7-m/arm_saveusercontext.S 89: bad parameter stmia r0 ! , { r2 - r11 } --------^ [asarm] (error #2014) armv7-m/arm_saveusercontext.S 93: expected a register mov r1 , - 1 -----------^ Signed-off-by: yanghuatao <yanghuatao@xiaomi.com>

CC: bch/bchlib_read.c [asarm] (error #2067) machine/arm/gnu/arch_setjmp.S 34: unknown instruction .syntax unified --^ [asarm] (error #2230) machine/arm/gnu/arch_setjmp.S 62: bad directive .type setjmp , function -----------------^ [asarm] (error) errors during processing Signed-off-by: guoshichao <guoshichao@xiaomi.com>

[asarm] (error apache#2067) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 35: unknown instruction .syntax unified --^ [asarm] (error apache#2067) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 70: unknown instruction .thumb_func --^ [asarm] (error apache#2230) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 72: bad directive .type up_signal_handler , function ----------------------------^ Signed-off-by: guoshichao <guoshichao@xiaomi.com>

[asarm] (error #2067) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 35: unknown instruction .syntax unified --^ [asarm] (error #2067) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 70: unknown instruction .thumb_func --^ [asarm] (error #2230) /home/guoshichao/work_profile/vela_os/vela_car_6/nuttx/arch/arm/src/common/gnu/arm_signal_handler.S 72: bad directive .type up_signal_handler , function ----------------------------^ Signed-off-by: guoshichao <guoshichao@xiaomi.com>

xiaoxiang781216 closed this Nov 15, 2020

xiaoxiang781216 force-pushed the master branch from 7760fd1 to c79bda6 Compare November 15, 2020 01:33

xiaoxiang781216 mentioned this pull request Nov 15, 2020

Support for MAX1161X family of I2C 12 bit ADC chips #2301

Merged

extinguish mentioned this pull request Aug 10, 2024

fix greenhills compile and link error on NuttX #12846

Closed

extinguish mentioned this pull request Aug 12, 2024

greenhills support: fix the asm build error for adapting to greenhills compiler #12883

Merged

Support for MAX1161X family of I2C 12 bit ADC chips: #2230

Support for MAX1161X family of I2C 12 bit ADC chips: #2230

Uh oh!

Conversation

fckruegel commented Nov 6, 2020

Summary

Impact

Testing

Uh oh!

acassis commented Nov 6, 2020

Uh oh!

protobits commented Nov 6, 2020

Uh oh!

patacongo commented Nov 6, 2020 via email

Uh oh!

acassis commented Nov 6, 2020

Uh oh!

justinmclean commented Nov 6, 2020 via email

Uh oh!

acassis commented Nov 11, 2020

Uh oh!

acassis commented Nov 11, 2020

Uh oh!

fckruegel commented Nov 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

acassis commented Nov 12, 2020

Uh oh!

xiaoxiang781216 commented Nov 13, 2020

Uh oh!

xiaoxiang781216 commented Nov 15, 2020

Uh oh!

fckruegel commented Nov 15, 2020

Uh oh!

xiaoxiang781216 commented Nov 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fckruegel commented Nov 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xiaoxiang781216 commented Nov 15, 2020

Uh oh!

fckruegel commented Nov 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xiaoxiang781216 commented Nov 15, 2020

Uh oh!

fckruegel commented Nov 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fckruegel commented Nov 11, 2020 •

edited

Loading

xiaoxiang781216 commented Nov 15, 2020 •

edited

Loading

fckruegel commented Nov 15, 2020 •

edited

Loading

fckruegel commented Nov 15, 2020 •

edited

Loading

fckruegel commented Nov 15, 2020 •

edited

Loading