X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/deba2a0ab6d1a615fc84bf9d04e39cd832020a2c..ca2a1d9fe525095e2cf2391614d8fb2c9ab418b7:/irmp.h?ds=sidebyside diff --git a/irmp.h b/irmp.h index e9f06ef..5e00092 100644 --- a/irmp.h +++ b/irmp.h @@ -3,7 +3,7 @@ * * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de * - * $Id: irmp.h,v 1.54 2011/02/23 15:03:27 fm Exp $ + * $Id: irmp.h,v 1.58 2011/02/25 15:24:06 fm Exp $ * * ATMEGA88 @ 8 MHz * @@ -74,7 +74,8 @@ typedef uint8_t PAUSE_LEN; #define IRMP_IR60_PROTOCOL 24 // IR60 (SAB2008) #define IRMP_KATHREIN_PROTOCOL 25 // Kathrein #define IRMP_NETBOX_PROTOCOL 26 // Netbox keyboard (bitserial) -#define IRMP_IMON_PROTOCOL 27 // Imon (bitserial) +#define IRMP_NEC16_PROTOCOL 27 // NEC with 16 bits +#define IRMP_IMON_PROTOCOL 99 // Imon (bitserial) PROTOTYPE! // some flags of struct IRMP_PARAMETER: #define IRMP_PARAM_FLAG_IS_MANCHESTER 0x01 @@ -115,6 +116,15 @@ typedef uint8_t PAUSE_LEN; #define NEC_LSB 1 // LSB...MSB #define NEC_FLAGS 0 // flags +#define NEC16_ADDRESS_OFFSET 0 // skip 0 bits +#define NEC16_ADDRESS_LEN 8 // read 8 address bits +#define NEC16_COMMAND_OFFSET 8 // skip 8 bits (8 address) +#define NEC16_COMMAND_LEN 8 // read 8 bits (8 command) +#define NEC16_COMPLETE_DATA_LEN 16 // complete length +#define NEC16_STOP_BIT 1 // has stop bit +#define NEC16_LSB 1 // LSB...MSB +#define NEC16_FLAGS 0 // flags + #define SAMSUNG_START_BIT_PULSE_TIME 4500.0e-6 // 4500 usec pulse #define SAMSUNG_START_BIT_PAUSE_TIME 4500.0e-6 // 4500 usec pause #define SAMSUNG_PULSE_TIME 550.0e-6 // 550 usec pulse @@ -177,11 +187,11 @@ typedef uint8_t PAUSE_LEN; #define RECS80_1_PAUSE_TIME 7432.0e-6 // 7432 usec pause #define RECS80_0_PAUSE_TIME 4902.0e-6 // 4902 usec pause #define RECS80_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms -#define RECS80_ADDRESS_OFFSET 2 // skip 2 bits (2nd start + 1 toggle) +#define RECS80_ADDRESS_OFFSET 1 // skip 1 bit (toggle bit) #define RECS80_ADDRESS_LEN 3 // read 3 address bits -#define RECS80_COMMAND_OFFSET 5 // skip 5 bits (2nd start + 1 toggle + 3 address) +#define RECS80_COMMAND_OFFSET 4 // skip 4 bits (1 toggle + 3 address) #define RECS80_COMMAND_LEN 6 // read 6 command bits -#define RECS80_COMPLETE_DATA_LEN 11 // complete length +#define RECS80_COMPLETE_DATA_LEN 10 // complete length #define RECS80_STOP_BIT 1 // has stop bit #define RECS80_LSB 0 // MSB...LSB #define RECS80_FLAGS 0 // flags @@ -235,7 +245,7 @@ typedef uint8_t PAUSE_LEN; #define RECS80EXT_0_PAUSE_TIME 4902.0e-6 // 4902 usec pause #define RECS80EXT_FRAME_REPEAT_PAUSE_TIME 45.0e-3 // frame repeat after 45ms #define RECS80EXT_ADDRESS_OFFSET 2 // skip 2 bits (2nd start + 1 toggle) -#define RECS80EXT_ADDRESS_LEN 4 // read 3 address bits +#define RECS80EXT_ADDRESS_LEN 4 // read 4 address bits #define RECS80EXT_COMMAND_OFFSET 6 // skip 6 bits (2nd start + 1 toggle + 4 address) #define RECS80EXT_COMMAND_LEN 6 // read 6 command bits #define RECS80EXT_COMPLETE_DATA_LEN 12 // complete length @@ -416,10 +426,10 @@ typedef uint8_t PAUSE_LEN; #define KATHREIN_LSB 0 // MSB #define KATHREIN_FLAGS 0 // flags -#define NETBOX_START_BIT_PULSE_TIME 2500.0e-6 // 2500 usec pulse -#define NETBOX_START_BIT_PAUSE_TIME 833.0e-6 // 833 usec pause -#define NETBOX_PULSE_TIME 833.0e-6 // 833 usec pulse -#define NETBOX_PAUSE_TIME 833.0e-6 // 833 usec pause +#define NETBOX_START_BIT_PULSE_TIME 2400.0e-6 // 2400 usec pulse +#define NETBOX_START_BIT_PAUSE_TIME 800.0e-6 // 800 usec pause +#define NETBOX_PULSE_TIME 800.0e-6 // 800 usec pulse +#define NETBOX_PAUSE_TIME 800.0e-6 // 800 usec pause #define NETBOX_FRAMES 1 // Netbox sends 1 frame #define NETBOX_AUTO_REPETITION_PAUSE_TIME 35.0e-3 // auto repetition after 35ms #define NETBOX_FRAME_REPEAT_PAUSE_TIME 35.0e-3 // frame repeat after 35ms @@ -427,7 +437,7 @@ typedef uint8_t PAUSE_LEN; #define NETBOX_ADDRESS_LEN 3 // read 3 address bits #define NETBOX_COMMAND_OFFSET 3 // skip 3 bits #define NETBOX_COMMAND_LEN 13 // read 13 bits -#define NETBOX_COMPLETE_DATA_LEN 16 // complete length, last is stop bit +#define NETBOX_COMPLETE_DATA_LEN 16 // complete length #define NETBOX_STOP_BIT 0 // has no stop bit #define NETBOX_LSB 1 // LSB #define NETBOX_FLAGS IRMP_PARAM_FLAG_IS_SERIAL // flags