Changeset 51

Show
Ignore:
Timestamp:
02/18/10 22:55:34 (15 years ago)
Author:
phil
Message:

changed UIP_ARPTAB_SIZE (from 8 to 20), changed UIP_UDP_CONNS (10 to 8),
changed Meters_ISRs.c if conditions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • webserver/example/EnergyMeters/EnergyMeters/Common/ethernet/uIP/uip-1.0/uip/uipopt.h

    r14 r51  
    204204#define UIP_UDP_CONNS UIP_CONF_UDP_CONNS 
    205205#else /* UIP_CONF_UDP_CONNS */ 
    206 #define UIP_UDP_CONNS    10 
     206#define UIP_UDP_CONNS    8 
    207207#endif /* UIP_CONF_UDP_CONNS */ 
    208208 
    …… 
    243243 */ 
    244244#ifndef UIP_CONF_MAX_CONNECTIONS 
    245 #define UIP_CONNS       10 
     245#define UIP_CONNS       8 
    246246#else /* UIP_CONF_MAX_CONNECTIONS */ 
    247247#define UIP_CONNS UIP_CONF_MAX_CONNECTIONS 
    …… 
    347347#define UIP_ARPTAB_SIZE UIP_CONF_ARPTAB_SIZE 
    348348#else 
    349 #define UIP_ARPTAB_SIZE 8 
     349#define UIP_ARPTAB_SIZE 20 
    350350#endif 
    351351 

  • webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c

    r50 r51  
    3636    IO2_INT_CLR |= (1<<10); 
    3737  } 
    38   else if ((IO2_INT_STAT_R & (1 << 0)) != 0) /* P0.0 interrupt triggered - connector J4, Pin 0*/ 
     38  if ((IO2_INT_STAT_R & (1 << 0)) != 0) /* P0.0 interrupt triggered - connector J4, Pin 0*/ 
    3939  { 
    4040    handleMeterTick(METER_INDEX_GAS); 
    4141    IO2_INT_CLR |= (1<<0); 
    4242  } 
    43   else if ((IO2_INT_STAT_R & (1 << 1)) != 0) /* P0.1 interrupt triggered - connector J4, Pin 1*/ 
     43  if ((IO2_INT_STAT_R & (1 << 1)) != 0) /* P0.1 interrupt triggered - connector J4, Pin 1*/ 
    4444  { 
    4545    handleMeterTick(METER_INDEX_EL1); 
    4646    IO2_INT_CLR |= (1<<1); 
    4747  } 
    48   else if ((IO2_INT_STAT_R & (1 << 2)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/ 
     48  if ((IO2_INT_STAT_R & (1 << 2)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/ 
    4949  { 
    5050    handleMeterTick(METER_INDEX_EL2); 
    5151    IO2_INT_CLR |= (1<<2); 
    5252  } 
    53   else if ((IO2_INT_STAT_R & (1 << 3)) != 0) /* P0.3 interrupt triggered - connector J4, Pin 3*/ 
     53  if ((IO2_INT_STAT_R & (1 << 3)) != 0) /* P0.3 interrupt triggered - connector J4, Pin 3*/ 
    5454  { 
    5555    handleMeterTick(METER_INDEX_AU1); 
    5656    IO2_INT_CLR |= (1<<3); 
    5757  } 
    58   else if ((IO2_INT_STAT_R & (1 << 4)) != 0) /* P0.4 interrupt triggered - connector J4, Pin 4*/ 
     58  if ((IO2_INT_STAT_R & (1 << 4)) != 0) /* P0.4 interrupt triggered - connector J4, Pin 4*/ 
    5959  { 
    6060    handleMeterTick(METER_INDEX_AU2);