Revision 2:79508365d27f, committed 2018-02-09

Comitter:

dhenis

Date:

Fri Feb 09 23:06:47 2018 +0000

Parent:

1:126dd2f5fc2d

Commit message:

1s;

Changed in this revision

diff -r 126dd2f5fc2d -r 79508365d27f main.cpp
--- a/main.cpp	Wed Jan 24 21:55:43 2018 +0000
+++ b/main.cpp	Fri Feb 09 23:06:47 2018 +0000
@@ -9,11 +9,60 @@
 AnalogIn ain(A0) ;          // Analog input
 DigitalOut led1(LED_RED);   // Red LED
 
+DigitalOut ledex1(D8);
+DigitalOut ledex2(D9);
+DigitalOut ledex3(D10);
+DigitalOut ledex4(D11);
+DigitalOut ledex5(D12);
+DigitalOut ledex6(D13);
+
+
 Serial pc(USBTX, USBRX); // tx, rx, for debugging
 
+DigitalIn b1(PTD4, PullUp); // for button
+
+// polling 
+
+Thread pollT ; // thread to poll
+volatile int pressEvent = 0 ;  // Variabe set by the polling thread
+
+enum buttonPos { up, down, bounce }; // Button positions // three options of button position
+
+void polling() {
+    buttonPos pos = up ;// initial position
+    int bcounter = 0 ;
+    while (true) {
+        switch (pos) {
+            case up :
+                if (!b1.read()) {    // now down 
+                    pressEvent = 1 ;  // transition occurred
+                    pos = down ; // action and update position
+                }
+                break ;
+            case down : 
+                if (b1 == 1) { // no longer down. what the default value of b1?- > it depends and doesnt have initial value
+                    bcounter = 3 ; // wait four cycles
+                    pos = bounce ;
+                }
+                break ;
+            case bounce :
+                if (b1 == 0) { // down again - button has bounced
+                    pos = down ;   // no event
+                } else if (bcounter == 0) {
+                    pos = up ;     // delay passed - reset to up
+                } else {
+                    bcounter-- ;   // continue waiting
+                }
+                break ;
+        }
+        Thread::wait(10);
+    }
+}
+
+
 // Message type
 typedef struct {
-  uint16_t analog; /* Analog input value */
+  uint16_t analog; /* Analog input value */ 0 - 65.535
 } message_t;
 
 // Mail box
@@ -25,7 +74,7 @@
 volatile int samples = 0 ;
 volatile uint16_t smoothed = 0 ; 
 void readA0() {
-    smoothed = (smoothed >> 1) + (ain.read_u16() >> 1) ;
+    smoothed = (smoothed >> 1) + (ain.read_u16() >> 1) ; // smuthing function
     samples++ ;
     if (samples == 10) {
         // send to thread
@@ -54,19 +103,114 @@
 //   Procss messages from mailbox    
 int main() {
     led1 = 1 ; // turn off 
+    bool max_power = false;
     int volts = 0 ;
-    const int threshold = 100 ;
+    bool change_detector = false;
+  //  const int threshold = 100 ;
+    pollT.start(callback(polling));
+
+
+    const int threshold1 = 55;
+    const int threshold2 = 110;
+    const int threshold3 = 165;
+    const int threshold4 = 220;
+    const int threshold5 = 275;
+    
+    const int threshold6 = 330;
+    
     int counter = 0 ;
     char vstring[] = "X.XX\r\n" ;
 
     tick.attach_us(callback(&readA0), 10000); // ticks every 10ms
     while (true) {
         osEvent evt = mailbox.get(); // wait for mail 
+        
+        
+
+    if (pressEvent) { // main event
+            pressEvent = 0 ; // clear the event variable
+           // ledex6 = !ledex6 ;
+            //volts = 330;
+            max_power = !max_power;
+            change_detector = false;
+        }
+        
         if (evt.status == osEventMail) {
             message_t* mess = (message_t*)evt.value.p ;
             volts = (mess->analog * 330) / 0xffff ;
             mailbox.free(mess) ;  // free the message space
-            if (volts > threshold) led1 = 0 ; else led1 = 1 ;
+            
+            
+            
+            if ( volts <= threshold1  and max_power == false) {
+                                
+                    ledex1 = 0;
+                    ledex2 = 0;
+                    ledex3 = 0;
+                    ledex4 = 0;
+                    ledex5 = 0;
+                   // ledex6 = 0;
+            }
+            else if (volts <= threshold2 and max_power == false) {
+                                
+                    ledex1 = 1;
+                    ledex2 = 0;
+                    ledex3 = 0;
+                    ledex4 = 0;
+                    ledex5 = 0;
+//                    ledex6 = 0;
+            }
+            else if (volts <= threshold3 and max_power == false) {
+                                
+                    ledex1 = 1;
+                    ledex2 = 1;
+                    ledex3 = 0;
+                    ledex4 = 0;
+                    ledex5 = 0;
+//                    ledex6 = 0;
+            } 
+            
+            else if (volts <= threshold4 and max_power == false) {
+                                
+                    ledex1 = 1;
+                    ledex2 = 1;
+                    ledex3 = 1;
+                    ledex4 = 0;
+                    ledex5 = 0;
+//                    ledex6 = 0;
+            }  
+            else if (volts <= threshold5 and max_power == false) {
+                                
+                    ledex1 = 1;
+                    ledex2 = 1;
+                    ledex3 = 1;
+                    ledex4 = 1;
+                    ledex5 = 0;
+                    //ledex6 = 1;
+                    
+            }else if (volts >= threshold6 or max_power == true) {
+                                
+                    ledex1 = 1;
+                    ledex2 = 1;
+                    ledex3 = 1;
+                    ledex4 = 1;
+                    ledex5 = 1;
+//                    ledex6 = 1;
+                    if(volts >= threshold5){
+                        
+                         max_power = false;
+                    
+                    }        
+            
+            } 
+            else {
+                
+             
+                
+            }
+            // this is the main logic
+            
+            
             vToString(volts, vstring) ;
             counter++ ;
             if (counter == 10) {  // limit bandwidth of serial