Show
Ignore:
Timestamp:
02/07/10 11:28:03 (15 years ago)
Author:
phil
Message:

example meter (button SPI LOAD) now on web page, removed LCD writing in flash.c (crashes).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c

    r42 r45  
    4040  vSemaphoreCreateBinary( xMetersSemaphore ); 
    4141         
    42   //Init_P2_0(); /* init GPIO for meters */ 
     42  Init_P2_0(); /* init GPIO for meters */ 
    4343  // TODO: put this in again, right now it interferes with Solar UART3! 
    4444 
  • webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h

    r30 r45  
    33unsigned long long getEpochTimeWithMs(void); 
    44 
    5 #define NUMBER_OF_METERS 10 /* the number of meters we use */ 
     5#define NUMBER_OF_METERS 11 /* the number of meters we use */ 
    66 
    7 #define METER_INDEX_GAS 0 /* index of the gas meter data */ 
     7#define METER_INDEX_GAS 10 /* index of the gas meter data */ 
    88 
    99#define DEBOUNCE_TICK_THRESHOLD_MS 50 /* when two ticks are less than this time period apart, the second tick is ignored (debouncing) */ 
  • webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c

    r43 r45  
    9696  unsigned long long currentTime = getEpochTimeWithMs(); /* current epoch time with ms in ms */ 
    9797 
     98  if (portNum >= NUMBER_OF_METERS) /* allowed index: 0 to (NUMBER_OF_METERS-1) */ 
     99  { 
     100    return; /* invalid value */ 
     101  } 
     102 
    98103  globalValue++; 
    99104    //   LCD_cls();