Add code changes from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3507 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
c5118a85cf
commit
8fe277d601
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
unsigned char romfs_img[] = {
|
||||
0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x02, 0x00,
|
||||
0x95, 0x7e, 0x5e, 0x1a, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
|
||||
0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x02, 0x10,
|
||||
0xad, 0x5b, 0x65, 0xae, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
|
||||
0x6f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
|
||||
0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xd1, 0xff, 0xff, 0x97,
|
||||
0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@ -15,34 +15,34 @@ unsigned char romfs_img[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x60,
|
||||
0x00, 0x00, 0x00, 0x00, 0xd1, 0xff, 0xfe, 0xe0, 0x2e, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1c,
|
||||
0x8d, 0x9c, 0xab, 0xda, 0x72, 0x63, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x29,
|
||||
0x8d, 0x9c, 0xab, 0xcd, 0x72, 0x63, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x63, 0x68, 0x6f,
|
||||
0x20, 0x22, 0x56, 0x53, 0x4e, 0x20, 0x4e, 0x75, 0x74, 0x74, 0x58, 0x20,
|
||||
0x36, 0x2e, 0x31, 0x2c, 0x20, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x65, 0x74,
|
||||
0x43, 0x6c, 0x61, 0x6d, 0x70, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x22, 0x0a,
|
||||
0x0a, 0x23, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20,
|
||||
0x52, 0x41, 0x4d, 0x44, 0x49, 0x53, 0x4b, 0x20, 0x61, 0x6e, 0x64, 0x20,
|
||||
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x69, 0x74, 0x20, 0x61, 0x74, 0x20,
|
||||
0x2f, 0x74, 0x6d, 0x70, 0x0a, 0x23, 0x6d, 0x6b, 0x72, 0x64, 0x20, 0x2d,
|
||||
0x6d, 0x20, 0x31, 0x20, 0x2d, 0x73, 0x20, 0x35, 0x31, 0x32, 0x20, 0x34,
|
||||
0x30, 0x0a, 0x23, 0x6d, 0x6b, 0x66, 0x61, 0x74, 0x66, 0x73, 0x20, 0x2f,
|
||||
0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x31, 0x0a, 0x23, 0x6d, 0x6f,
|
||||
0x75, 0x6e, 0x74, 0x20, 0x2d, 0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20,
|
||||
0x2f, 0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x31, 0x20, 0x2f, 0x74,
|
||||
0x6d, 0x70, 0x0a, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d, 0x74,
|
||||
0x20, 0x62, 0x69, 0x6e, 0x66, 0x73, 0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f,
|
||||
0x72, 0x61, 0x6d, 0x30, 0x20, 0x2f, 0x73, 0x62, 0x69, 0x6e, 0x0a, 0x0a,
|
||||
0x72, 0x61, 0x6d, 0x74, 0x72, 0x6f, 0x6e, 0x20, 0x73, 0x74, 0x61, 0x72,
|
||||
0x74, 0x20, 0x33, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d, 0x74,
|
||||
0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f, 0x6d,
|
||||
0x74, 0x64, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x30, 0x20, 0x2f, 0x75, 0x73,
|
||||
0x72, 0x0a, 0x0a, 0x73, 0x64, 0x63, 0x61, 0x72, 0x64, 0x20, 0x73, 0x74,
|
||||
0x61, 0x72, 0x74, 0x20, 0x30, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20,
|
||||
0x2d, 0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, 0x64, 0x65, 0x76,
|
||||
0x2f, 0x6d, 0x6d, 0x63, 0x73, 0x64, 0x30, 0x20, 0x2f, 0x73, 0x64, 0x63,
|
||||
0x61, 0x72, 0x64, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x20, 0x22, 0x56, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6c, 0x65, 0x20,
|
||||
0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x20, 0x4e, 0x6f, 0x64, 0x65, 0x20,
|
||||
0x56, 0x31, 0x2e, 0x32, 0x2c, 0x20, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x65,
|
||||
0x74, 0x43, 0x6c, 0x61, 0x6d, 0x70, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x22,
|
||||
0x0a, 0x0a, 0x23, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x61,
|
||||
0x20, 0x52, 0x41, 0x4d, 0x44, 0x49, 0x53, 0x4b, 0x20, 0x61, 0x6e, 0x64,
|
||||
0x20, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x69, 0x74, 0x20, 0x61, 0x74,
|
||||
0x20, 0x2f, 0x74, 0x6d, 0x70, 0x0a, 0x23, 0x6d, 0x6b, 0x72, 0x64, 0x20,
|
||||
0x2d, 0x6d, 0x20, 0x31, 0x20, 0x2d, 0x73, 0x20, 0x35, 0x31, 0x32, 0x20,
|
||||
0x34, 0x30, 0x0a, 0x23, 0x6d, 0x6b, 0x66, 0x61, 0x74, 0x66, 0x73, 0x20,
|
||||
0x2f, 0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x31, 0x0a, 0x23, 0x6d,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d, 0x74, 0x20, 0x76, 0x66, 0x61, 0x74,
|
||||
0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f, 0x72, 0x61, 0x6d, 0x31, 0x20, 0x2f,
|
||||
0x74, 0x6d, 0x70, 0x0a, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d,
|
||||
0x74, 0x20, 0x62, 0x69, 0x6e, 0x66, 0x73, 0x20, 0x2f, 0x64, 0x65, 0x76,
|
||||
0x2f, 0x72, 0x61, 0x6d, 0x30, 0x20, 0x2f, 0x73, 0x62, 0x69, 0x6e, 0x0a,
|
||||
0x0a, 0x72, 0x61, 0x6d, 0x74, 0x72, 0x6f, 0x6e, 0x20, 0x73, 0x74, 0x61,
|
||||
0x72, 0x74, 0x20, 0x33, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x2d,
|
||||
0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, 0x64, 0x65, 0x76, 0x2f,
|
||||
0x6d, 0x74, 0x64, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x30, 0x20, 0x2f, 0x75,
|
||||
0x73, 0x72, 0x0a, 0x0a, 0x73, 0x64, 0x63, 0x61, 0x72, 0x64, 0x20, 0x73,
|
||||
0x74, 0x61, 0x72, 0x74, 0x20, 0x30, 0x0a, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
|
||||
0x20, 0x2d, 0x74, 0x20, 0x76, 0x66, 0x61, 0x74, 0x20, 0x2f, 0x64, 0x65,
|
||||
0x76, 0x2f, 0x6d, 0x6d, 0x63, 0x73, 0x64, 0x30, 0x20, 0x2f, 0x73, 0x64,
|
||||
0x63, 0x61, 0x72, 0x64, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
echo "VSN NuttX 6.1, www.netClamps.com"
|
||||
echo "Versatile Sensor Node V1.2, www.netClamps.com"
|
||||
|
||||
# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
|
||||
#mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
|
||||
|
||||
@ -69,6 +69,9 @@ CONFIGURED_APPS += vsn/ramtron
|
||||
# Provide UNIX style free
|
||||
CONFIGURED_APPS += vsn/free
|
||||
|
||||
# Provide System Information Utilityu
|
||||
CONFIGURED_APPS += vsn/sysinfo
|
||||
|
||||
# Provide JAVA Virtual Machine (the Darjeeling JVM)
|
||||
#CONFIGURED_APPS += vsn/jvm
|
||||
|
||||
|
||||
@ -161,8 +161,9 @@ CONFIG_STM32_I2C1=y
|
||||
CONFIG_STM32_I2C2=y
|
||||
CONFIG_STM32_USB=n
|
||||
CONFIG_STM32_CAN=n
|
||||
CONFIG_STM32_BKP=n
|
||||
CONFIG_STM32_PWR=n
|
||||
# Note that in order to enable RTC, BKP and PWR must be enabled
|
||||
CONFIG_STM32_BKP=y
|
||||
CONFIG_STM32_PWR=y
|
||||
CONFIG_STM32_DAC=n
|
||||
# APB2:
|
||||
CONFIG_STM32_ADC1=n
|
||||
@ -253,6 +254,11 @@ CONFIG_SSI_POLLWAIT=y
|
||||
#
|
||||
CONFIG_I2C=y
|
||||
|
||||
#
|
||||
# OS support for hardware RTC
|
||||
#
|
||||
CONFIG_RTC=y
|
||||
|
||||
#
|
||||
# General build options
|
||||
#
|
||||
@ -870,3 +876,11 @@ CONFIG_APPS_DIR="../apps"
|
||||
|
||||
# Provide /dev/ramX and then: mount -t binfs /dev/ram0 /bin
|
||||
CONFIG_APPS_BINDIR=y
|
||||
|
||||
# Application configuration
|
||||
|
||||
CONFIG_APPS_DIR="../apps"
|
||||
|
||||
# Application configuration
|
||||
|
||||
CONFIG_APPS_DIR="../apps"
|
||||
|
||||
@ -70,8 +70,13 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include <nuttx/fs.h>
|
||||
#include <nuttx/i2c/i2c.h>
|
||||
#include <semaphore.h>
|
||||
#include <nuttx/clock.h>
|
||||
#include <nuttx/time.h>
|
||||
#include <nuttx/rtc.h>
|
||||
|
||||
#include <nuttx/i2c/i2c.h>
|
||||
#include <nuttx/i2c/st_lis331dl.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -80,7 +85,7 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include "vsn.h"
|
||||
#include <nuttx/i2c/st_lis331dl.h>
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
@ -297,10 +302,7 @@ int sif_anout_init(void)
|
||||
{
|
||||
vsn_sif.tim3 = stm32_tim_init(3);
|
||||
vsn_sif.tim8 = stm32_tim_init(8);
|
||||
|
||||
vsn_sif.i2c1 = up_i2cinitialize(1);
|
||||
vsn_sif.i2c2 = up_i2cinitialize(2);
|
||||
|
||||
|
||||
if (!vsn_sif.tim3 || !vsn_sif.tim8) return ERROR;
|
||||
|
||||
// Use the TIM3 as PWM modulated analogue output
|
||||
@ -318,12 +320,15 @@ int sif_anout_init(void)
|
||||
STM32_TIM_ENABLEINT(vsn_sif.tim8, 0);
|
||||
|
||||
STM32_TIM_SETPERIOD(vsn_sif.tim8, 4096);
|
||||
STM32_TIM_SETCOMPARE(vsn_sif.tim8, GPIO_OUT_PWRPWM_TIM8_CH, 0);
|
||||
STM32_TIM_SETCOMPARE(vsn_sif.tim8, GPIO_OUT_PWRPWM_TIM8_CH, 5000);
|
||||
|
||||
STM32_TIM_SETCLOCK(vsn_sif.tim8, 36e6);
|
||||
STM32_TIM_SETMODE(vsn_sif.tim8, STM32_TIM_MODE_UP);
|
||||
STM32_TIM_SETCHANNEL(vsn_sif.tim8, GPIO_OUT_PWRPWM_TIM8_CH, STM32_TIM_CH_OUTPWM | STM32_TIM_CH_POLARITY_NEG);
|
||||
|
||||
vsn_sif.i2c1 = up_i2cinitialize(1);
|
||||
vsn_sif.i2c2 = up_i2cinitialize(2);
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
@ -470,7 +475,7 @@ int sif_init(void)
|
||||
|
||||
sif_gpios_reset();
|
||||
if ( sif_anout_init() != OK ) return -1;
|
||||
|
||||
|
||||
/* If everything is okay, register the driver */
|
||||
|
||||
(void)register_driver("/dev/sif0", &devsif_fops, 0666, NULL);
|
||||
@ -502,28 +507,41 @@ int sif_main(int argc, char *argv[])
|
||||
STM32_TIM_SETCOMPARE(vsn_sif.tim8, GPIO_OUT_PWRPWM_TIM8_CH, val);
|
||||
return 0;
|
||||
}
|
||||
else if (!strcmp(argv[1], "time") && argc == 3) {
|
||||
int val = atoi(argv[2]);
|
||||
up_rtc_settime(val);
|
||||
}
|
||||
else if (!strcmp(argv[1], "i2c") && argc == 3) {
|
||||
int val = atoi(argv[2]);
|
||||
struct st_lis331dl_dev_s * lis = st_lis331dl_init(vsn_sif.i2c1, val);
|
||||
|
||||
I2C_SETFREQUENCY(vsn_sif.i2c2, 100000);
|
||||
|
||||
struct st_lis331dl_dev_s * lis = st_lis331dl_init(vsn_sif.i2c2, val);
|
||||
|
||||
if (lis) {
|
||||
struct st_lis331dl_vector_s * a;
|
||||
int i;
|
||||
uint32_t time_stamp = clock_systimer();
|
||||
|
||||
/* Set to 400 Hz : 3 = 133 Hz/axis */
|
||||
|
||||
st_lis331dl_setconversion(lis, false, true);
|
||||
|
||||
/* Sample some values */
|
||||
|
||||
for (i=0; i<200000; i++) {
|
||||
for (i=0; i<1000; ) {
|
||||
if ( (a = st_lis331dl_getreadings(lis)) ) {
|
||||
i++;
|
||||
printf("%d %d %d\n", a->x, a->y, a->z);
|
||||
}
|
||||
else if (errno != 11) {
|
||||
printf("Readings errno %d\n", errno);
|
||||
break;
|
||||
}
|
||||
fflush(stdout);
|
||||
usleep(10000);
|
||||
}
|
||||
|
||||
printf("Time diff = %d\n", clock_systimer() - time_stamp);
|
||||
|
||||
st_lis331dl_deinit(lis);
|
||||
}
|
||||
else printf("Exit point: errno=%d\n", errno);
|
||||
@ -533,6 +551,7 @@ int sif_main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
fprintf(stderr, "%s:\tinit\n\tgpio\tA B\n\tpwr\tval\n", argv[0]);
|
||||
fprintf(stderr, "test = %.8x, test irq = %.8x\n", test, test_irq);
|
||||
fprintf(stderr, "time = %d / %d, time = %d\n",
|
||||
up_rtc_gettime(), up_rtc_getclock(), time(NULL) );
|
||||
return -1;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user