[v2.1]

외부전원 블럭 추가 (Vin) WatchDog printing
AO / MC9 하나만 사용 가능
18 changed files with 30682 additions and 29878 deletions
--- a/FC_InterfaceBoard/Ethernet.ino
+++ b/FC_InterfaceBoard/Ethernet.ino
@ -1,16 +1,24 @@
 void Ethernet_setup(){
+
+  /*
  byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0x00 };
  IPAddress ip(192, 168, 20, 177);
  IPAddress gateway(192, 168, 20, 1);
  IPAddress subnet(255, 255, 255, 0);
+  */
+  uint8_t mac[6] = {MACADDRESS};
+  uint8_t myIP[4] = {MYIPADDR};
+  uint8_t myMASK[4] = {MYIPMASK};
+  uint8_t myDNS[4] = {MYDNS};
+  uint8_t myGW[4] = {MYGW};

  // Mac as unique value by change last byte from ip last value.
-  mac[5] = ip[3] & 0xFF;
+  //mac[5] = ip[3] & 0xFF;
  // initialize the ethernet device
-  Ethernet.begin(mac, ip, gateway, subnet);
+  Ethernet.begin(mac,myIP,myDNS,myGW,myMASK);
  // start listening for clients
  server.begin();
-  web.begin();
+  //web.begin();

  // Report address
  Serial.print("MAC>>");
@ -28,36 +36,6 @@ void Ethernet_setup(){
  Serial.println(Ethernet.localIP());
 }

-void webReponse(){
-  EthernetClient webClient = web.available();
-  if (webClient) {
-    Serial.println("Web client connected");
-    while (webClient.connected()) {
-      if (webClient.available()) {
-        // 웹 브라우저에서 요청이 도착한 경우
-        String request = webClient.readStringUntil('\r');
-        //Serial.println(request);
-        webClient.flush();
-        
-        // 웹 브라우저에 출력할 문구 작성
-        String response = "HTTP/1.1 200 OK\r\n";
-        response += "Content-Type: text/html\r\n\r\n";
-        response += "<html><body>";
-        response += Prcss_AI_Read();
-        //response += "<h1>Hello, World!</h1>";
-        response += "</body></html>";
-        
-        // 문구를 웹 브라우저로 전송
-        webClient.print(response);
-        delay(1);
-        
-        // 클라이언트 연결 종료
-        webClient.stop();
-      }
-    }
-  }
-
-}

 String demuxCMD(String command, String* rightPart) {

--- a/FC_InterfaceBoard/FC_InterfaceBoard.h
+++ b/FC_InterfaceBoard/FC_InterfaceBoard.h
@ -1,14 +1,27 @@
 #include "Arduino.h"
 #include <MsTimer2.h>   // MsTimer2 v1.1
-#include <Ethernet2.h>  // Ethernet2 v1.0.4
+//#include <Ethernet2.h>  // Ethernet2 v1.0.4
+// for ENC28J60
+#include <UIPEthernet.h>
+#include <UIPServer.h>
+#include <UIPClient.h>
+// ------------------
 #include "GP8403.h"

-#define VERSION "23-08-08  09:37"
-#define COMMENT "AI 10ms x 20"
+#define VERSION "240129 1044"
+#define COMMENT "MC9 or AO init"

 #define AI_RANGE  10
 #define AI_AVG_SIZE 20

+/* ---------- Ethernet (ENC) ---------- */
+#define MACADDRESS 0x00,0x01,0x02,0x03,0x04,0x05
+#define MYIPADDR 192,168,20,177
+#define MYIPMASK 255,255,255,0
+#define MYDNS 192,168,20,1
+#define MYGW 192,168,20,1
+#define LISTENPORT 5025
+

 /* ---------- Init ---------- */
 bool Init_AO = false;
@ -66,13 +79,10 @@ DFRobot_GP8403 AO_14(&Wire,0x5F);
 // Data Storage
 int RngAO[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

-/* ---------- Ethernet (Ethernet Sheld2) ---------- */
-// Ethernet Client
+/* ---------- Ethernet (ENC28J60) ---------- */
 EthernetClient client;
-// SCPI defaults to port 5025
-EthernetServer server(5025);
-// HTTP defaults to port 5025
-EthernetServer web(80);
+EthernetServer server = EthernetServer(LISTENPORT);
+

 unsigned long lastDataReceivedTime;
 unsigned long timeoutPeriod = 5000;  // 이더넷 타임아웃 시간 (5초)
@ -81,17 +91,21 @@ bool State_eth = false;

 HardwareSerial* Serials[] = {&Serial1, &Serial2};

-const int BUFF_SIZE = 1024;
+const int BUFF_SIZE = 512;
 char Buff_Eth_Rd[BUFF_SIZE] = {0};
 char Buff_485_1_Wr[BUFF_SIZE] = {0};
 char Buff_485_1_Rd[BUFF_SIZE] = {0};
 char Buff_485_2_Wr[BUFF_SIZE] = {0};
 char Buff_485_2_Rd[BUFF_SIZE] = {0};

-String latest_sent_msg;
+String latest_sent_msg_1;
 int numOf485 = 0;
 int returnTime = 0;

+String latest_sent_msg_2;
+int numOf485_2 = 0;
+int returnTime_2 = 0;
+
 /* ---------- RS485 ---------- */
 // 485 CH 1
 bool Wait_485_1;
@ -106,9 +120,9 @@ int RS485_1_Values_SV[8*2];
 // 485 CH 2
 bool Wait_485_2;
 int Wait_485_2_cnt;
-int RS485_2_Addr[2];
-bool RS485_2_Rcv_PV[2];
-bool RS485_2_Rcv_SV[2];
+int RS485_2_Addr[2] = {0,0};
+bool RS485_2_Rcv_PV[2] = {false, false};
+bool RS485_2_Rcv_SV[2] = {false, false};
 int RS485_2_Rcv_size = 8;
 int RS485_2_Values_PV[8*2];
 int RS485_2_Values_SV[8*2];
@ -122,10 +136,13 @@ String Prcss_AI_Read();
 String Prcss_AO_Write(unsigned int data[], int dataSize);
 String Prcss_PV_Read();
 String Prcss_SV_Read();
-String Prcss_SV_Write(unsigned int data[], int dataSize);
-String Prcss_AT_Write(unsigned int data[], int dataSize);
+String Prcss_SV_Write_1(unsigned int data[], int dataSize);
+String Prcss_AT_Write_1(unsigned int data[], int dataSize);
+String Prcss_SV_Write_2(unsigned int data[], int dataSize);
+String Prcss_AT_Write_2(unsigned int data[], int dataSize);
 String Prcss_RngAO(unsigned int data[], int dataSize);
-String Prcss_ChMC9(unsigned int data[], int dataSize);
+String Prcss_ChMC9_1(unsigned int data[], int dataSize);
+String Prcss_ChMC9_2(unsigned int data[], int dataSize);

 //Ethernet
 void Ethernet_setup();
@ -135,8 +152,10 @@ int demuxNum(String rightPart, unsigned int data[]);

 //RS485
 void RS485_setup();
-void send_485();
-int recieve_485();
+void send_485_1();
+void send_485_2();
+int recieve_485_1();
+int recieve_485_2();
 void recieve_485_0();

 //GPIO
@ -146,10 +165,13 @@ void read_digital();

 //MC9
 void setupMC9_1(int i, int data);
-String msg_MC9_PV(int addr);
-String msg_MC9_SV(int addr);
-int saveMC9(String message);
-int timeoutMC9();
+void setupMC9_2(int i, int data);
+String msg_MC9_PV_read(int addr);
+String msg_MC9_SV_read(int addr);
+int saveMC9_1(String message);
+int saveMC9_2(String message);
+int timeoutMC9_1();
+int timeoutMC9_2();
 int parseMC9(const String& message, int& addr, String& mode, int data[8], int& crc);
 String sumMC9(String input);

--- a/FC_InterfaceBoard/FC_InterfaceBoard.ino
+++ b/FC_InterfaceBoard/FC_InterfaceBoard.ino
@ -10,6 +10,9 @@

 String IdeSerial; // for 485_0

+
+
+
 void setup() {
  // Serial setup (Debug)
  Serial.begin(9600);
@ -89,11 +92,20 @@ void loop() {
        // MC9
        else if(cmd=="SV_1!"){
          dataSize = demuxNum(cmdData, data);
-          client.print(Prcss_SV_Write(data, dataSize));
+          client.print(Prcss_SV_Write_1(data, dataSize));

        }else if(cmd=="AT_1!"){
          dataSize = demuxNum(cmdData, data);
-          client.print(Prcss_AT_Write(data, dataSize));
+          client.print(Prcss_AT_Write_1(data, dataSize));
+
+        }
+        else if(cmd=="SV_2!"){
+          dataSize = demuxNum(cmdData, data);
+          client.print(Prcss_SV_Write_2(data, dataSize));
+
+        }else if(cmd=="AT_2!"){
+          dataSize = demuxNum(cmdData, data);
+          client.print(Prcss_AT_Write_2(data, dataSize));

        }
        // Init
@ -106,7 +118,11 @@ void loop() {
          Init_AO = true;
        }else if(cmd=="ChMC9_1!"){
          dataSize = demuxNum(cmdData, data);
-          client.print(Prcss_ChMC9(data, dataSize));
+          client.print(Prcss_ChMC9_1(data, dataSize));
+          Init_MC9 = true;
+        }else if(cmd=="ChMC9_2!"){
+          dataSize = demuxNum(cmdData, data);
+          client.print(Prcss_ChMC9_2(data, dataSize));
          Init_MC9 = true;
        }

--- a/FC_InterfaceBoard/MC9.ino
+++ b/FC_InterfaceBoard/MC9.ino
@ -7,10 +7,15 @@ const int MC9_CH[] = {1000, 1008, 1016, 1024, 1100, 1108, 1116, 1124};
 void setupMC9_1(int i, int data){
  RS485_1_Addr[i] = data;

-  Serial.println("MC9 No."+ String(i) + " 's address set as " + String(data));
+  Serial.println("MC9_1 No."+ String(i) + " 's address set as " + String(data));
 }
+void setupMC9_2(int i, int data){
+  RS485_2_Addr[i] = data;

-String msg_MC9_PV(int addr){
+  Serial.println("MC9_2 No."+ String(i) + " 's address set as " + String(data));
+}
+
+String msg_MC9_PV_read(int addr){
  String message = "";

  if(addr < 10){
@ -24,7 +29,7 @@ String msg_MC9_PV(int addr){
  return message;
 }

-String msg_MC9_SV(int addr){
+String msg_MC9_SV_read(int addr){
  String message = "";
  
  if(addr < 10){
@ -38,10 +43,13 @@ String msg_MC9_SV(int addr){
  return message;
 }

-int msg_MC9_SV_set(unsigned int data[], int dataSize){
+int msg_MC9_SV_set_1(unsigned int data[], int dataSize){
  String message = "";
  int lp0, lp1;

+  if(dataSize > 16){
+    dataSize = 16;
+  }
  if(dataSize > 8){
    lp0 = 8;
    lp1 = dataSize;
@ -49,7 +57,7 @@ int msg_MC9_SV_set(unsigned int data[], int dataSize){
    lp0 = dataSize;
    lp1 = 0;
  }
-
+  
  if(RS485_1_Addr[0] != 0){
    if(RS485_1_Addr[0] < 10){
      message += "0";  
@ -91,13 +99,14 @@ int msg_MC9_SV_set(unsigned int data[], int dataSize){
    }
    message += sumMC9(message);
    message = "" + message + CRLF;
+
    write_buff_first(Buff_485_1_Wr, message);
  }

  return 0;
 }

-int msg_MC9_AT_set(unsigned int data[], int dataSize){
+int msg_MC9_AT_set_1(unsigned int data[], int dataSize){
  String message = "";
  bool at[16];

@ -108,7 +117,7 @@ int msg_MC9_AT_set(unsigned int data[], int dataSize){
  for (int i = 0; i < 16; i++) {
    at[i] = (bitRead(data0, i) ? HIGH : LOW);
  }
-
+  
  lp0 = 8;
  lp1 = 8;

@ -126,7 +135,6 @@ int msg_MC9_AT_set(unsigned int data[], int dataSize){
      }else{
        atFlag = "0000";  // Auto Tuen Off
      }
-
      message += "0302,"; // Ch No cmd.
      message += "000" + String(i+1) + ","; // Ch No.
      message += "0501,"; // AT cmd.
@ -137,6 +145,7 @@ int msg_MC9_AT_set(unsigned int data[], int dataSize){
    }
    message += sumMC9(message);
    message = "" + message + CRLF;
+    
    write_buff_first(Buff_485_1_Wr, message);
  }

@ -167,11 +176,146 @@ int msg_MC9_AT_set(unsigned int data[], int dataSize){
    message = "" + message + CRLF;
    write_buff_first(Buff_485_1_Wr, message);
  }
+  return 0;
+}
+
+int msg_MC9_SV_set_2(unsigned int data[], int dataSize){
+  String message = "";
+  int lp0, lp1;
+  
+  if(dataSize > 16){
+    dataSize = 16;
+  }
+  if(dataSize > 8){
+    lp0 = 8;
+    lp1 = dataSize;
+  }else{
+    lp0 = dataSize;
+    lp1 = 0;
+  }
+
+  if(RS485_2_Addr[0] != 0){
+    if(RS485_2_Addr[0] < 10){
+      message += "0";  
+    }
+    message = String(RS485_2_Addr[0]);
+    message += "DWR,0" + String(lp0) + ",";
+    for(int i=0 ; i<lp0 ; i++){
+      char hexStr[5]; // Buffer to hold the hexadecimal string (4 characters + null terminator)
+      sprintf(hexStr, "%04X", data[i]); // Format as 4 digit uppercase hexadecimal
+
+      message += MC9_CH[i] + 1; // ZONE 1
+      message += ",";
+      message += String(hexStr);
+      if(i != (lp0-1)){
+        message += ",";
+      }
+    }
+    message += sumMC9(message);
+    message = "" + message + CRLF;
+    write_buff_first(Buff_485_2_Wr, message);
+  }
+
+  if((RS485_2_Addr[1] != 0) && (lp1>0)){
+    if(RS485_2_Addr[1] < 10){
+      message += "0";  
+    }
+    message = String(RS485_2_Addr[1]);
+    message += "DWR,0" + String(lp1-8) + ",";
+    for(int i=8 ; i<lp1 ; i++){
+      char hexStr[5]; // Buffer to hold the hexadecimal string (4 characters + null terminator)
+      sprintf(hexStr, "%04X", data[i]); // Format as 4 digit uppercase hexadecimal
+
+      message += MC9_CH[i%8] + 1; // ZONE 1
+      message += ",";
+      message += String(hexStr);
+      if(i != (lp1-1)){
+        message += ",";
+      }
+    }
+    message += sumMC9(message);
+    message = "" + message + CRLF;
+    write_buff_first(Buff_485_2_Wr, message);
+  }
+
+  return 0;
+}
+
+int msg_MC9_AT_set_2(unsigned int data[], int dataSize){
+  String message = "";
+  bool at[16];
+
+  int lp0, lp1;
+  
+  // Number to boolean array
+  unsigned int data0 = data[0];
+  for (int i = 0; i < 16; i++) {
+    at[i] = (bitRead(data0, i) ? HIGH : LOW);
+  }
+
+  lp0 = 8;
+  lp1 = 8;
+
+  message = "";
+  if(RS485_2_Addr[0] != 0){
+    if(RS485_2_Addr[0] < 10){
+      message += "0";  
+    }
+    message += String(RS485_2_Addr[0]);
+    message += "DWR,16,";
+    for(int i=0 ; i<8 ; i++){
+      String atFlag;
+      if(at[i]){
+        atFlag = "0001";  // Auto Tuen On
+      }else{
+        atFlag = "0000";  // Auto Tuen Off
+      }
+
+      message += "0302,"; // Ch No cmd.
+      message += "000" + String(i+1) + ","; // Ch No.
+      message += "0501,"; // AT cmd.
+      message += atFlag;  // AT flag
+      if(i != 7){
+        message += ",";
+      }
+    }
+    message += sumMC9(message);
+    message = "" + message + CRLF;
+    write_buff_first(Buff_485_2_Wr, message);
+  }
+
+  message = "";
+  if((RS485_2_Addr[1] != 0) && (lp1>0)){
+    if(RS485_1_Addr[1] < 10){
+      message += "0";  
+    }
+    message += String(RS485_2_Addr[1]);
+    message += "DWR,16,";
+    for(int i=0 ; i<8 ; i++){
+      String atFlag;
+      if(at[i+8]){
+        atFlag = "0001";
+      }else{
+        atFlag = "0000";
+      }
+
+      message += "0302,"; // Ch No cmd.
+      message += "000" + String(i+1) + ","; // Ch No.
+      message += "0501,"; // AT cmd.
+      message += atFlag;  // AT flag
+      if(i != 7){
+        message += ",";
+      }
+    }
+    message += sumMC9(message);
+    message = "" + message + CRLF;
+    write_buff_first(Buff_485_2_Wr, message);
+  }

  return 0;
 }

-int saveMC9(String message){
+int saveMC9_1(String message){
  int addr;
  int idx = -1;
  String mode;
@ -190,7 +334,7 @@ int saveMC9(String message){
      return -1;
    }

-    if(latest_sent_msg.indexOf("DRS,08,0001") != -1){ // if sent message is PV CMD
+    if(latest_sent_msg_1.indexOf("DRS,08,0001") != -1){ // if sent message is PV CMD
      //rcv_10_PV = true;
      RS485_1_Rcv_PV[idx] = true;
      for(int i = 0 ; i < RS485_1_Rcv_size ; i++){
@ -198,7 +342,7 @@ int saveMC9(String message){
      }
    }
    
-    if(latest_sent_msg.indexOf("DRS,08,0011") != -1){ // if sent message is SV CMD
+    if(latest_sent_msg_1.indexOf("DRS,08,0011") != -1){ // if sent message is SV CMD
      //rcv_10_SV = true;
      RS485_1_Rcv_SV[idx] = true;
      for(int i = 0 ; i < RS485_1_Rcv_size ; i++){
@ -213,7 +357,49 @@ int saveMC9(String message){
  }
 }

-int timeoutMC9(){
+int saveMC9_2(String message){
+  int addr;
+  int idx = -1;
+  String mode;
+  int data[8];
+  int crc;
+
+  if (!parseMC9(message, addr, mode, data, crc)) {
+    for(int i=0 ; i < 2 ; i++){ // RS485_1 has two rooms for two MC9s
+      if(RS485_2_Addr[i] == addr){
+        idx = i;
+        break;
+      }
+    }
+    
+    if(idx < 0){
+      return -1;
+    }
+
+    if(latest_sent_msg_2.indexOf("DRS,08,0001") != -1){ // if sent message is PV CMD
+      //rcv_10_PV = true;
+      RS485_2_Rcv_PV[idx] = true;
+      for(int i = 0 ; i < RS485_1_Rcv_size ; i++){
+        RS485_2_Values_PV[i + idx*8] = data[i];
+      }
+    }
+    
+    if(latest_sent_msg_2.indexOf("DRS,08,0011") != -1){ // if sent message is SV CMD
+      //rcv_10_SV = true;
+      RS485_2_Rcv_SV[idx] = true;
+      for(int i = 0 ; i < RS485_1_Rcv_size ; i++){
+        RS485_2_Values_SV[i + idx*8] = data[i];
+      }
+    }
+    return 0;
+
+  } else {
+      Serial.println("error 485 read");
+      return -1;
+  }
+}
+
+int timeoutMC9_1(){
  int addr;
  int idx = -1;
  String msg, mode, cmd;
@ -222,12 +408,12 @@ int timeoutMC9(){
  int crc;
  // Message parsing
  
-  msg = latest_sent_msg.substring(1);
+  msg = latest_sent_msg_1.substring(1);
  sscanf(msg.c_str(), "%2d%3s", &addr, &dummy);

-  //230721 Serial.print("485 not responced... (Timeout) Req msg : " + latest_sent_msg);
+  //230721 Serial.print("485 not responced... (Timeout) Req msg : " + latest_sent_msg_1);

-  if (latest_sent_msg.indexOf("DRS") != -1) {
+  if (latest_sent_msg_1.indexOf("DRS") != -1) {
    for(int i=0 ; i < 2 ; i++){ // RS485_1 has two rooms for two MC9s
      // Find idx of array
      if(RS485_1_Addr[i] == addr){
@ -235,25 +421,39 @@ int timeoutMC9(){
        break;
      }
    }
-    /* 230721
-    // If not matched, return error
-    if(idx < 0){
+
+    return 0;
+
+  } else {
      Serial.println();
      return -1;
-    }
+  }

-    if(latest_sent_msg.indexOf("DRS,08,0001") != -1){ // if sent message is PV CMD
-      RS485_1_Rcv_PV[idx] = false;
-      Serial.print(" >> PV @");
-      Serial.println(idx);
-    }
-    if(latest_sent_msg.indexOf("DRS,08,0011") != -1){ // if sent message is SV CMD
-      RS485_1_Rcv_SV[idx] = false;
-      
-      Serial.print(" >> SV @");
-      Serial.println(idx);
+}
+
+int timeoutMC9_2(){
+  int addr;
+  int idx = -1;
+  String msg, mode, cmd;
+  char dummy[4];
+  int data[8];
+  int crc;
+  // Message parsing
+  
+  msg = latest_sent_msg_2.substring(1);
+  sscanf(msg.c_str(), "%2d%3s", &addr, &dummy);
+
+  //230721 Serial.print("485 not responced... (Timeout) Req msg : " + latest_sent_msg_1);
+
+  if (latest_sent_msg_2.indexOf("DRS") != -1) {
+    for(int i=0 ; i < 2 ; i++){ // RS485_1 has two rooms for two MC9s
+      // Find idx of array
+      if(RS485_2_Addr[i] == addr){
+        idx = i;
+        break;
+      }
    }
-    */
+
    return 0;

  } else {
@ -261,18 +461,6 @@ int timeoutMC9(){
      return -1;
  }

-  /*
-  if(latest_sent_msg == MC9_10_PV){
-    //rcv_10_PV = false;
-  }
-  if(latest_sent_msg == MC9_10_SV){
-    //rcv_10_SV = false;
-
-  }else {
-    Serial.println("error 485 read");
-    return -1;
-  }
-  */
 }

 int parseMC9(const String& message, int& addr, String& mode, int data[8], int& crc) {
--- a/FC_InterfaceBoard/Periodics.ino
+++ b/FC_InterfaceBoard/Periodics.ino
@ -5,7 +5,7 @@ void Periodic_run(){
    T_1ms = false;
  }
  if(T_2ms){
-    //read_analog();  // runtime of 1.xxx ms @8ch
+    read_analog();  // runtime of 1.xxx ms @8ch
    T_2ms = false;
  }
  if(T_4ms){
@ -17,12 +17,12 @@ void Periodic_run(){
    T_5ms = false;
  }
  if(T_10ms){
-    read_analog();
+    //read_analog();
    T_10ms = false;
  }
  if(T_20ms){
-    send_485();
-    recieve_485();
+    send_485_1();
+    recieve_485_1();
    T_20ms = false;
  }
  if(T_50ms){
@ -43,15 +43,17 @@ void Periodic_run(){
    T_500ms = false;
  }
  if(T_1000ms){
+
+    T_1000ms = false;
+  }
+  if(T_2000ms){
    // Read MC9 PV
    for(int i=0 ; i < 2 ; i++){
      if(RS485_1_Addr[i] > 0){
-        write_buff(Buff_485_1_Wr, msg_MC9_PV(RS485_1_Addr[i]));
+        write_buff(Buff_485_1_Wr, msg_MC9_PV_read(RS485_1_Addr[i]));
      }
    }
-    T_1000ms = false;
-  }
-  if(T_2000ms){
+
    if(numOf485 > 10){
      Serial.print("----- remain 485 buff : "); //  For
      Serial.println(numOf485);                 //  Debugging
@ -62,7 +64,7 @@ void Periodic_run(){
    // Read MC9 SV
    for(int i=0 ; i < 2 ; i++){
      if(RS485_1_Addr[i] > 0){
-        write_buff(Buff_485_1_Wr, msg_MC9_SV(RS485_1_Addr[i]));
+        //write_buff(Buff_485_1_Wr, msg_MC9_SV_read(RS485_1_Addr[i]));
      }
    }
    T_5000ms = false;
--- a/FC_InterfaceBoard/Processes.ino
+++ b/FC_InterfaceBoard/Processes.ino
@ -49,7 +49,7 @@ String Prcss_ALL_Read(){
  str += RcvOK;

  str += "INIT?:";
-  sprintf(formattedNumber, "%04X", ((unsigned int)(Init_AO & Init_MC9)));
+  sprintf(formattedNumber, "%04X", ((unsigned int)(Init_AO | Init_MC9)));
  str += formattedNumber;
  str += ',';
  str += RcvOK;
@ -86,44 +86,43 @@ String Prcss_AO_Write(unsigned int data[], int dataSize){
  return str + FIN;
 }

-String Prcss_SV_Write(unsigned int data[], int dataSize){
-  String str = "SV!:";
+String Prcss_SV_Write_1(unsigned int data[], int dataSize){
+  String str = "SV_1!:";

-  msg_MC9_SV_set(data, dataSize);
+  msg_MC9_SV_set_1(data, dataSize);
+  
+  str += RcvOK;
+  Serial.println(str);
+  return str + FIN;
+}
+
+String Prcss_AT_Write_1(unsigned int data[], int dataSize){
+  String str = "AT_1!:";
+
+  msg_MC9_AT_set_1(data, dataSize);

  str += RcvOK;
  return str + FIN;
 }

-String Prcss_AT_Write(unsigned int data[], int dataSize){
-  String str = "AT!:";
+String Prcss_SV_Write_2(unsigned int data[], int dataSize){
+  String str = "SV_2!:";

-  msg_MC9_AT_set(data, dataSize);
+  msg_MC9_SV_set_2(data, dataSize);

  str += RcvOK;
  return str + FIN;
 }
-/*
-String Prcss_AT_Write(bool onOff){
-  String str = "AT!:";
-  String message, cmd;
-  
-  cmd = "10DWR,02,0302,0001,0501,";
-  if(onOff){
-    cmd += "0001";
-  }else{
-    cmd += "0000";
-  }
-  
-  message = cmd;
-  message += sumMC9(message);
-  message = "" + message + CRLF;
-  write_buff_first(Buff_485_Wr, message);
+
+String Prcss_AT_Write_2(unsigned int data[], int dataSize){
+  String str = "AT_2!:";
+
+  msg_MC9_AT_set_2(data, dataSize);

  str += RcvOK;
  return str + FIN;
 }
-*/
+
 String Prcss_RngAO(unsigned int data[], int dataSize){
  String str = "RngAO!:";
  int rng = 0;
@ -142,8 +141,8 @@ String Prcss_RngAO(unsigned int data[], int dataSize){
  return str + FIN;
 }

-String Prcss_ChMC9(unsigned int data[], int dataSize){
-  String str = "ChMC9!:";
+String Prcss_ChMC9_1(unsigned int data[], int dataSize){
+  String str = "ChMC9_1!:";
  int d = 20;
  for(int i=0 ; i<dataSize ; i++){
    setupMC9_1(i, data[i]);
@ -151,4 +150,15 @@ String Prcss_ChMC9(unsigned int data[], int dataSize){
  }
  str += RcvOK;
  return str + FIN;
+}
+
+String Prcss_ChMC9_2(unsigned int data[], int dataSize){
+  String str = "ChMC9_2!:";
+  int d = 20;
+  for(int i=0 ; i<dataSize ; i++){
+    setupMC9_2(i, data[i]);
+    delay(d);
+  }
+  str += RcvOK;
+  return str + FIN;
 }
--- a/FC_InterfaceBoard/RS485.ino
+++ b/FC_InterfaceBoard/RS485.ino
@ -18,13 +18,13 @@ void RS485_setup(){
  digitalWrite(RS485_OE_2, Rcv_485);
 }

-void send_485(){
+void send_485_1(){
  if(!Wait_485_1){
    String message = read_buff(Buff_485_1_Wr);
    if(message != ""){
      
      //save sent message info. for received data processing
-      latest_sent_msg = message;
+      latest_sent_msg_1 = message;

      message += CRLF;
      digitalWrite(RS485_OE_1, Snd_485); delay(5);
@ -39,26 +39,40 @@ void send_485(){
  }
 }

-int recieve_485(){
+void send_485_2(){
+  if(!Wait_485_2){
+    String message = read_buff(Buff_485_2_Wr);
+    if(message != ""){
+      
+      //save sent message info. for received data processing
+      latest_sent_msg_2 = message;
+
+      message += CRLF;
+      digitalWrite(RS485_OE_2, Snd_485); delay(5);
+      Serial2.print(message);
+      returnTime = millis();
+      Serial2.flush();
+      digitalWrite(RS485_OE_2, Rcv_485); delay(5);
+
+      Wait_485_2 = true;
+      Wait_485_2_cnt = 0;
+    }
+  }
+}
+
+int recieve_485_1(){
  // Timeout code
  if(Wait_485_1){
    Wait_485_1_cnt++;
-    if(Wait_485_1_cnt > 25){ // Timeout = periodic(20ms) x 20 = 400 msec
+    if(Wait_485_1_cnt > 40){ // Timeout = periodic(20ms) x 25 = 500 msec
      //Serial.println("485 not responced... (Timeout)");
-      timeoutMC9();
-      //if((latest_sent_msg == MC9_10_PV) ||(latest_sent_msg == MC9_10_SV)){
-
-      /*
-      if((latest_sent_msg == msg_MC9_PV(10)) || (latest_sent_msg == msg_MC9_SV(10))){
-        timeoutMC9();
-      }
-      */
-      latest_sent_msg = "";
+      timeoutMC9_1();
+
+      latest_sent_msg_1 = "";
      Wait_485_1 = false;
      Wait_485_1_cnt = 0;
      numOf485--;
      
-
      return -1;
    }
  }
@ -71,8 +85,8 @@ int recieve_485(){
  String message = read_buff(Buff_485_1_Rd);
  if(message != ""){
    numOf485--;
-    if(latest_sent_msg.indexOf("DRS") != -1){
-      saveMC9(message);
+    if(latest_sent_msg_1.indexOf("DRS") != -1){
+      saveMC9_1(message);
    }
    else{
      Serial.print("----- 485 rcv : ");
@ -85,6 +99,45 @@ int recieve_485(){
  return 0;
 }

+int recieve_485_2(){
+  // Timeout code
+  if(Wait_485_2){
+    Wait_485_2_cnt++;
+    if(Wait_485_2_cnt > 40){ // Timeout = periodic(20ms) x 25 = 500 msec
+      //Serial.println("485 not responced... (Timeout)");
+      timeoutMC9_2();
+
+      latest_sent_msg_2 = "";
+      Wait_485_2 = false;
+      Wait_485_2_cnt = 0;
+      numOf485--;
+      
+      return -1;
+    }
+  }
+  // Receive pv data
+  while(Wait_485_2 && (Serial2.available() > 0)) {
+    char c = Serial2.read();    
+    write_buff_c(Buff_485_2_Rd, c);
+  }
+
+  String message = read_buff(Buff_485_2_Rd);
+  if(message != ""){
+    numOf485--;
+    if(latest_sent_msg_2.indexOf("DRS") != -1){
+      saveMC9_2(message);
+    }
+    else{
+      Serial.print("----- 485 rcv : ");
+      Serial.println(message);
+    }
+    Wait_485_2 = false;
+    Wait_485_2_cnt = 0;
+  }
+
+  return 0;
+}
+
 /* For Test from PC */
 void recieve_485_0(){

@ -102,3 +155,21 @@ void recieve_485_0(){
    IdeSerial = "";
  }
 }
+
+void send_temp(bool F){
+
+    String message = "TEST";
+    if(F) {
+      message += CRLF;
+      message += " with CRLF";
+      message += CRLF;
+    }
+
+    digitalWrite(RS485_OE_1, Snd_485); delay(5);
+    Serial1.print(message);
+    returnTime = millis();
+    Serial1.flush();
+    digitalWrite(RS485_OE_1, Rcv_485); delay(5);
+
+
+}
--- a/Labview/IFB_CMD.vi
+++ b/Labview/IFB_CMD.vi
--- a/Labview/IF_Loop.vi
+++ b/Labview/IF_Loop.vi
--- a/Labview/global_IFB.vi
+++ b/Labview/global_IFB.vi
--- a/Labview/serialTest.vi
+++ b/Labview/serialTest.vi
--- a/PCB/megaPCB/fp-info-cache
+++ b/PCB/megaPCB/fp-info-cache
@ -1,4 +1,4 @@
-37970046450706097
+37988699897139129
 Audio_Module
 Reverb_BTDR-1H
 Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf)
@ -150507,6 +150507,13 @@ rotary encoder
 7
 6
 ScitechKorea
+74HC138
+<b>Small Outline Integrated Circuit</b>
+
+0
+16
+16
+ScitechKorea
 Holder5reg


@ -150521,6 +150528,20 @@ Holder485
 8
 8
 ScitechKorea
+HolderEth
+
+
+0
+10
+0
+ScitechKorea
+HolderEth_1
+
+
+0
+10
+10
+ScitechKorea
 I2C_Socket


@ -150528,6 +150549,20 @@ I2C_Socket
 4
 4
 ScitechKorea
+R250
+Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=7.62mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf
+Resistor Axial_DIN0204 series Axial Horizontal pin pitch 7.62mm 0.167W length 3.6mm diameter 1.6mm
+0
+2
+2
+ScitechKorea
+ScrewHole
+
+
+0
+0
+0
+ScitechKorea
 Terminal_02


@ -150549,12 +150584,33 @@ Terminal_16
 16
 16
 ScitechKorea
+Terminal_24
+
+
+0
+24
+24
+ScitechKorea
 mega_socket


 0
 92
 91
+ScitechKorea
+mega_socket_no_center
+
+
+0
+86
+85
+ScitechKorea
+mega_socket_simplest
+
+
+0
+86
+85
 Sensor
 Aosong_DHT11_5.5x12.0_P2.54mm
 Temperature and humidity module, http://akizukidenshi.com/download/ds/aosong/DHT11.pdf
@ -151017,6 +151073,27 @@ LEM Hall Effect Voltage transducer
 0
 5
 5
+Shocker
+SOIC127P600X175-8N
+D0008A
+Integrated Circuit
+0
+8
+8
+Shocker
+SOP40P640X120-16N
+DGV (R-PDSO-G16)
+Integrated Circuit
+0
+16
+16
+Shocker
+SOP65P640X110-16N
+SOT403-1
+Integrated Circuit
+0
+16
+16
 Socket
 3M_Textool_240-1288-00-0602J_2x20_P2.54mm
 3M 40-pin zero insertion force socket, though-hole, row spacing 25.4 mm (1000 mils)
--- a/PCB/megaPCB/gerber/InterfaceBoard___v2.1.zip
+++ b/PCB/megaPCB/gerber/InterfaceBoard___v2.1.zip
--- a/PCB/megaPCB/megaPCB.kicad_pcb
+++ b/PCB/megaPCB/megaPCB.kicad_pcb
--- a/PCB/megaPCB/megaPCB.kicad_prl
+++ b/PCB/megaPCB/megaPCB.kicad_prl
@ -1,6 +1,6 @@
 {
  "board": {
-    "active_layer": 37,
+    "active_layer": 31,
    "active_layer_preset": "",
    "auto_track_width": true,
    "hidden_netclasses": [],
@ -15,17 +15,17 @@
      "zones": 0.6
    },
    "selection_filter": {
-      "dimensions": false,
-      "footprints": false,
-      "graphics": false,
-      "keepouts": false,
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
      "lockedItems": false,
-      "otherItems": false,
-      "pads": false,
+      "otherItems": true,
+      "pads": true,
      "text": true,
      "tracks": true,
      "vias": true,
-      "zones": false
+      "zones": true
    },
    "visible_items": [
      0,
--- a/PCB/megaPCB/megaPCB.kicad_pro
+++ b/PCB/megaPCB/megaPCB.kicad_pro
@ -34,9 +34,9 @@
        "other_text_thickness": 0.15,
        "other_text_upright": false,
        "pads": {
-          "drill": 0.7,
-          "height": 1.4,
-          "width": 1.4
+          "drill": 3.2,
+          "height": 3.2,
+          "width": 3.2
        },
        "silk_line_width": 0.15,
        "silk_text_italic": false,
@ -439,7 +439,7 @@
    "last_paths": {
      "gencad": "",
      "idf": "",
-      "netlist": "",
+      "netlist": "./",
      "specctra_dsn": "",
      "step": "",
      "vrml": ""
--- a/PCB/megaPCB/megaPCB.kicad_sch
+++ b/PCB/megaPCB/megaPCB.kicad_sch
--- a/test_ENC28J60/test_ENC28J60.ino
+++ b/test_ENC28J60/test_ENC28J60.ino
@ -0,0 +1,97 @@
+/*
+ * Modifed from UIPEthernet EchoServer example.
+ *
+ * UIPEthernet is a TCP/IP stack that can be used with a enc28j60 based
+ * Ethernet-shield.
+ *
+ */
+#define DEBUG 1
+#define MACADDRESS 0x00,0x01,0x02,0x03,0x04,0x05
+#define MYIPADDR 192,168,20,177
+#define MYIPMASK 255,255,255,0
+#define MYDNS 192,168,20,1
+#define MYGW 192,168,20,1
+#define LISTENPORT 5025
+#define UARTBAUD 115200
+
+#include <UIPEthernet.h>
+#include <UIPServer.h>
+#include <UIPClient.h>
+#include "utility/logging.h"
+
+uint8_t mac[6] = {MACADDRESS};
+uint8_t myIP[4] = {MYIPADDR};
+uint8_t myMASK[4] = {MYIPMASK};
+uint8_t myDNS[4] = {MYDNS};
+uint8_t myGW[4] = {MYGW};
+
+EthernetClient client;
+EthernetServer server = EthernetServer(LISTENPORT);
+
+void setup() {
+
+  Serial.begin(9600);
+  Serial.println("Serial Done");
+  Ethernet.begin(mac,myIP,myDNS,myGW,myMASK);
+  // start listening for clients
+  server.begin();
+
+
+    // Report address
+  Serial.print("MAC>>");
+  for (int i = 0; i < 6; i++) {
+    if (mac[i] < 16) {
+      Serial.print("0");
+    }
+    Serial.print(mac[i], HEX);
+    if (i < 5) {
+      Serial.print(":");
+    }
+  }
+  Serial.println();
+  Serial.print("IP >>");
+  Serial.println(Ethernet.localIP());
+}
+
+void loop() {
+  size_t size;
+
+  String message = "";
+  client = server.available();
+
+  if (client){
+
+    Serial.println("Client Connected!!!");
+    while(client.connected()){
+      // Recive Command
+      if((size = client.available()) > 0){
+        uint8_t* msg = (uint8_t*)malloc(size);
+
+        size = client.read(msg,size);
+        for(int i = 0 ; i < size ; i++){
+            message += (char)msg[i];
+        }
+        if(size > 2){
+          if((msg[size-1] == '\n') && (msg[size-2] == '\r')){
+            #if DEBUG
+              Serial.print(size);
+              Serial.println("   >> " + message);
+            #endif
+
+            //cmd = demuxCMD(message, &cmdData);  // for IFB
+            client.print(message);
+            message = "";
+          }
+        }
+        free(msg);
+
+      }
+
+      // Action by Command
+      //if(cmd)
+
+    }
+    Serial.println("Client Disconnected...");
+  }
+}
+
Author	SHA1	Message	Date
Changwoo Park	954d6d6ec0	[v2.1] 외부전원 블럭 추가 (Vin) WatchDog printing	5 months ago
Changwoo Park	fe95dbe67c	AO / MC9 하나만 사용 가능	5 months ago
Changwoo Park	5b16385aa5	[IFB_v2] - ENC28J60 Ethernet 기반 업데이트 - 485 두개 사용할 수 있도록 업데이트 - LabView 라이브러리는 두번째 485 사용함수 미작성 - LabView 의 글로벌 변수 별도 선언	12 months ago
Changwoo Park	2789e42c77	[IFB][ENC28J60] - IFB v2.0 : JLCPCB 주문의 건 - ENC28J60 사용 test code	1 year ago
Changwoo Park	acfcf8e030	[IFB v2] branch	1 year ago