Diff: main.cpp

Revision:

4:0aec01df33d2

Parent:

3:591190524a70

Child:

5:ecaf089d1c8a

diff -r 591190524a70 -r 0aec01df33d2 main.cpp
--- a/main.cpp	Sat Feb 22 16:14:38 2020 +0000
+++ b/main.cpp	Sat Feb 22 17:17:54 2020 +0000
@@ -10,15 +10,16 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sstream>
-#include <iostream>
 #include "TCPSocket.h"
 
+#include "PGSdisplay.h"
+
 
-void putOnDispNo(int broj, char boja);
-void putOnDisp(char *s, char boja);
+//
+//void putOnDispNo(int broj, char boja);
+//void putOnDisp(char *s, char boja);
 void requestMessageThread(struct s_rm *s);
-void slanjefun();
+//void slanjefun();
 
 #define IP_ADDR   "192.168.2.11"
 #define NET_MASK  "255.255.248.0"
@@ -33,18 +34,13 @@
 char * extract_string( char delimiter, char *ulazni_str, int n_str );
 void putOnDisp( char *s, char boja);
 
-int strcount( char *ps)
-{
-    int i=0;
-    for(i=0; ps[i] != 0; i++);
-    return i;
-}
+
 
 void tcpThread_fun( EthernetInterface *e);
 void requestMessage( EthernetInterface *e);
-
+//
 DigitalOut tast(PTB19,0);
-//RawSerial rs485(PTC17,PTC16);
+////RawSerial rs485(PTC17,PTC16);
 RawSerial rs485(PTD3,PTD2);
 
 struct s_rm {
@@ -168,7 +164,7 @@
     if((err=tcpSocket.open( s->e )) ==0 ) {
         if((err = tcpSocket.connect(*(s->sa))) == 0) {
             char *ss = s->tx_msg;
-            if( (err = tcpSocket.send(s->tx_msg,strcount(ss))<0 ) ) {
+            if( (err = tcpSocket.send(s->tx_msg,strlen(ss))<0 ) ) {
                 printf("requestMessage - send err: %d\n\r", err);
             } else {
                 printf("requestMessage - poslano: %d bajtova od: %s\n\r", err, s->tx_msg);
@@ -212,82 +208,82 @@
 
 
 
-
-
-void ev(int)
-{
-    tast=0;
-}
-
-
-
-unsigned char buf_tel[100] = {0x71,0x00,0x0D,0x71,0x43,0x1,0x1B,0x4A,0x01,0x01,  /*0x1b,0x45,0x1,*/  0x1B,0x43,1,0x33,0xD5,0x16};
-#define NO_BEFORE_DATA 13
-#define NO_WITH_DATA (NO_BEFORE_DATA + strlen(s))
-
-void putOnDisp( char *s, char boja)
-{
-    int ubb = NO_BEFORE_DATA+strlen(s)+1+1-4-2; // ubb = ukupan broj bajtova
-    buf_tel[NO_BEFORE_DATA-1]=boja;
-    memcpy(buf_tel+NO_BEFORE_DATA, s, strlen(s)+2);
-
-    char suma=0;
-    for(int i = 4; i < NO_WITH_DATA; i++) {
-        suma +=buf_tel[i];
-    }
-
-    buf_tel[NO_WITH_DATA] = suma;
-    buf_tel[NO_WITH_DATA+1] = 22;
-    buf_tel[1]=ubb>>8;
-    buf_tel[2]=ubb;
-
-
-    tast=1;
-    rs485.write(buf_tel, NO_WITH_DATA+2+2,ev);
-}
-
-void putOnDispNo(int broj, char boja)
-{
-    char s[10];
-    sprintf( s, "%d", broj);
-    putOnDisp( s, boja);
-}
-
-
-void slanjefun()
-{
-
-    int j=0;
-
-
-    while (true) {
-//       printf("disp thred %d\n\r",j);
-        if(j >10 && j<15 ) putOnDisp("des",1);
-        else putOnDispNo(j,1);
-        j++;
-        thread_sleep_for(1000);
-    }
-}
-
-
-char * extract_string( char delimiter, char *ulazni_str, int n_str )
-{
-    int br_str=0;
-    char *ret_str=ulazni_str;
-    char* ptr = ulazni_str;
-
-    while(*ptr) {
-        if(*ptr == delimiter) {
-            *ptr = 0;
-            if( br_str == n_str )   return ret_str;
-            else {
-                br_str++;
-                ret_str = ptr + 1;
-            }
-        }
-        ptr++;
-    }
-    if( br_str == n_str )   return ret_str;
-    return NULL;
-}
-
+//
+//
+//void ev(int)
+//{
+//    tast=0;
+//}
+//
+//
+//
+//unsigned char buf_tel[100] = {0x71,0x00,0x0D,0x71,0x43,0x1,0x1B,0x4A,0x01,0x01,  /*0x1b,0x45,0x1,*/  0x1B,0x43,1,0x33,0xD5,0x16};
+//#define NO_BEFORE_DATA 13
+//#define NO_WITH_DATA (NO_BEFORE_DATA + strlen(s))
+//
+//void putOnDisp( char *s, char boja)
+//{
+//    int ubb = NO_BEFORE_DATA+strlen(s)+1+1-4-2; // ubb = ukupan broj bajtova
+//    buf_tel[NO_BEFORE_DATA-1]=boja;
+//    memcpy(buf_tel+NO_BEFORE_DATA, s, strlen(s)+2);
+//
+//    char suma=0;
+//    for(int i = 4; i < NO_WITH_DATA; i++) {
+//        suma +=buf_tel[i];
+//    }
+//
+//    buf_tel[NO_WITH_DATA] = suma;
+//    buf_tel[NO_WITH_DATA+1] = 22;
+//    buf_tel[1]=ubb>>8;
+//    buf_tel[2]=ubb;
+//
+//
+//    tast=1;
+//    rs485.write(buf_tel, NO_WITH_DATA+2+2,ev);
+//}
+//
+//void putOnDispNo(int broj, char boja)
+//{
+//    char s[10];
+//    sprintf( s, "%d", broj);
+//    putOnDisp( s, boja);
+//}
+//
+//
+//void slanjefun()
+//{
+//
+//    int j=0;
+//
+//
+//    while (true) {
+////       printf("disp thred %d\n\r",j);
+//        if(j >10 && j<15 ) putOnDisp("des",1);
+//        else putOnDispNo(j,1);
+//        j++;
+//        thread_sleep_for(1000);
+//    }
+//}
+//
+//
+//char * extract_string( char delimiter, char *ulazni_str, int n_str )
+//{
+//    int br_str=0;
+//    char *ret_str=ulazni_str;
+//    char* ptr = ulazni_str;
+//
+//    while(*ptr) {
+//        if(*ptr == delimiter) {
+//            *ptr = 0;
+//            if( br_str == n_str )   return ret_str;
+//            else {
+//                br_str++;
+//                ret_str = ptr + 1;
+//            }
+//        }
+//        ptr++;
+//    }
+//    if( br_str == n_str )   return ret_str;
+//    return NULL;
+//}
+//