Revision 1:8db86d36b823, committed 2020-05-18

Comitter:

lolkusus

Date:

Mon May 18 18:03:56 2020 +0000

Parent:

0:2d7fdb94682a

Commit message:

final

Changed in this revision

diff -r 2d7fdb94682a -r 8db86d36b823 DECODER.lib
--- a/DECODER.lib	Mon May 18 17:09:08 2020 +0000
+++ b/DECODER.lib	Mon May 18 18:03:56 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/lolkusus/code/DECODER/#f6e7c3ad5a58
+https://os.mbed.com/users/lolkusus/code/DECODER/#288ebe73ba81

diff -r 2d7fdb94682a -r 8db86d36b823 main.cpp
--- a/main.cpp	Mon May 18 17:09:08 2020 +0000
+++ b/main.cpp	Mon May 18 18:03:56 2020 +0000
@@ -3,9 +3,9 @@
 
 #define CR '\r'
 
-Serial uart(USBTX, USBRX, 9600);
-Decoder decoder;
-StepperLedGui gui;
+Serial MyUart(USBTX, USBRX, 9600);
+Decoder MyDecoder;
+StepperLedGui MyGui;
 
 int puts (char *cBuffer, unsigned char ucBufferSize)
 {
@@ -21,9 +21,9 @@
     
     for (unsigned char ucBufferPointer = 0; cBuffer[ucBufferPointer] != NULL; ucBufferPointer++)
     {
-        uart.putc(cBuffer[ucBufferPointer]);
+        MyUart.putc(cBuffer[ucBufferPointer]);
     } 
-    uart.putc(CR);
+    MyUart.putc(CR);
     return 0;
 }
 
@@ -33,7 +33,7 @@
     
     while(ucBufferPointer < ucBufferSize)
     {
-        cBuffer[ucBufferPointer] = uart.getc();
+        cBuffer[ucBufferPointer] = MyUart.getc();
         if (cBuffer[ucBufferPointer] == CR)
         {
             cBuffer[ucBufferPointer] = NULL;
@@ -58,13 +58,13 @@
             puts(cID, sizeof(cID));
             break;
         case CALLIB:
-            gui.MotorCallib();
+            MyGui.MotorCallib();
             puts(cOK, sizeof(cOK));
             break;
         case GOTO:
             if (pToken[1].eType == NUMBER)
             {
-                gui.gotoPosition(pToken[1].uValue.uiNumber);
+                MyGui.gotoPosition(pToken[1].uValue.uiNumber);
                 puts(cOK, sizeof(cOK));
             }
             else
@@ -75,7 +75,7 @@
         case STEP:
             if (pToken[1].eType == NUMBER)
             {
-                gui.MotorSteps(pToken[1].uValue.uiNumber);
+                MyGui.MotorSteps(pToken[1].uValue.uiNumber);
                 puts(cOK, sizeof(cOK));
             }
             else
@@ -103,9 +103,9 @@
     {
         if (gets(cBuffor,sizeof(cBuffor)) == 0)
         {
-            if (decoder.DecodeMsg(cBuffor) == OK)
+            if (MyDecoder.DecodeMsg(cBuffor) == OK)
             {
-                handleMessage(decoder.asToken);
+                handleMessage(MyDecoder.asToken);
             }
             else
             {