Manage multiple instances of analog out #4529

LMESTM · 2017-06-12T15:55:15Z

Description

This PR addresses the problem reported in #1083.
It also generalizes the fix to more targets by putting some code in common

Should solve as well:
#3970

Status

READY

Todos

Tests
Non regresssion tests done:
Analog CI tests shield tests OK

theotherjimmy · 2017-06-12T16:15:57Z

@LMESTM It looks like this does not compile correctly with GCC. Travis has this error:

Executing: python tools/build.py -m NUCLEO_F207ZG -t GCC_ARM -j 4 -c --silent --dsp --usb

/home/travis/build/ARMmbed/mbed-os/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c: In function 'analogout_init':

/home/travis/build/ARMmbed/mbed-os/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c:73:5: error: 'Dacobj' undeclared (first use in this function)

     Dacobj->handleHandle.Instance = DAC;

     ^

/home/travis/build/ARMmbed/mbed-os/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c:73:5: note: each undeclared identifier is reported only once for each function it appears in

/home/travis/build/ARMmbed/mbed-os/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c:74:26: error: 'dac_t' has no member named 'handle'

     if (HAL_DAC_Init(&obj->handle) != HAL_OK ) {

                          ^

/home/travis/build/ARMmbed/mbed-os/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c:81:35: error: 'dac_t' has no member named 'handle'

     if (HAL_DAC_ConfigChannel(&obj->handle, &sConfig, obj->channel) != HAL_OK) {

0xc0170 · 2017-06-13T10:03:26Z

targets/TARGET_STM/analogout_api.c

+    return (float)value * (1.0f / (float)DAC_RANGE);
+}
+
+uint16_t analogout_read_u16(dac_t *obj) {


Can you please fix the formatting in this file ?

void function() { //body }

0xc0170 · 2017-06-13T10:07:12Z

features/unsupported/tests/mbed/basic/main.cpp

-    MBED_HOSTTEST_DESCRIPTION(Basic);
-    MBED_HOSTTEST_START("MBED_A1");
-    MBED_HOSTTEST_RESULT(true);
+    PwmOut pwm1(D4);


is this test program that you have been using for testing (because this is not basic anymore) ?

Thanks - indeed a mistake of mine !

LMESTM · 2017-06-13T11:53:12Z

@theotherjimmy sorry about the failure - corrected now
@0xc0170 code formatting updated

0xc0170 · 2017-06-20T11:02:46Z

/morph test

mbed-bot · 2017-06-20T13:51:51Z

Result: ABORTED

Your command has finished executing! Here's what you wrote!

/morph test

0xc0170 · 2017-06-21T11:11:05Z

CI will be restarted once the CI for the patch release finishes

studavekar · 2017-06-21T18:59:46Z

/morph test

mbed-bot · 2017-06-21T22:50:46Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 604

Build failed!

studavekar · 2017-06-22T00:48:14Z

Build failed for DISCO_L475VG_IOT01A

17:32:58         [Error] common_objects.h@121,0:  #256: invalid redeclaration of type name "dac_s" (declared at line 63 of "/home/arm/mbed_jenkins/workspace/bm_wrap/651/mbed-os/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/objects.h")

LMESTM · 2017-06-22T08:09:12Z

@studavekar Thanks. This board has been merged in the mean time - I will update the PR

LMESTM · 2017-06-22T08:41:44Z

@studavekar ok rebased and compilation issue fixed

theotherjimmy · 2017-06-26T15:07:25Z

/morph test

mbed-bot · 2017-06-27T07:03:00Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 646

Build failed!

This allows a proper handling of multiple instances. Also this commit stores the channel in the HAL format so that it can be re-used more easily and call to HAL are straightforward.

ADC1 channel2 and ADC2 of few targets only have an output switch and no buffer. This switch needs to be enabled, and also the buffer can be enabled in order to reduce the output impedance on output, and to drive external loads directly without having to add an external operational amplifier.

Moving some code in common to be able to manage several ADC instances, or several channels of an instance. The change involves: - moving dac_s structure definition to common_object.h - create TARGET_STM/analogout_api.c and move fully common analog_out functions in there - rename analogout_api.c of each target family into analogout_device.c to keep platform specific code - update analogout_device.c to rely on obj->handle and obj->channel - align analogout_init function as much as possible between families in analogout_device.c files

Fixing conflict as STM32L475xG target has been merged after the first version of moving dac_s structure definition to common_ojects.h.

Fixing conflict as STM32F413xH target has been merged after the first version of moving dac_s structure definition to common_ojects.h

LMESTM · 2017-06-27T07:32:23Z

@studavekar @theotherjimmy there was yet another build error to fix - so rebased and new fix added.
Would be great if you can restart /morph test

0xc0170 · 2017-06-27T12:56:37Z

/morph test

mbed-bot · 2017-06-28T08:17:42Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 665

Test failed!

0xc0170 · 2017-06-29T12:18:31Z

retest uvisor

theotherjimmy · 2017-06-29T15:51:11Z

/morph test

mbed-bot · 2017-06-29T20:56:57Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 693

Test failed!

LMESTM · 2017-06-30T06:58:47Z

@0xc0170 @theotherjimmy what is wrong with /morph test - is there something I need to fix ?

0xc0170 · 2017-06-30T08:09:57Z

@0xc0170 @theotherjimmy what is wrong with /morph test - is there something I need to fix ?

If there is anything , we would let you know.

mbed-bot · 2017-06-30T10:58:57Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test - is there something I need to fix ?

If there is anything , we would let you know.

Output

mbed Build Number: 706

Test failed!

studavekar · 2017-06-30T17:12:04Z

/morph test

mbed-bot · 2017-06-30T18:51:54Z

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 710

All builds and test passed!

theotherjimmy · 2017-06-30T18:53:20Z

Merging time.

0xc0170 requested changes Jun 13, 2017

View reviewed changes

0xc0170 added the needs: work label Jun 13, 2017

LMESTM force-pushed the issue_1083 branch from 533f31e to 8db3ca3 Compare June 13, 2017 11:52

LMESTM mentioned this pull request Jun 13, 2017

Nucleo F303K8 DAC output doesn't work #3970

Closed

sg- added needs: CI release-version: 5.5.2 and removed needs: work labels Jun 15, 2017

LMESTM mentioned this pull request Jun 16, 2017

Multiple AnalogIn/AnalogOut needs continuous initialization on Nucleo F334R8 #1083

Closed

0xc0170 approved these changes Jun 20, 2017

View reviewed changes

LMESTM force-pushed the issue_1083 branch from 8db3ca3 to 75e1c8f Compare June 22, 2017 08:41

LMESTM added 5 commits June 27, 2017 09:27

STM32: analag_out: Use dynamic handle in object rather than static

cdd581b

This allows a proper handling of multiple instances. Also this commit stores the channel in the HAL format so that it can be re-used more easily and call to HAL are straightforward.

STM32: STM32L475xG dac_s common definition

07575b3

Fixing conflict as STM32L475xG target has been merged after the first version of moving dac_s structure definition to common_ojects.h.

STM32: STM32F413xH dac_s common definition

4238216

Fixing conflict as STM32F413xH target has been merged after the first version of moving dac_s structure definition to common_ojects.h

LMESTM force-pushed the issue_1083 branch from 75e1c8f to 4238216 Compare June 27, 2017 07:31

theotherjimmy added ready for merge and removed needs: CI labels Jun 30, 2017

theotherjimmy merged commit d382d44 into ARMmbed:master Jun 30, 2017

theotherjimmy removed the ready for merge label Jun 30, 2017

Manage multiple instances of analog out #4529

Manage multiple instances of analog out #4529

Uh oh!

Conversation

LMESTM commented Jun 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Status

Todos

Uh oh!

theotherjimmy commented Jun 12, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LMESTM commented Jun 13, 2017

Uh oh!

0xc0170 commented Jun 20, 2017

Uh oh!

mbed-bot commented Jun 20, 2017

Uh oh!

0xc0170 commented Jun 21, 2017

Uh oh!

studavekar commented Jun 21, 2017

Uh oh!

mbed-bot commented Jun 21, 2017

Output

Uh oh!

studavekar commented Jun 22, 2017

Uh oh!

LMESTM commented Jun 22, 2017

Uh oh!

LMESTM commented Jun 22, 2017

Uh oh!

theotherjimmy commented Jun 26, 2017

Uh oh!

mbed-bot commented Jun 27, 2017

Output

Uh oh!

LMESTM commented Jun 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Jun 27, 2017

Uh oh!

mbed-bot commented Jun 28, 2017

Output

Uh oh!

0xc0170 commented Jun 29, 2017

Uh oh!

theotherjimmy commented Jun 29, 2017

Uh oh!

mbed-bot commented Jun 29, 2017

Output

Uh oh!

LMESTM commented Jun 30, 2017

Uh oh!

0xc0170 commented Jun 30, 2017

Uh oh!

mbed-bot commented Jun 30, 2017

Output

Uh oh!

studavekar commented Jun 30, 2017

Uh oh!

mbed-bot commented Jun 30, 2017

Output

Uh oh!

theotherjimmy commented Jun 30, 2017

Uh oh!

Uh oh!

LMESTM commented Jun 12, 2017 •

edited

Loading

LMESTM commented Jun 27, 2017 •

edited

Loading