Diff: display.cpp

Revision:

20:2b6ebe60929d

Parent:

16:50686c07ad07

--- a/display.cpp	Mon Jun 05 22:47:14 2017 +0000
+++ b/display.cpp	Mon Jul 08 10:50:40 2019 +0000
@@ -102,7 +102,7 @@
         write_string("  YORK ROBOTICS");
         set_position(1,0);
         write_string("   LABORATORY");
-   init_timeout.attach(this,&Display::post_init,0.25);}
+   init_timeout.attach(callback(this, &Display::post_init),0.25);}
    else {      
    set_position(0,0);
    write_string("Hold button to");
@@ -144,7 +144,7 @@
     sprintf(line,"VERSION %1.2f", SOFTWARE_VERSION_CODE  );
     set_position(1,0);
     write_string(line);
-    init_timeout.attach(this,&Display::post_post_init,0.25);
+    init_timeout.attach(callback(this, &Display::post_post_init), 0.25);
 }
 
 void Display::post_post_init(){
@@ -235,7 +235,7 @@
             backlight_off_time = 10000 - backlight_on_time;
             backlight_step = 0;
             _backlight = 0;
-            backlight_timeout.attach_us(this,&Display::IF_backlight_toggle,backlight_off_time);
+            backlight_timeout.attach_us(callback(this, &Display::IF_backlight_toggle), backlight_off_time);
         }
     }
 }
@@ -244,11 +244,11 @@
     if(backlight_step == 0){
         _backlight = 1;
         backlight_step = 1;
-        backlight_timeout.attach_us(this,&Display::IF_backlight_toggle,backlight_on_time);
+        backlight_timeout.attach_us(callback(this, &Display::IF_backlight_toggle), backlight_on_time);
     }   else {
         _backlight = 0;
         backlight_step = 0;
-        backlight_timeout.attach_us(this,&Display::IF_backlight_toggle,backlight_off_time);
+        backlight_timeout.attach_us(callback(this, &Display::IF_backlight_toggle), backlight_off_time);
     }
 }
 void Display::clear_display(){
@@ -295,8 +295,8 @@
     if(multipage_mode == 1){
         strncpy(multipage, message + 32, length - 32);
         multipage_length = length - 32;
-        debug_timeout.attach(this,&Display::IF_debug_multipage,PAGE_TIME);
-    } else debug_timeout.attach(this,&Display::IF_restore_page,CLEAR_TIME);
+        debug_timeout.attach(callback(this, &Display::IF_debug_multipage), PAGE_TIME);
+    } else debug_timeout.attach(callback(this,&Display::IF_restore_page), CLEAR_TIME);
 }
 
 void Display::IF_restore_page(){
@@ -344,8 +344,8 @@
         strncpy(temp, multipage + 32, multipage_length - 32);
         multipage_length -= 32;
         strncpy(multipage, temp, multipage_length);
-        debug_timeout.attach(this,&Display::IF_debug_multipage,PAGE_TIME);
-    }else debug_timeout.attach(this,&Display::IF_restore_page,CLEAR_TIME);
+        debug_timeout.attach(callback(this, &Display::IF_debug_multipage), PAGE_TIME);
+    }else debug_timeout.attach(callback(this,&Display::IF_restore_page), CLEAR_TIME);
 }
 
 void Display::_set_display(){