Charles Young's development fork. Going forward I only want to push mature code to main repository.

Dependencies:   mbed

Fork of GEO_COUNTER_L432KC by Geo Electronics "Geo Counter"

Committer:
Charles David Young
Date:
Sun Sep 09 10:14:13 2018 -0700
Revision:
66:ea8661d43663
Parent:
65:5f087e22a9d1
Child:
67:fcfc5f5bdbee
debug

Who changed what in which revision?

UserRevisionLine numberNew contents of line
walter76 2:ac0ed3d84d44 1 // GEO COUNTER V1 firmware
walter76 2:ac0ed3d84d44 2 // This FW provides a basic operation of GEO-COUNTER
walter76 2:ac0ed3d84d44 3 //
walter76 2:ac0ed3d84d44 4 // Latest review: August 27, 2018 - Walter Trovo
walter76 1:75827d765e34 5 //
Charles David Young 47:f004b4612069 6 // Sep 6, 2018: Charles Young: Functioning mode selection - modes partially implemented
Charles David Young 25:0161bf1adc81 7 // Sep 5, 2018: Charles Young: Created LED7segDisplay class
charlesdavidyoung 24:db7494389c03 8 // Sep 5, 2018: Charles Young: Still developing mode selection. LEDs turn off
charlesdavidyoung 24:db7494389c03 9 // when not in mode selection. Pressing once enters mode selection.
charlesdavidyoung 24:db7494389c03 10 // Pressing again enters submode. Temporarily the rotary switch
charlesdavidyoung 24:db7494389c03 11 // adjusts the display brightness. This is just for testing.
charlesdavidyoung 24:db7494389c03 12 // Sep 4, 2018: Charles Young: Created RotarySwitch class to manage mode selection
walter76 1:75827d765e34 13 // Feb 14, 2018: initial release aimed to test the counters, the serial port
walter76 1:75827d765e34 14 // the PWM output and the MAX7219 operation.
walter76 1:75827d765e34 15 // Feb 15, 2018: Removed MAX7219 libray (replaced with custom routine).
walter76 1:75827d765e34 16 // Added 74HC595 routine. Added beep. Added Gate_write
walter76 1:75827d765e34 17 //
walter76 2:ac0ed3d84d44 18
walter76 1:75827d765e34 19
walter76 1:75827d765e34 20 // this block includes key libraries
walter76 1:75827d765e34 21 #include <string> // strings management
charlesdavidyoung 24:db7494389c03 22 #include "RotarySwitch.hpp"
Charles David Young 25:0161bf1adc81 23 #include "LED7segDisplay.hpp"
charlesdavidyoung 20:fb73eaaf0894 24
charlesdavidyoung 24:db7494389c03 25 // Everything associated with the rotary switch and the associated LEDs
charlesdavidyoung 24:db7494389c03 26 // is hidden in this class.
charlesdavidyoung 20:fb73eaaf0894 27 RotarySwitch ModeSwitch;
Charles David Young 25:0161bf1adc81 28 LED7segDisplay DigitsDisplay;
walter76 1:75827d765e34 29
Charles David Young 34:10550b327e3d 30 enum Modes {
Charles David Young 34:10550b327e3d 31 CNT1,
Charles David Young 34:10550b327e3d 32 CNT2,
Charles David Young 34:10550b327e3d 33 PROSPECT,
Charles David Young 34:10550b327e3d 34 NULL1,
Charles David Young 37:6f7bb913e08b 35 NULL2,
Charles David Young 38:1642320d83a0 36 VOLTS,
Charles David Young 38:1642320d83a0 37 VOLUME,
Charles David Young 34:10550b327e3d 38 DIM,
Charles David Young 34:10550b327e3d 39 NumberOfModes
Charles David Young 34:10550b327e3d 40 };
Charles David Young 38:1642320d83a0 41 uint8_t currentMode = CNT1;
Charles David Young 38:1642320d83a0 42 uint8_t currentModeToDisplay = CNT1;
Charles David Young 34:10550b327e3d 43
charlesdavidyoung 5:4f90b458dbdf 44 // LED on processor board
charlesdavidyoung 5:4f90b458dbdf 45 DigitalOut led1(LED1);
walter76 1:75827d765e34 46
walter76 1:75827d765e34 47 // definitions of peripherals and devices
Charles David Young 7:9f975e00600c 48
charlesdavidyoung 17:6eed17197004 49 I2C i2c(D4, D5); // I2C port
charlesdavidyoung 17:6eed17197004 50 Ticker SecTenth_Beat; // .1 second ticker
walter76 1:75827d765e34 51 Ticker Sec_Beat; // 1 second ticker
Charles David Young 61:00601fb0a3b9 52
Charles David Young 62:9e5cb78d25e4 53 Timer timer;
Charles David Young 61:00601fb0a3b9 54 int begin;
Charles David Young 61:00601fb0a3b9 55 int end;
Charles David Young 61:00601fb0a3b9 56 double secCorrection;
Charles David Young 61:00601fb0a3b9 57
walter76 1:75827d765e34 58 Serial PC(USBTX, USBRX); // Virtual COM via USB (PC connection)
walter76 1:75827d765e34 59 Serial GPS(D1, D0); // Serial port for GPS module
walter76 0:6d1742703713 60
walter76 0:6d1742703713 61 // Global variables
walter76 1:75827d765e34 62 time_t seconds; // Real-Time Clock (RTC) timestamp
walter76 1:75827d765e34 63 unsigned int value = 0; // displayed value on the 6-digits of the display
Charles David Young 44:a26ca542ae5e 64
Charles David Young 61:00601fb0a3b9 65 uint32_t Count1, Count2; // pulse counters (32-bit)
Charles David Young 61:00601fb0a3b9 66 uint32_t Count1Save;
Charles David Young 61:00601fb0a3b9 67 uint32_t Count2Save;
Charles David Young 61:00601fb0a3b9 68
Charles David Young 46:c7ce8fccb712 69 int32_t TickerCorrection = 0;
Charles David Young 58:d15adb224e5a 70 uint32_t TickerPeriod = 100000;
Charles David Young 53:04999d536e92 71 uint32_t TickerPeriodCount = 0;
Charles David Young 53:04999d536e92 72 const uint32_t TickerPeriodsPerSecond = 1000000/TickerPeriod;
Charles David Young 61:00601fb0a3b9 73 const uint32_t TickerTicksPerSecond = TickerPeriod*TickerPeriodsPerSecond;
Charles David Young 44:a26ca542ae5e 74 const int16_t TickerCorrectionMax = 99;
Charles David Young 44:a26ca542ae5e 75 const int16_t TickerCorrectionMin = -99;
Charles David Young 44:a26ca542ae5e 76
walter76 1:75827d765e34 77 char Text[40]=""; // used to send messages over the serial port
walter76 1:75827d765e34 78 uint8_t Disp_mode = 0x01, Disp_unit = 0xA0; // status of 1st row and 2nd rows of LEDs
kd5byb 4:b17c6556cf1f 79 bool Stopped = 0; // status of counting activity
charlesdavidyoung 5:4f90b458dbdf 80 bool StartStopPressed = 0;// status of counting activity
walter76 1:75827d765e34 81 double ADC_val; // used to read ADC value
charlesdavidyoung 24:db7494389c03 82 float direction = 0;
walter76 0:6d1742703713 83
Charles David Young 38:1642320d83a0 84 #define maxVolume 10
Charles David Young 38:1642320d83a0 85 uint8_t volume = maxVolume;
Charles David Young 38:1642320d83a0 86
walter76 1:75827d765e34 87 // ----- Prototypes of routines (defined below the main) -------------------
Charles David Young 16:b2e77eb76ab4 88 void UpdateInput(void); // periodically called by the ticker
Charles David Young 16:b2e77eb76ab4 89 void UpdateOutput(void); // periodically called by the ticker
Charles David Young 53:04999d536e92 90 void UpdateIO(void); // periodically called by the ticker
walter76 1:75827d765e34 91 void Count1_up(void); // called every time an edge is detected on TRIG1 pin
walter76 1:75827d765e34 92 void Count2_up(void); // called every time an edge is detected on TRIG2 pin
walter76 1:75827d765e34 93 void Beep(void); // used to generate a short beep (buzzer)
walter76 0:6d1742703713 94
walter76 0:6d1742703713 95 //==============================================================================
walter76 0:6d1742703713 96 //==============================================================================
walter76 0:6d1742703713 97
walter76 0:6d1742703713 98 int main()
walter76 0:6d1742703713 99 {
walter76 0:6d1742703713 100
Charles David Young 28:c81d00ec28a3 101 PC.baud(115200); // set baud-rate of virtual COM port (PC connection)
Charles David Young 28:c81d00ec28a3 102 PC.printf("\nGEO COUNTER V1 2108");
Charles David Young 28:c81d00ec28a3 103 PC.printf(__DATE__);
Charles David Young 28:c81d00ec28a3 104 PC.printf(" ");
Charles David Young 28:c81d00ec28a3 105 PC.printf(__TIME__);
walter76 1:75827d765e34 106
Charles David Young 28:c81d00ec28a3 107 GPS.baud(9600); // set the baud-rate of the serial port dedicated to the GPS
walter76 0:6d1742703713 108
Charles David Young 28:c81d00ec28a3 109 CS1 = 1; // presets CS of MAX7219
Charles David Young 28:c81d00ec28a3 110 CS2 = 1; // preset CS of 74HC595
walter76 1:75827d765e34 111
Charles David Young 28:c81d00ec28a3 112 DigitsDisplay.Display_6D_write(0x543210);
Charles David Young 28:c81d00ec28a3 113 DigitsDisplay.Display_2D_write(0);
walter76 0:6d1742703713 114
Charles David Young 61:00601fb0a3b9 115 // RTC is supposed to lose time at power down (no backup battery)
Charles David Young 28:c81d00ec28a3 116 // An initialization is performed anyway
Charles David Young 28:c81d00ec28a3 117 set_time(0); // Set time
charlesdavidyoung 24:db7494389c03 118
Charles David Young 28:c81d00ec28a3 119 PWM.period_ms(3); // set the PWM period
Charles David Young 28:c81d00ec28a3 120 PWM.write(0.8); // set the PWM duty-cycle
walter76 1:75827d765e34 121
Charles David Young 28:c81d00ec28a3 122 Beep(); // initial beep
walter76 1:75827d765e34 123
Charles David Young 28:c81d00ec28a3 124 // set the 1 sec ticker to periodically call the Update() routine
Charles David Young 28:c81d00ec28a3 125 // NOTE: this is also the 1-sec time base for counters. A better approach
Charles David Young 28:c81d00ec28a3 126 // would replace the ticker with an interrupt from the RTC (to be implemented)
Charles David Young 53:04999d536e92 127 SecTenth_Beat.attach_us(&UpdateIO, TickerPeriod);
Charles David Young 28:c81d00ec28a3 128 //RTC::attach(&Update, RTC::Second);
Charles David Young 28:c81d00ec28a3 129 //RTC::detach(RTC::Second);
Charles David Young 66:ea8661d43663 130 timer.start();
Charles David Young 61:00601fb0a3b9 131 begin = timer.read_us();
walter76 1:75827d765e34 132
Charles David Young 60:6ae1a2390600 133 TRIG1.rise(&Count1_up);
Charles David Young 60:6ae1a2390600 134 TRIG2.rise(&Count2_up);
Charles David Young 60:6ae1a2390600 135
Charles David Young 28:c81d00ec28a3 136 // main loop does nothing as all activities are interrupt driven
Charles David Young 28:c81d00ec28a3 137 while(1)
Charles David Young 28:c81d00ec28a3 138 {
Charles David Young 28:c81d00ec28a3 139 // dance (or drink a beer)
Charles David Young 28:c81d00ec28a3 140 }
walter76 0:6d1742703713 141 }
walter76 0:6d1742703713 142
walter76 0:6d1742703713 143
walter76 1:75827d765e34 144 //-------- END OF MAIN --------------
walter76 0:6d1742703713 145 //==============================================================================
walter76 0:6d1742703713 146
walter76 1:75827d765e34 147 // Definition of routines
walter76 1:75827d765e34 148
walter76 1:75827d765e34 149 //---------------------------------------------------------------------------
walter76 1:75827d765e34 150 // Update values to be displayed
Charles David Young 10:f48cc6be5ae8 151 void logToPC()
Charles David Young 10:f48cc6be5ae8 152 {
Charles David Young 10:f48cc6be5ae8 153 PC.printf("\nADC: %.02f", ADC_val);
Charles David Young 10:f48cc6be5ae8 154 PC.printf(Stopped ? " stopped" : " started");
Charles David Young 10:f48cc6be5ae8 155 // Timestamp to PC (debug)
Charles David Young 10:f48cc6be5ae8 156 seconds = time(NULL); // get current time
Charles David Young 10:f48cc6be5ae8 157 strftime(Text, 50, "%H:%M:%S", localtime(&seconds));
Charles David Young 10:f48cc6be5ae8 158 PC.printf(" RTC: %s, CNT1: %7d CNT2: %7d",Text, Count1, Count2);
charlesdavidyoung 24:db7494389c03 159 PC.printf(" wheel %f", direction);
Charles David Young 10:f48cc6be5ae8 160 }
walter76 1:75827d765e34 161
Charles David Young 53:04999d536e92 162 void UpdateIO()
Charles David Young 53:04999d536e92 163 {
Charles David Young 53:04999d536e92 164 if (++TickerPeriodCount >= TickerPeriodsPerSecond)
Charles David Young 53:04999d536e92 165 {
Charles David Young 61:00601fb0a3b9 166 // Capture the counts early so they will be more accurate
Charles David Young 61:00601fb0a3b9 167 Count1Save = Count1;
Charles David Young 61:00601fb0a3b9 168 Count2Save = Count2;
Charles David Young 61:00601fb0a3b9 169 Count1 = 0;
Charles David Young 61:00601fb0a3b9 170 Count2 = 0;
Charles David Young 61:00601fb0a3b9 171
Charles David Young 61:00601fb0a3b9 172 // Correct for ticker inaccuracy
Charles David Young 64:58098da79a07 173 // end = timer.read_us();
Charles David Young 64:58098da79a07 174 // int diff = end - begin;
Charles David Young 64:58098da79a07 175 // secCorrection = diff/TickerTicksPerSecond;
Charles David Young 63:4c383a5fdfd2 176 // Count1Save = Count1Save/secCorrection;
Charles David Young 63:4c383a5fdfd2 177 // Count2Save = Count2Save/secCorrection;
Charles David Young 61:00601fb0a3b9 178
Charles David Young 53:04999d536e92 179 TickerPeriodCount = 0;
Charles David Young 61:00601fb0a3b9 180
Charles David Young 53:04999d536e92 181 UpdateOutput();
Charles David Young 53:04999d536e92 182 }
Charles David Young 53:04999d536e92 183 UpdateInput();
Charles David Young 53:04999d536e92 184 }
Charles David Young 53:04999d536e92 185
Charles David Young 53:04999d536e92 186 void UpdateOutput()
charlesdavidyoung 18:ef5678ab1889 187 {
Charles David Young 49:a67f2a3d228a 188 if(Stopped)
Charles David Young 49:a67f2a3d228a 189 {
Charles David Young 49:a67f2a3d228a 190 // disable interrupts on TRIG1 and TRIG2
Charles David Young 49:a67f2a3d228a 191 TRIG1.rise(NULL);
Charles David Young 49:a67f2a3d228a 192 TRIG2.rise(NULL);
Charles David Young 49:a67f2a3d228a 193 }
Charles David Young 49:a67f2a3d228a 194
Charles David Young 28:c81d00ec28a3 195 // This must be called periodically to update the LEDs
Charles David Young 28:c81d00ec28a3 196 ModeSwitch.UpdateOutput();
charlesdavidyoung 24:db7494389c03 197
Charles David Young 38:1642320d83a0 198 switch (currentModeToDisplay) {
Charles David Young 34:10550b327e3d 199 case CNT1:
Charles David Young 49:a67f2a3d228a 200 DigitsDisplay.Display_6D_write(Count1Save);
Charles David Young 41:08bf3ea5eba4 201 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 202 break;
Charles David Young 34:10550b327e3d 203 case CNT2:
Charles David Young 49:a67f2a3d228a 204 DigitsDisplay.Display_6D_write(Count2Save);
Charles David Young 41:08bf3ea5eba4 205 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 206 break;
Charles David Young 34:10550b327e3d 207 case PROSPECT:
Charles David Young 49:a67f2a3d228a 208 if (Count1Save)
Charles David Young 49:a67f2a3d228a 209 DigitsDisplay.Display_6D_write(Count1Save);
Charles David Young 44:a26ca542ae5e 210 else
Charles David Young 49:a67f2a3d228a 211 DigitsDisplay.Display_6D_write(Count2Save);
Charles David Young 41:08bf3ea5eba4 212 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 213 break;
Charles David Young 34:10550b327e3d 214 case NULL1:
Charles David Young 34:10550b327e3d 215 DigitsDisplay.Display_6D_write(0);
Charles David Young 41:08bf3ea5eba4 216 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 217 break;
Charles David Young 37:6f7bb913e08b 218 case NULL2:
Charles David Young 34:10550b327e3d 219 DigitsDisplay.Display_6D_write(0);
Charles David Young 41:08bf3ea5eba4 220 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 221 break;
Charles David Young 38:1642320d83a0 222 case VOLTS:
Charles David Young 34:10550b327e3d 223 DigitsDisplay.Display_6D_write(0);
Charles David Young 41:08bf3ea5eba4 224 DigitsDisplay.Display_2D_Blank();
Charles David Young 34:10550b327e3d 225 break;
Charles David Young 38:1642320d83a0 226 case VOLUME:
Charles David Young 34:10550b327e3d 227 case DIM:
Charles David Young 34:10550b327e3d 228 default:
Charles David Young 34:10550b327e3d 229 break;
Charles David Young 34:10550b327e3d 230 }
Charles David Young 16:b2e77eb76ab4 231 }
Charles David Young 16:b2e77eb76ab4 232
Charles David Young 16:b2e77eb76ab4 233 void UpdateInput()
charlesdavidyoung 24:db7494389c03 234 {
charlesdavidyoung 24:db7494389c03 235 // This must be called periodically to monitor switch input
Charles David Young 38:1642320d83a0 236 direction = ModeSwitch.UpdateInput();
Charles David Young 34:10550b327e3d 237 currentMode = ModeSwitch.GetPosition();
Charles David Young 34:10550b327e3d 238
Charles David Young 34:10550b327e3d 239 switch (currentMode) {
Charles David Young 34:10550b327e3d 240 case CNT1:
Charles David Young 34:10550b327e3d 241 case CNT2:
Charles David Young 44:a26ca542ae5e 242 currentModeToDisplay = currentMode;
Charles David Young 44:a26ca542ae5e 243
Charles David Young 44:a26ca542ae5e 244 if ( (direction > 0)
Charles David Young 44:a26ca542ae5e 245 && (TickerCorrection < TickerCorrectionMax))
Charles David Young 44:a26ca542ae5e 246 {
Charles David Young 44:a26ca542ae5e 247 TickerCorrection++;
Charles David Young 46:c7ce8fccb712 248 Sec_Beat.attach_us(&UpdateOutput, 1000000 + 1000*TickerCorrection);
Charles David Young 51:6b916f91f4d9 249 DigitsDisplay.Display_2D_write(TickerCorrection);
Charles David Young 44:a26ca542ae5e 250 }
Charles David Young 44:a26ca542ae5e 251 else
Charles David Young 44:a26ca542ae5e 252 if ( (direction < 0)
Charles David Young 44:a26ca542ae5e 253 && (TickerCorrection > TickerCorrectionMin))
Charles David Young 44:a26ca542ae5e 254 {
Charles David Young 44:a26ca542ae5e 255 TickerCorrection--;
Charles David Young 46:c7ce8fccb712 256 Sec_Beat.attach_us(&UpdateOutput, 1000000 + 1000*TickerCorrection);
Charles David Young 51:6b916f91f4d9 257 DigitsDisplay.Display_2D_write(TickerCorrection);
Charles David Young 44:a26ca542ae5e 258 }
Charles David Young 44:a26ca542ae5e 259 break;
Charles David Young 34:10550b327e3d 260 case PROSPECT:
Charles David Young 34:10550b327e3d 261 case VOLTS:
Charles David Young 38:1642320d83a0 262 currentModeToDisplay = currentMode;
Charles David Young 34:10550b327e3d 263 break;
Charles David Young 34:10550b327e3d 264 case NULL1:
Charles David Young 37:6f7bb913e08b 265 case NULL2:
Charles David Young 34:10550b327e3d 266 break;
Charles David Young 38:1642320d83a0 267 case VOLUME:
Charles David Young 39:dee91966b45c 268 if ( (direction > 0)
Charles David Young 39:dee91966b45c 269 && (volume < maxVolume))
Charles David Young 39:dee91966b45c 270 volume++;
Charles David Young 39:dee91966b45c 271 else
Charles David Young 39:dee91966b45c 272 if ( (direction < 0)
Charles David Young 39:dee91966b45c 273 && (volume > 0))
Charles David Young 39:dee91966b45c 274 volume--;
Charles David Young 39:dee91966b45c 275
Charles David Young 38:1642320d83a0 276 DigitsDisplay.Display_2D_write(volume);
Charles David Young 34:10550b327e3d 277 break;
Charles David Young 34:10550b327e3d 278 case DIM:
Charles David Young 39:dee91966b45c 279 if (direction > 0)
Charles David Young 39:dee91966b45c 280 DigitsDisplay.Display_brightness_up();
Charles David Young 39:dee91966b45c 281 else
Charles David Young 39:dee91966b45c 282 if (direction < 0)
Charles David Young 39:dee91966b45c 283 DigitsDisplay.Display_brightness_down();
Charles David Young 39:dee91966b45c 284
Charles David Young 38:1642320d83a0 285 DigitsDisplay.Display_2D_write(DigitsDisplay.GetBrightness());
Charles David Young 34:10550b327e3d 286 break;
Charles David Young 34:10550b327e3d 287 default:
Charles David Young 34:10550b327e3d 288 break;
charlesdavidyoung 24:db7494389c03 289 }
Charles David Young 34:10550b327e3d 290
Charles David Young 65:5f087e22a9d1 291 // ADC_val = KEYB.read(); // read voltage from keyboard
Charles David Young 65:5f087e22a9d1 292 // if ( (ADC_val<0.1) // START/STOP pushbutton pressed
Charles David Young 65:5f087e22a9d1 293 // && (!StartStopPressed))
Charles David Young 65:5f087e22a9d1 294 // {
Charles David Young 65:5f087e22a9d1 295 // StartStopPressed = true;
Charles David Young 65:5f087e22a9d1 296 // if (Stopped)
Charles David Young 65:5f087e22a9d1 297 // {
Charles David Young 65:5f087e22a9d1 298 // // Enable interrupts on rising edge of digital inputs TRIG1 & TRIG2
Charles David Young 65:5f087e22a9d1 299 // TRIG1.rise(&Count1_up);
Charles David Young 65:5f087e22a9d1 300 // TRIG2.rise(&Count2_up);
Charles David Young 65:5f087e22a9d1 301 // }
Charles David Young 65:5f087e22a9d1 302 // Stopped=!Stopped; // toggle status
Charles David Young 65:5f087e22a9d1 303 // }
Charles David Young 65:5f087e22a9d1 304 // else
Charles David Young 65:5f087e22a9d1 305 // StartStopPressed = false;
charlesdavidyoung 5:4f90b458dbdf 306
Charles David Young 65:5f087e22a9d1 307 // if((ADC_val>0.6)&&(ADC_val<0.7)) // CLEAR pushbutton pressed
Charles David Young 65:5f087e22a9d1 308 // {
Charles David Young 65:5f087e22a9d1 309 // Count1 = 0; // clear counters
Charles David Young 65:5f087e22a9d1 310 // Count2 = 0;
Charles David Young 65:5f087e22a9d1 311 // }
Charles David Young 57:f4215ca747e5 312 //logToPC();
Charles David Young 16:b2e77eb76ab4 313 return;
Charles David Young 16:b2e77eb76ab4 314 }
walter76 1:75827d765e34 315
walter76 0:6d1742703713 316 //---------------------------------------------------------------------------
walter76 1:75827d765e34 317 // Increment CNT1 every time a rising edge is detected on TRIG1 (interrupt)
walter76 1:75827d765e34 318
walter76 1:75827d765e34 319 void Count1_up(void)
walter76 1:75827d765e34 320 {
Charles David Young 33:35e3ab4d5ba7 321 //Beep();
Charles David Young 28:c81d00ec28a3 322 Count1++;
Charles David Young 28:c81d00ec28a3 323 return;
walter76 1:75827d765e34 324 }
walter76 1:75827d765e34 325
walter76 1:75827d765e34 326 //---------------------------------------------------------------------------
walter76 1:75827d765e34 327 // Increment CNT1 every time a rising edge is detected on TRIG2 (interrupt)
walter76 1:75827d765e34 328
walter76 1:75827d765e34 329 void Count2_up(void)
walter76 1:75827d765e34 330 {
Charles David Young 33:35e3ab4d5ba7 331 //Beep();
Charles David Young 28:c81d00ec28a3 332 Count2++;
Charles David Young 28:c81d00ec28a3 333 return;
walter76 1:75827d765e34 334 }
walter76 1:75827d765e34 335
walter76 1:75827d765e34 336
walter76 1:75827d765e34 337 //---------------------------------------------------------------------------
walter76 1:75827d765e34 338 //Generates a short beep via BUZZ
walter76 1:75827d765e34 339
walter76 1:75827d765e34 340 void Beep(void)
walter76 1:75827d765e34 341 {
Charles David Young 28:c81d00ec28a3 342 BUZZ = 1; // turn-on the buzzer
Charles David Young 33:35e3ab4d5ba7 343 wait_us(100); // wait
Charles David Young 28:c81d00ec28a3 344 BUZZ = 0; // turn-off the buzzer
Charles David Young 28:c81d00ec28a3 345 return;
walter76 0:6d1742703713 346 }
walter76 0:6d1742703713 347
walter76 1:75827d765e34 348 //-------- END OF FILE --------------
walter76 1:75827d765e34 349 //==============================================================================