From 56c7ca69c895ff072ae578344fb5987dd695ac96 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 7 Feb 2013 05:23:27 +0000
Subject: naming convention for ledmatrix

git-svn-id: https://svn.spreadspace.org/avr/trunk@180 aa12f405-d877-488e-9caf-2d797e2a1cc7
---
 usb-i2c-sl018/ledmatrix.c    |  4 ++--
 usb-i2c-sl018/ledmatrix.h    |  4 ++--
 usb-i2c-sl018/statemachine.c | 16 ++++++++--------
 usb-i2c-sl018/tuer-rfid.c    | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'usb-i2c-sl018')

diff --git a/usb-i2c-sl018/ledmatrix.c b/usb-i2c-sl018/ledmatrix.c
index 2682c14..c319b6d 100644
--- a/usb-i2c-sl018/ledmatrix.c
+++ b/usb-i2c-sl018/ledmatrix.c
@@ -176,13 +176,13 @@ void ledmatrix_rg_blink_handle(void)
 }
 
 
-void init_ledmatrix(void)
+void ledmatrix_init(void)
 {
   LEDMATRIX_DDR = 0xFF;
   LEDMATRIX_PORT = 0xFF;
 }
 
-void ledmatrix(ledmatrix_mode_t m)
+void ledmatrix_set(ledmatrix_mode_t m)
 {
   if(m == mode) 
     return;
diff --git a/usb-i2c-sl018/ledmatrix.h b/usb-i2c-sl018/ledmatrix.h
index e7ad817..4ecbd8f 100644
--- a/usb-i2c-sl018/ledmatrix.h
+++ b/usb-i2c-sl018/ledmatrix.h
@@ -28,7 +28,7 @@ typedef enum { off, red, red_moving, red_blink,
                green, green_moving, green_blink, 
                rg_moving, rg_blink } ledmatrix_mode_t;
 
-void init_ledmatrix(void);
-void ledmatrix(ledmatrix_mode_t mode);
+void ledmatrix_init(void);
+void ledmatrix_set(ledmatrix_mode_t mode);
 
 #endif
diff --git a/usb-i2c-sl018/statemachine.c b/usb-i2c-sl018/statemachine.c
index 62d3277..b83fbec 100644
--- a/usb-i2c-sl018/statemachine.c
+++ b/usb-i2c-sl018/statemachine.c
@@ -56,20 +56,20 @@ void change_state(state_t new_state)
   switch(new_state) {
     case reset:
       break;
-    case closed: ledmatrix(red); break;
+    case closed: ledmatrix_set(red); break;
     case closing:
-      ledmatrix(red_moving);
+      ledmatrix_set(red_moving);
       stepper_start(dir_close);
       break;
-    case opened: ledmatrix(green); break;
+    case opened: ledmatrix_set(green); break;
     case opening:
-      ledmatrix(green_moving);
+      ledmatrix_set(green_moving);
       stepper_start(dir_open);
       break;
-    case timeout_after_open: ledmatrix(green_blink); break;
-    case timeout_after_close: ledmatrix(red_blink); break;
-    case error: ledmatrix(rg_blink); break;
-    case manual_movement: ledmatrix(rg_moving); break;
+    case timeout_after_open: ledmatrix_set(green_blink); break;
+    case timeout_after_close: ledmatrix_set(red_blink); break;
+    case error: ledmatrix_set(rg_blink); break;
+    case manual_movement: ledmatrix_set(rg_moving); break;
       break;
   }
   state = new_state;
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index bdb6532..4de069e 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -80,15 +80,15 @@ void handle_cmd(uint8_t cmd)
     case 's': 
              printf("Status: %s, %s, %s\n\r", limits_to_string(limits_get()), statemachine_get_state_as_string(), ajar_to_string(ajar_get()));
              break;
-    /* case '0': ledmatrix(off); break; */
-    /* case '1': ledmatrix(red); break; */
-    /* case '2': ledmatrix(red_moving); break; */
-    /* case '3': ledmatrix(red_blink); break; */
-    /* case '4': ledmatrix(green); break; */
-    /* case '5': ledmatrix(green_moving); break; */
-    /* case '6': ledmatrix(green_blink); break; */
-    /* case '7': ledmatrix(rg_moving); break; */
-    /* case '8': ledmatrix(rg_blink); break; */
+    /* case '0': ledmatrix_set(off); break; */
+    /* case '1': ledmatrix_set(red); break; */
+    /* case '2': ledmatrix_set(red_moving); break; */
+    /* case '3': ledmatrix_set(red_blink); break; */
+    /* case '4': ledmatrix_set(green); break; */
+    /* case '5': ledmatrix_set(green_moving); break; */
+    /* case '6': ledmatrix_set(green_blink); break; */
+    /* case '7': ledmatrix_set(rg_moving); break; */
+    /* case '8': ledmatrix_set(rg_blink); break; */
     default: printf("Error(cmd): unknown command %02X '%c'\n\r", cmd, cmd); return;
   }
 }
@@ -125,7 +125,7 @@ int main(void)
 
   heartbeat_init();
   stepper_init();
-  init_ledmatrix();
+  ledmatrix_init();
   init_eventqueue();
   init_limits();
   init_manual();
-- 
cgit v1.2.3