Changeset 52 for webserver

Show
Ignore:
Timestamp:
02/20/10 11:31:33 (15 years ago)
Author:
phil
Message:

changed UIP_ARPTAB_SIZE (from 20 to 30), removed P0.2 (not connected)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r51 r52  
    347347#define UIP_ARPTAB_SIZE UIP_CONF_ARPTAB_SIZE 
    348348#else 
    349 #define UIP_ARPTAB_SIZE 20 
     349#define UIP_ARPTAB_SIZE 30 
    350350#endif 
    351351 

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

    r50 r52  
    101101  /* Enable Pins. */ 
    102102 
     103  PINSEL4 = 0; 
     104  PINMODE4 = 0; 
     105 
    103106  PINSEL4   &= 0xfffff3ff; /* reset bit 20 and 21, P2.10 = GPIO Port 2.10 */ 
    104107  PINMODE4  &= 0xfffff3ff; /* reset bit 20 and 21, enable on-chip pull-up resistor on Port 2.10 */ 
    …… 
    106109  IO2_INT_EN_F &= ~(1<<10); /* disable falling edge interrupt for P2:10 */ 
    107110 
     111 
     112 
     113  PINSEL4   &= ~((portLONG)0x3ff); /* reset bit 0 to 9, GPIO Port P2:0 to P2:4 */ 
     114  PINSEL4   &= ~((portLONG)(0x3 << 20)); /* reset bit 20 and 21, P2.10 = GPIO Port 2.10 */ 
     115 
     116  /* bits are 0 here */ 
     117  /* disable pull-up/down resistors on 2.0, 2.1, 2.3, 2.4 (put binary 10 for all), don't change 2.2! */ 
     118  PINMODE4 |= 0x28A; 
     119 
     120 
    108121  IO2_INT_EN_R |= (1<<0); /* enable rising edge interrupt for P2:0 */ 
    109122  IO2_INT_EN_F &= ~(1<<0); /* disable falling edge interrupt for P2:0 */ 
    110123  IO2_INT_EN_R |= (1<<1); /* enable rising edge interrupt for P2:1 */ 
    111124  IO2_INT_EN_F &= ~(1<<1); /* disable falling edge interrupt for P2:1 */ 
    112   IO2_INT_EN_R |= (1<<2); /* enable rising edge interrupt for P2:2 */ 
    113   IO2_INT_EN_F &= ~(1<<2); /* disable falling edge interrupt for P2:2 */ 
     125  // P2.2 is not connected! 
     126  //IO2_INT_EN_R |= (1<<2); /* enable rising edge interrupt for P2:2 */ 
     127  //IO2_INT_EN_F &= ~(1<<2); /* disable falling edge interrupt for P2:2 */ 
    114128  IO2_INT_EN_R |= (1<<3); /* enable rising edge interrupt for P2:3 */ 
    115129  IO2_INT_EN_F &= ~(1<<3); /* disable falling edge interrupt for P2:3 */ 

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

    r51 r52  
    4646    IO2_INT_CLR |= (1<<1); 
    4747  } 
    48   if ((IO2_INT_STAT_R & (1 << 2)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/ 
    49   { 
    50     handleMeterTick(METER_INDEX_EL2); 
    51     IO2_INT_CLR |= (1<<2); 
    52   } 
     48  // P0.2 is not connected! 
     49  //if ((IO2_INT_STAT_R & (1 << 2)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/ 
     50  //{ 
     51  // handleMeterTick(METER_INDEX_EL2); 
     52  //  IO2_INT_CLR |= (1<<2); 
     53  //} 
    5354  if ((IO2_INT_STAT_R & (1 << 3)) != 0) /* P0.3 interrupt triggered - connector J4, Pin 3*/ 
    5455  {