deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move defines to servo.h

Browse source
This commit is contained in:
Harald Pichler 2015-11-28 18:45:15 +01:00
parent 9b9958fb43
commit 67ed80e9fe
3 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/osd/servo-sensor/project-conf.h
View file

@ -47,11 +47,6 @@
/* Some platforms have weird includes. */ /* Some platforms have weird includes. */
#undef IEEE802154_CONF_PANID #undef IEEE802154_CONF_PANID
/* Disabling RDC for demo purposes. Core updates often require more memory. */
/* For projects, optimize memory and enable RDC again. */
// #undef NETSTACK_CONF_RDC
//#define NETSTACK_CONF_RDC nullrdc_driver
/* Increase rpl-border-router IP-buffer when using more than 64. */ /* Increase rpl-border-router IP-buffer when using more than 64. */
#undef REST_MAX_CHUNK_SIZE #undef REST_MAX_CHUNK_SIZE
#define REST_MAX_CHUNK_SIZE 64 #define REST_MAX_CHUNK_SIZE 64
@ -84,22 +79,5 @@
#define COAP_LINK_FORMAT_FILTERING 0 #define COAP_LINK_FORMAT_FILTERING 0
*/ */
/* Save some memory for the sky platform. */
/*
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 10
*/
/* Reduce 802.15.4 frame queue to save RAM. */
/*
#undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 4
*/
/*
#undef SICSLOWPAN_CONF_FRAG
#define SICSLOWPAN_CONF_FRAG 1
*/
#endif /* PROJECT_ERBIUM_CONF_H_ */ #endif /* PROJECT_ERBIUM_CONF_H_ */

4
platform/osd-merkur/dev/servo.c
View file

@ -52,10 +52,6 @@
* servo device * servo device
*/ */
#define SERVO_MIN 575
#define SERVO_MAX 2425
#define SERVO_INIT 1500
unsigned int servoa=SERVO_INIT; unsigned int servoa=SERVO_INIT;
unsigned int servob=SERVO_INIT; unsigned int servob=SERVO_INIT;

4
platform/osd-merkur/dev/servo.h
View file

@ -31,6 +31,10 @@
#ifndef SERVO_H #ifndef SERVO_H
#define SERVO_H #define SERVO_H
#define SERVO_MIN 575
#define SERVO_MAX 2425
#define SERVO_INIT 1500
void servo_init(void); void servo_init(void);
void servo_off(void); void servo_off(void);