[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-388-g68afc4c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-388-g68afc4c
|
From: Fabien M <fa...@us...> - 2010-06-02 09:31:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 68afc4c51799d8c62fa5831923770a7021298149 (commit)
via 2170a775ed619c14ad83af407aa6f86b5ae6d9b0 (commit)
from 0d09b77c52240b28b6a22a235430b609e89db8b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 68afc4c51799d8c62fa5831923770a7021298149
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 2 11:30:37 2010 +0200
[as_devices] as_pwm done and tested
commit 2170a775ed619c14ad83af407aa6f86b5ae6d9b0
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 2 10:09:21 2010 +0200
[as_devices] as_max5821 tested, little bug fixed
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_max5821.c | 21 ++-
target/packages/as_devices/c/as_pwm.c | 323 ++++++++++++++++-------------
target/packages/as_devices/c/as_pwm.h | 105 ++++++++--
target/packages/as_devices/test_c.h | 26 ++-
4 files changed, 291 insertions(+), 184 deletions(-)
diff --git a/target/packages/as_devices/c/as_max5821.c b/target/packages/as_devices/c/as_max5821.c
index ce11c06..168fbd6 100644
--- a/target/packages/as_devices/c/as_max5821.c
+++ b/target/packages/as_devices/c/as_max5821.c
@@ -34,8 +34,13 @@
#define MAX5821M_MAX_DATA_VALUE (1023)
-//#define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
-#define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
+//#define DEBUG
+
+#ifdef DEBUG
+# define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
+#else
+# define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
+#endif
/*-----------------------------------------------------------------------------*/
@@ -108,17 +113,17 @@ int32_t as_max5821_set_one_value(struct as_max5821_device *aDev,
switch(aChannel)
{
case 'a':
- case 'A': buff[0] = (aValue >> 8) & 0x0F;
+ case 'A': buff[0] = (aValue >> 6) & 0x0F;
break;
case 'b':
- case 'B': buff[0] = 0x10 | ((aValue >> 8) & 0x0F);
+ case 'B': buff[0] = 0x10 | ((aValue >> 6) & 0x0F);
break;
default: ERROR("Wrong channel name %c\n", aChannel);
return -1;
}
- buff[1] =(unsigned char)(aValue & 0x00FF);
-
+ buff[1] =(unsigned char)((aValue << 2) & 0x00FC);
+
ret = as_i2c_write(aDev->i2c_bus, aDev->i2c_address, buff, 2);
if (ret < 0) {
ERROR("can't write on i2c bus\n");
@@ -136,8 +141,8 @@ int32_t as_max5821_set_both_value(struct as_max5821_device *aDev,
int ret;
unsigned char buff[2];
- buff[0] = 0xC0 | ((unsigned char)((aValue >> 8)) & 0x0F);
- buff[1] = (unsigned char)(aValue & 0x00FF);
+ buff[0] = 0xC0 | ((unsigned char)((aValue >> 6)) & 0x0F);
+ buff[1] = (unsigned char)((aValue << 2) & 0x00FC);
ret = as_i2c_write(aDev->i2c_bus, aDev->i2c_address, buff, 2);
if (ret < 0) {
diff --git a/target/packages/as_devices/c/as_pwm.c b/target/packages/as_devices/c/as_pwm.c
index 1fa4e2d..56ac4c5 100644
--- a/target/packages/as_devices/c/as_pwm.c
+++ b/target/packages/as_devices/c/as_pwm.c
@@ -1,19 +1,19 @@
/*
** THE ARMadeus Systems
-**
-** Copyright (C) 2009 The armadeus systems team
+**
+** Copyright (C) 2009-2010 The armadeus systems team
** Fabien Marteau <fab...@ar...>
-**
+**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public
** License as published by the Free Software Foundation; either
** version 2.1 of the License, or (at your option) any later version.
-**
+**
** This library is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
** Lesser General Public License for more details.
-**
+**
** You should have received a copy of the GNU Lesser General Public
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -22,225 +22,206 @@
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h> /* for open() */
-#include <errno.h> /* for perror() */
#include <unistd.h> /* for write() */
#include "as_pwm.h"
+//#define DEBUG
+#ifdef DEBUG
+# define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
+#else
+# define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
+#endif
+
#define PWM_SYS_PATH "/sys/class/pwm/pwm"
#define FREQUENCY_PATH "frequency"
#define PERIOD_PATH "period"
-#define DUTY_PATH "duty"
+#define DUTY_PATH "duty"
#define ACTIVE_PATH "active"
-/* global static variable */
-static int mFHandlerFrequency[NUMBER_OF_PWM];
-static int mFHandlerPeriod[NUMBER_OF_PWM];
-static int mFHandlerDuty[NUMBER_OF_PWM];
-static int mFHandlerActive[NUMBER_OF_PWM];
-static int mFrequency[NUMBER_OF_PWM];
-static int mPeriod[NUMBER_OF_PWM];
-static int mDuty[NUMBER_OF_PWM];
-static int mState[NUMBER_OF_PWM];
+#define SIZE_OF_BUFF 50
/*------------------------------------------------------------------------------*/
-/** Write a string value in file
+/** @brief Write a string value in file
*
* @param aFile_handler: file handler
* @param aValueWrite: string value
- * @return error code or number char wrote
+ *
+ * @return number char wrote, negative value on error
*/
-int
-writeBuffer(int aFile_handler, char *aValueWrite)
+int writeBuffer(int aFile_handler, char *aValueWrite)
{
int ret;
ret = write(aFile_handler, aValueWrite, strlen(aValueWrite));
if (ret < 0)
{
- perror("Can't write file ");
+ ERROR("Can't write file ");
return ret;
}
ret = lseek(aFile_handler,0,SEEK_SET);
if (ret < 0)
{
- perror("lseek error ");
+ ERROR("lseek error ");
return ret;
}
return ret;
}
+
/*------------------------------------------------------------------------------*/
-/** Initialize pwm
- * @param aPwmNumber number of pwm used
- * @return error code
+/** @brief read a string value in file
+ *
+ * @param aFile_handler: file handler
+ * @param aValueRead[SIZE_OF_BUFF]: char pointer to read buffer
+ *
+ * @return number char read, negative value on error
*/
-int
-as_pwm_init(int aPwmNumber)
+int readBuffer(int aFile_handler, char *aValueRead)
{
- char buffer[50];
-
- mState[aPwmNumber] = 0;
-
- /* open pwm files management */
- snprintf(buffer,50,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,FREQUENCY_PATH);
- if((mFHandlerFrequency[aPwmNumber] = open(buffer,O_RDWR)) < 0)
- {
- perror("Can't open frequency files : ");
- return -1;
- }
- snprintf(buffer,50,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,PERIOD_PATH);
- if((mFHandlerPeriod[aPwmNumber] = open(buffer,O_RDWR)) < 0)
- {
- perror("Can't open period files : ");
- return -1;
- }
- snprintf(buffer,50,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,DUTY_PATH);
- if((mFHandlerDuty[aPwmNumber] = open(buffer,O_RDWR)) < 0)
+ int ret;
+ ret = read(aFile_handler, aValueRead, SIZE_OF_BUFF);
+ if (ret < 0)
{
- perror("Can't open duty files : ");
- return -1;
+ ERROR("Can't read file ");
+ return ret;
}
- snprintf(buffer,50,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,ACTIVE_PATH);
- if((mFHandlerActive[aPwmNumber] = open(buffer,O_RDWR)) < 0)
+ ret = lseek(aFile_handler,0,SEEK_SET);
+ if (ret < 0)
{
- perror("Can't open active files : ");
- return -1;
+ ERROR("lseek error ");
+ return ret;
}
-
- return 0;
+ return ret;
}
/*------------------------------------------------------------------------------*/
-/** Set pwm frequency
- * @param aPwmNumber number of pwm to close
- * @return no error if positive value
- */
-int
-as_pwm_close(int aPwmNumber)
+struct as_pwm_device *as_pwm_open(int aPwmNumber)
{
- int ret = 0;
+ char buffer[SIZE_OF_BUFF];
+ struct as_pwm_device *dev;
- mState[aPwmNumber] = 0;
+ dev = (struct as_pwm_device *)malloc(sizeof(struct as_pwm_device));
+ if (dev == NULL)
+ {
+ ERROR("Can't allocate memory for pwm device structure\n");
+ return NULL;
+ }
/* open pwm files management */
- ret = close(mFHandlerFrequency[aPwmNumber]);
- if(ret < 0)
+ snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,FREQUENCY_PATH);
+ if ((dev->fileFrequency = open(buffer,O_RDWR)) < 0)
{
- perror("Can't close frequency files : ");
- return ret;
+ ERROR("Can't open frequency files");
+ return NULL;
}
- ret = close(mFHandlerPeriod[aPwmNumber]);
- if(ret < 0)
+ snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,PERIOD_PATH);
+ if ((dev->filePeriod = open(buffer,O_RDWR)) < 0)
{
- perror("Can't close period files : ");
- return ret;
+ ERROR("Can't open period files");
+ return NULL;
}
- ret = close(mFHandlerDuty[aPwmNumber]);
- if(ret < 0)
+ snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,DUTY_PATH);
+ if((dev->fileDuty = open(buffer,O_RDWR)) < 0)
{
- perror("Can't close duty files : ");
- return ret;
+ ERROR("Can't open duty files");
+ return NULL;
}
- ret = close(mFHandlerActive[aPwmNumber]);
- if(ret < 0)
+ snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,ACTIVE_PATH);
+ if((dev->fileActive = open(buffer,O_RDWR)) < 0)
{
- perror("Can't close active files : ");
- return ret;
+ ERROR("Can't open active files");
+ return NULL;
}
- return ret;
-
+ return dev;
}
+
/*------------------------------------------------------------------------------*/
-/** Set pwm frequency
- * @param aPwmNumber number of pwm used
- * @param aFrequency frequency in Hz
- * @return no error if positive value
- */
-int
-as_pwm_setFrequency(int aPwmNumber, int aFrequency)
+int32_t as_pwm_set_frequency(struct as_pwm_device *aDev, int aFrequency)
{
- char buffer[50];
+ char buffer[SIZE_OF_BUFF];
- mFrequency[aPwmNumber] = aFrequency;
- snprintf(buffer,50,"%d",mFrequency[aPwmNumber]);
- return writeBuffer(mFHandlerFrequency[aPwmNumber],buffer);
+ snprintf(buffer,SIZE_OF_BUFF,"%d",aFrequency);
+ return writeBuffer(aDev->fileFrequency,buffer);
}
/*------------------------------------------------------------------------------*/
-/** get Frequency value
- * @param aPwmNumber number of pwm used
- * @return int frequency in Hz
- */
-int
-as_pwm_getFrequency(int aPwmNumber)
+
+int32_t as_pwm_get_frequency(struct as_pwm_device *aDev)
{
- return mFrequency[aPwmNumber];
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ ret = readBuffer(aDev->fileFrequency, buffer);
+ if (ret < 0)
+ {
+ ERROR("Can't read frequency\n");
+ return ret;
+ }
+
+ return atoi(buffer);
}
/*------------------------------------------------------------------------------*/
-/** set period
- *
- * @param pwm number used
- * @param aPeriod period in us
- * @return positive value if no error
- */
-int
-as_pwm_setPeriod(int aPwmNumber, int aPeriod)
+
+int32_t as_pwm_set_period(struct as_pwm_device *aDev, int aPeriod)
{
- char buffer[50];
- mPeriod[aPwmNumber] = aPeriod;
- snprintf(buffer,50,"%d",mPeriod[aPwmNumber]);
- return writeBuffer(mFHandlerPeriod[aPwmNumber],buffer);
+ char buffer[SIZE_OF_BUFF];
+
+ snprintf(buffer,SIZE_OF_BUFF,"%d",aPeriod);
+ return writeBuffer(aDev->filePeriod, buffer);
}
/*------------------------------------------------------------------------------*/
-/** get Period
- * @param aPwmNumber pwm number used
- * @return period int in us
- */
-int
-as_pwm_getPeriod(int aPwmNumber)
+
+int32_t as_pwm_get_period(struct as_pwm_device *aDev)
{
- return mPeriod[aPwmNumber];
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ ret = readBuffer(aDev->filePeriod, buffer);
+ if (ret < 0)
+ {
+ ERROR("Can't read period\n");
+ return ret;
+ }
+
+ return atoi(buffer);
}
/*------------------------------------------------------------------------------*/
-/** set duty
- * @param aPwmNumber pwm number used
- * @param aDuty duty in 1/1000
- * @return positive value if no error
- */
-int
-as_pwm_setDuty(int aPwmNumber, int aDuty)
+
+int32_t as_pwm_set_duty(struct as_pwm_device *aDev, int aDuty)
{
- char buffer[50];
- mDuty[aPwmNumber] = aDuty;
- snprintf(buffer, 50, "%d", aDuty);
- return writeBuffer(mFHandlerDuty[aPwmNumber], buffer);
+ char buffer[SIZE_OF_BUFF];
+
+ snprintf(buffer, SIZE_OF_BUFF, "%d", aDuty);
+ return writeBuffer( aDev->fileDuty, buffer);
}
/*------------------------------------------------------------------------------*/
-/** get duty
- *
- * @param aPwmNumber pwm number used
- * @return duty
- */
-int
-as_pwm_getDuty(int aPwmNumber)
+
+int32_t as_pwm_get_duty(struct as_pwm_device *aDev)
{
- return mDuty[aPwmNumber];
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ ret = readBuffer(aDev->fileDuty, buffer);
+ if (ret < 0)
+ {
+ ERROR("Can't read duty\n");
+ return ret;
+ }
+
+ return atoi(buffer);
}
/*------------------------------------------------------------------------------*/
-/** activate pwm
- * @param aPwmNumber pwm number used
- * @param aEnable
- */
-int as_pwm_activate(int aPwmNumber, int aEnable)
+
+int32_t as_pwm_set_state(struct as_pwm_device *aDev, int aEnable)
{
char one[] = "1";
char zero[] = "0";
@@ -248,23 +229,67 @@ int as_pwm_activate(int aPwmNumber, int aEnable)
if(aEnable)
{
- ret = writeBuffer(mFHandlerActive[aPwmNumber],one);
+ ret = writeBuffer(aDev->fileActive,one);
}else{
- ret = writeBuffer(mFHandlerActive[aPwmNumber],zero);
+ ret = writeBuffer(aDev->fileActive,zero);
}
if (ret < 0)
{
+ ERROR("Can't write file Active\n");
return ret;
}
- mState[aPwmNumber] = aEnable;
- return mState[aPwmNumber];
-
+ return ret;
}
-int as_pwm_getState(int aPwmNumber)
+/*------------------------------------------------------------------------------*/
+
+int32_t as_pwm_get_state(struct as_pwm_device *aDev)
{
- //XXX: get real state in pwm driver instead global variable
- return mState[aPwmNumber];
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ ret = readBuffer(aDev->fileActive, buffer);
+ if (ret < 0)
+ {
+ ERROR("Can't read state\n");
+ return ret;
+ }
+
+ return atoi(buffer);
}
+/*------------------------------------------------------------------------------*/
+int32_t as_pwm_close(struct as_pwm_device *aDev)
+{
+ int ret = 0;
+
+ /* open pwm files management */
+ ret = close(aDev->fileFrequency);
+ if(ret < 0)
+ {
+ ERROR("Can't close frequency files");
+ return ret;
+ }
+ ret = close(aDev->filePeriod);
+ if(ret < 0)
+ {
+ ERROR("Can't close period files");
+ return ret;
+ }
+ ret = close(aDev->fileDuty);
+ if(ret < 0)
+ {
+ ERROR("Can't close duty files");
+ return ret;
+ }
+ ret = close(aDev->fileActive);
+ if(ret < 0)
+ {
+ ERROR("Can't close active files");
+ return ret;
+ }
+
+ return ret;
+
+}
diff --git a/target/packages/as_devices/c/as_pwm.h b/target/packages/as_devices/c/as_pwm.h
index 769fa2b..9304ac9 100644
--- a/target/packages/as_devices/c/as_pwm.h
+++ b/target/packages/as_devices/c/as_pwm.h
@@ -1,19 +1,19 @@
/*
** THE ARMadeus Systems
-**
-** Copyright (C) 2009 The armadeus systems team
+**
+** Copyright (C) 2009 The armadeus systems team
** Fabien Marteau <fab...@ar...>
-**
+**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public
** License as published by the Free Software Foundation; either
** version 2.1 of the License, or (at your option) any later version.
-**
+**
** This library is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
** Lesser General Public License for more details.
-**
+**
** You should have received a copy of the GNU Lesser General Public
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -29,21 +29,96 @@ extern "C" {
/* number of pwm under system */
#define NUMBER_OF_PWM 2
-int as_pwm_init(int aPwmNumber);
+struct as_pwm_device {
+ int fileFrequency;
+ int filePeriod;
+ int fileDuty;
+ int fileActive;
+};
-int as_pwm_setFrequency(int aPwmNumber, int aFrequency);
-int as_pwm_getFrequency(int aPwmNumber);
+/** @brief Open pwm
+ *
+ * @param aPwmNumber the pwm number
+ *
+ * @return pointer to device structure, NULL if error
+ */
+struct as_pwm_device *as_pwm_open(int aPwmNumber);
-int as_pwm_setPeriod(int aPwmNumber, int aPeriod);
-int as_pwm_getPeriod(int aPwmNumber);
+/** @brief set frequency
+ *
+ * @param aDev pointer to device structure
+ * @param aFrequency frequency in Hz
+ *
+ * @return negative value on error
+ */
+int32_t as_pwm_set_frequency(struct as_pwm_device *aDev, int aFrequency);
-int as_pwm_setDuty(int aPwmNumber, int aDuty);
-int as_pwm_getDuty(int aPwmNumber);
+/** @brief get frequency
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return frequency value in Hz, negative value on error
+ */
+int32_t as_pwm_get_frequency(struct as_pwm_device *aDev);
-int as_pwm_activate(int aPwmNumber, int aEnable);
-int as_pwm_getState(int aPwmNumber);
+/** @bief set period
+ *
+ * @param aDev pointer to device structure
+ * @param aPeriod period in uS
+ *
+ * @return negative value on error
+ */
+int32_t as_pwm_set_period(struct as_pwm_device *aDev, int aPeriod);
-int as_pwm_close(int aPwmNumber);
+/** @brief get period value
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return period value in uS, negative value on error.
+ */
+int32_t as_pwm_get_period(struct as_pwm_device *aDev);
+
+/** @brief set duty
+ *
+ * @param aDev pointer to device structure
+ * @param aDuty duty in 0.1%
+ *
+ * @return negative value on error
+ */
+int32_t as_pwm_set_duty(struct as_pwm_device *aDev, int aDuty);
+
+/** @brief get duty
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return duty value in 0.1%, negative value on error
+ */
+int32_t as_pwm_get_duty(struct as_pwm_device *aDev);
+
+/** @brief set state of pwm
+ *
+ * @param aDev pointer to device structure
+ * @param aEnable 0:disable, 1:enable
+ *
+ * @return negative value on error
+ */
+int32_t as_pwm_set_state(struct as_pwm_device *aDev, int aEnable);
+
+/** @brief get state of pwm
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return 0:disabled, 1:enabled, negative value on error
+ */
+int32_t as_pwm_get_state(struct as_pwm_device *aDev);
+
+/** @brief close pwm
+ *
+ * @param aDev pointer structure to device
+ *
+ * @return negative value on error
+ */
+int32_t as_pwm_close(struct as_pwm_device *aDev);
#ifdef __cplusplus
}
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index 049ad08..b763ed6 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -46,10 +46,12 @@ void test_pwm(void)
char buffer[20];
char buffer2[20];
int value;
+ struct as_pwm_device *pwm_dev;
- ret = as_pwm_init(PWM_NUM);
- if(ret < 0){
+ pwm_dev = as_pwm_open(PWM_NUM);
+ if(pwm_dev == NULL){
printf("can't init pwm0\n");
+ pressEnterToContinue();
return;
}
while(buffer[0] != 'q')
@@ -74,41 +76,41 @@ void test_pwm(void)
{
case '1' : printf("Give frequency :");
scanf("%d",&value);
- as_pwm_setFrequency(PWM_NUM,value);
+ as_pwm_set_frequency(pwm_dev,value);
pressEnterToContinue();
break;
case '2' : printf("Current pwm frequency is %d\n",
- as_pwm_getFrequency(PWM_NUM));
+ as_pwm_get_frequency(pwm_dev));
pressEnterToContinue();
break;
case '3' : printf("Give period :");
scanf("%d",&value);
- as_pwm_setPeriod(PWM_NUM,value);
+ as_pwm_set_period(pwm_dev,value);
pressEnterToContinue();
break;
case '4' : printf("Current period is %d\n",
- as_pwm_getPeriod(PWM_NUM));
+ as_pwm_get_period(pwm_dev));
pressEnterToContinue();
break;
case '5' : printf("Give Duty :");
scanf("%d",&value);
- as_pwm_setDuty(PWM_NUM,value);
+ as_pwm_set_duty(pwm_dev,value);
pressEnterToContinue();
break;
case '6' : printf("Current Duty is %d\n",
- as_pwm_getDuty(PWM_NUM));
+ as_pwm_get_duty(pwm_dev));
pressEnterToContinue();
break;
case '7' : printf("Activate 'a' or Desactivate 'd' ?");
scanf("%s",buffer2);
if(buffer2[0] == 'a')
{
- as_pwm_activate(PWM_NUM,1);
+ as_pwm_set_state(pwm_dev,1);
printf("Pwm activated\n");
pressEnterToContinue();
}else if(buffer2[0] == 'd')
{
- as_pwm_activate(PWM_NUM,0);
+ as_pwm_set_state(pwm_dev,0);
printf("Pwm desactivated\n");
pressEnterToContinue();
}else{
@@ -116,7 +118,7 @@ void test_pwm(void)
pressEnterToContinue();
}
break;
- case '8' : if(as_pwm_getState(PWM_NUM))
+ case '8' : if(as_pwm_get_state(pwm_dev))
{
printf("pwm is active\n");
pressEnterToContinue();
@@ -128,7 +130,7 @@ void test_pwm(void)
default : break;
}
}
- ret = as_pwm_close(PWM_NUM);
+ ret = as_pwm_close(pwm_dev);
if(ret < 0){
printf("can't close pwm0\n");
return;
hooks/post-receive
--
armadeus
|
