1
0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-01 11:28:26 +02:00

fw/proto.h: assorted cleanup and corrections

- remove struct params.clkT_period
- correct size of tp_*_start
- correct size of tp_*_pix
- move MAX_LINES from image.h to proto.h (to ease sharing with tools)

Things now work a bit differently from how they were planned back when
clkT_period was added.
This commit is contained in:
Werner Almesberger 2012-06-27 02:47:28 -03:00
parent 0a0792688b
commit d651c23a04
2 changed files with 7 additions and 11 deletions

View File

@ -22,9 +22,6 @@
#include "proto.h" #include "proto.h"
#define MAX_LINES 80
struct line { struct line {
uint8_t d; /* port D0-D7 */ uint8_t d; /* port D0-D7 */
uint8_t cb; /* port C0-C5, B6-B7 */ uint8_t cb; /* port C0-C5, B6-B7 */

View File

@ -34,6 +34,8 @@ enum pck_type {
}; };
#define MAX_LINES 80
#define XA_HIGH_DEFAULT 850 #define XA_HIGH_DEFAULT 850
#define XA_LOW_DEFAULT 170 #define XA_LOW_DEFAULT 170
@ -47,11 +49,8 @@ enum pck_type {
#define TP_FWD_PIX_DEFAULT 1100 /* 1.1 ms */ #define TP_FWD_PIX_DEFAULT 1100 /* 1.1 ms */
#define TP_BWD_PIX_DEFAULT 1100 /* 1.1 ms */ #define TP_BWD_PIX_DEFAULT 1100 /* 1.1 ms */
struct params { struct params {
/* Timer ticks */
uint16_t clkT_period; /* Timer period */
/* Accelerator thresholds */ /* Accelerator thresholds */
uint16_t xa_high; /* X acceleration high threshold */ uint16_t xa_high; /* X acceleration high threshold */
@ -66,10 +65,10 @@ struct params {
/* Timer periods, for imaging */ /* Timer periods, for imaging */
uint16_t tp_fwd_start; /* forward image start */ uint32_t tp_fwd_start; /* forward image start */
uint16_t tp_bwd_start; /* backward image start */ uint32_t tp_bwd_start; /* backward image start */
uint8_t tp_fwd_pix; /* pixel size in forward move */ uint16_t tp_fwd_pix; /* pixel size in forward move */
uint8_t tp_bwd_pix; /* pixel size in backward move */ uint16_t tp_bwd_pix; /* pixel size in backward move */
}; };
#endif /* !PROTO_H */ #endif /* !PROTO_H */