Prechádzať zdrojové kódy

Added 'N' On the screen when executing a http get

Janco Kock 9 rokov pred
rodič
commit
9aa0dbde1c
3 zmenil súbory, kde vykonal 19 pridanie a 6 odobranie
  1. 10 6
      displayHandler.c
  2. 8 0
      network.c
  3. 1 0
      network.h

+ 10 - 6
displayHandler.c

@@ -13,6 +13,7 @@
 #include "log.h"
 #include "rtc.h"
 #include "alarm.h"
+#include "network.h"
 
 #define MONTH_OFFSET 1
 #define YEAR_OFFSET 1900
@@ -35,20 +36,23 @@ void displayTime(int line_number){
     }
 }
 
-void displayDate(int line_number){
+void displayDate(int line_number) {
     tm *time;
     X12RtcGetClock(time);
 
     char str[13];
 
-    if (NtpTimeIsValid()){
-        sprintf(str, "   %02d-%02d-%04d   ", time->tm_mday, time->tm_mon+MONTH_OFFSET, time->tm_year+YEAR_OFFSET);
-    }else {
+    if (NtpTimeIsValid()) {
+        sprintf(str, "   %02d-%02d-%04d   ", time->tm_mday, time->tm_mon + MONTH_OFFSET, time->tm_year + YEAR_OFFSET);
+    } else {
         sprintf(str, "   ??-??-????   ");
     }
 
-    if(NtpIsSyncing())
-        str[1] = 'S';
+    if (NtpIsSyncing()) {
+       str[1] = 'S';
+    }else if(NetworkIsReceiving()){
+        str[1] = 'N';
+    }
 
     if (line_number > -1 && line_number < 2){
         (*write_display_ptr[line_number])(str, 13);

+ 8 - 0
network.c

@@ -25,6 +25,8 @@
 #include "rtc.h"
 #include "alarm.h"
 
+bool isReceiving;
+
 void NetworkInit() {
     /* Register de internet controller. */
     if (NutRegisterDevice(&DEV_ETHER, 0, 0)) {
@@ -38,6 +40,7 @@ void NetworkInit() {
 }
 
 char* httpGet(char address[]){
+    isReceiving = true;
     NutDelay(1000);
     printf("\n\n #-- HTTP get -- #\n");
 
@@ -87,6 +90,7 @@ char* httpGet(char address[]){
     }
     content[t] = '\0';
     printf("\nContent size: %d, Content: %s \n", t, content);
+    isReceiving = false;
     return content;
 }
 
@@ -133,4 +137,8 @@ void parseAlarmJson(char* content){
 
     X12RtcSetAlarm(0,&time,0b11111111);
     NutDelay(1000);
+}
+
+bool NetworkIsReceiving(void){
+    return isReceiving;
 }

+ 1 - 0
network.h

@@ -5,6 +5,7 @@
 #ifndef _Network_H
 #define _Network_H
 
+
 extern void NetworkInit(void);
 char* httpGet(char address[]);
 void parseAlarmJson(char* content);