Dev

ChaletLora.X/Source/BoardCfg_ChaletduinoV2.h

@@ -98,8 +98,8 @@ extern "C" {
 #define HARAKIRI_RELAY_ON_PIN     	LATDbits.LATD6      
     
     //12V presence detection input
-#define CHALET_12V_PRESENCE_PIN_DIR	TRISBbits.TRISD15
+#define CHALET_12V_PRESENCE_PIN_DIR	TRISBbits.TRISB15
-#define CHALET_12V_PRESENCE_PIN  PORTBbits.RD15       //X2-   
+#define CHALET_12V_PRESENCE_PIN  PORTBbits.RB15       //X2-   
     
     //Battery voltage measurement (analog input)
 #define BATTERY_VOLTAGE_ANALOG_PIN_DIR TRISBbits.TRISB1 //X2-7
@@ -122,33 +122,33 @@ extern "C" {
     
     //LoRa
 #define LORA_MODULE_RELAY_PIN_DIR   TRISDbits.TRISD11
-#define LORA_MODULE_RELAY_PIN       LATDbits.TRISD11
+#define LORA_MODULE_RELAY_PIN       LATDbits.LATD11
 #define LORA_MODULE_M0_PIN_DIR   TRISEbits.TRISE7
-#define LORA_MODULE_M0_PIN       LATEDbits.TRISE7
+#define LORA_MODULE_M0_PIN       LATEbits.LATE7
 #define LORA_MODULE_M1_PIN_DIR   TRISDbits.TRISD9
-#define LORA_MODULE_M1_PIN       LATDbits.TRISD9    
+#define LORA_MODULE_M1_PIN       LATDbits.LATD9    
 #define LORA_MODULE_INT_PIN_DIR   TRISDbits.TRISD8
-#define LORA_MODULE_INT_PIN       LATDbits.TRISD8   
+#define LORA_MODULE_INT_PIN       PORTDits.RD8   
 #define LORA_MODULE_RX_LED_PIN_DIR   TRISCbits.TRISC14
-#define LORA_MODULE_RX_LED_PIN       LATCbits.TRISC14  
+#define LORA_MODULE_RX_LED_PIN       LATCbits.LATC14  
 #define LORA_MODULE_TX_LED_PIN_DIR   TRISCbits.TRISC13
-#define LORA_MODULE_TX_LED_PIN       LATCbits.TRISC13
+#define LORA_MODULE_TX_LED_PIN       LATCbits.LATC13
     
     //LCD Screen
 #define LCD_RS_PIN_DIR TRISDbits.TRISD5
-#define LCD_RS_PIN LATDbits.LATSD5
+#define LCD_RS_PIN LATDbits.LATD5
 #define LCD_RW_PIN_DIR TRISBbits.TRISB13
-#define LCD_RW_PIN LATBbits.LATSB13
+#define LCD_RW_PIN LATBbits.LATB13
 #define LCD_E_PIN_DIR TRISBbits.TRISB12
-#define LCD_E_PIN LATBbits.LATSB12
+#define LCD_E_PIN LATBbits.LATB12
 #define LCD_DB4_PIN_DIR TRISBbits.TRISB3
-#define LCD_DB4_PIN LATBbits.LATSB3
+#define LCD_DB4_PIN LATBbits.LATB3
 #define LCD_DB5_PIN_DIR TRISBbits.TRISB9
-#define LCD_DB5_PIN LATBbits.LATSB9
+#define LCD_DB5_PIN LATBbits.LATB9
 #define LCD_DB6_PIN_DIR TRISBbits.TRISB10
-#define LCD_DB6_PIN LATBbits.LATSB10
+#define LCD_DB6_PIN LATBbits.LATB10
 #define LCD_DB7_PIN_DIR TRISBbits.TRISB11
-#define LCD_DB7_PIN LATBbits.LATSB11
+#define LCD_DB7_PIN LATBbits.LATB11
 
 #define LCD_SCROLL_BTN_PIN_DIR TRISCbits.TRISC13
 #define LCD_SCROLL_BTN_PIN PORTCbits.PORTC13

ChaletLora.X/Source/ChaletduinoV2Board.c

@@ -11,10 +11,10 @@ int InitBoard()
     LORA_ACTIVITY_LED_PIN_DIR = PIN_OUTPUT;
     LORA_ACTIVITY_LED_PIN = LED_OFF;
     
-//    GP_DEBUG_1_PIN_DIR = PIN_OUTPUT;
+    //    GP_DEBUG_1_PIN_DIR = PIN_OUTPUT;
-//    GP_DEBUG_1_PIN = 0;
+    //    GP_DEBUG_1_PIN = 0;
-//    GP_DEBUG_2_PIN_DIR = PIN_OUTPUT;
+    //    GP_DEBUG_2_PIN_DIR = PIN_OUTPUT;
-//    GP_DEBUG_2_PIN = 0;
+    //    GP_DEBUG_2_PIN = 0;
     
     
     SPI_SDI_PIN_DIR	= PIN_INPUT;
@@ -22,10 +22,13 @@ int InitBoard()
     SPI_SDO_PIN_DIR = PIN_OUTPUT;
     SPI_SCK_PIN_DIR	= PIN_OUTPUT;
     
+    
+    //////////////// SPI FLASH //////////////////
+    
     FLASH_SS_PIN_DIR = PIN_OUTPUT;
     FLASH_SS_PIN = 1;
     
-    
+    ///////////////////////////  WIFI ///////////////////  
     //Wifi (WINC1500 module)
     WIFI_SPI_SS_PIN_DIR = PIN_OUTPUT;
     WIFI_SPI_SS_PIN = 1;
@@ -37,10 +40,6 @@ int InitBoard()
     WIFI_CHP_RST_PIN_DIR = PIN_OUTPUT;
     WIFI_CHP_RST_PIN = 0;
     
-    //    DOOR_PAD_D0_PIN_DIR = PIN_INPUT;
-    //    DOOR_PAD_D1_PIN_DIR 
-    //    DOOR_PAD_D1_PIN      
-    
     //Wifi chip IRQ
     IEC0bits.INT0IE = 0;
     IFS0bits.INT0IF = 0;
@@ -56,16 +55,19 @@ int InitBoard()
     SPI2CONbits.SMP = 0;
     SPI2CONbits.CKP = 0;
     SPI2BRG = SPICalculateBRG(PERIPHERAL_FREQ, 1000000);
-//  SPI2BRG = SPICalculateBRG(PERIPHERAL_FREQ, 50000);
+    //  SPI2BRG = SPICalculateBRG(PERIPHERAL_FREQ, 50000);
     SPI2CONbits.ON = 1;
     
     
+    //////////////// INVERTER RELAY //////////////////   
     //Chalet inverter power relay
     POWER_RELAY_ON_PIN_DIR = PIN_OUTPUT;
     POWER_RELAY_OFF_PIN_DIR = PIN_OUTPUT;
     POWER_RELAY_ON_PIN = 0;
     POWER_RELAY_OFF_PIN = 0;
     
+    
+    //////////////// HARAKIRI RELAY //////////////////
     //Harakiri relay
     HARAKIRI_RELAY_ON_PIN_DIR = PIN_OUTPUT;
     HARAKIRI_RELAY_ON_PIN= 0;
@@ -73,43 +75,12 @@ int InitBoard()
     //12V presence detection input
     CHALET_12V_PRESENCE_PIN_DIR = PIN_INPUT;
     
+    
+    //////////////// BATTERY MONITOR //////////////////
     //Battery voltage measurement (analog input)
     BATTERY_VOLTAGE_ANALOG_PIN_DIR = PIN_INPUT;
     
-    IEC0bits.INT1IE = 0;
+    //ADC Config
-    IFS0bits.INT1IF = 0;
-    INTCONbits.INT1EP = 1;  //Rising edge
-    IPC1bits.INT1IP = 2;
-    IPC1bits.INT1IS = 1;
-    //    IEC0bits.INT1IE = 1;
-    
-    
-//	OC3CON = 0;
-//	OC3R = 0;
-//	OC3RS = 2000;   //50% PWM
-//	OC3CONbits.OCTSEL = 0;
-//	OC3CONbits.OCM = 0b110;	//PWM mode, no fault protection
-    
-//#ifdef __32MX330F064H__
-//    RPD2Rbits.RPD2R = 0b1011;   //RD2 peripheral selection = OC3
-//#endif
-//	
-//	T2CONbits.TON = 0; // Disable Timer
-//    //	T2CONbits.TCS = 0; // Select internal instruction cycle clock
-//	T2CONbits.TGATE = 0; // Disable Gated Timer mode
-//	T2CONbits.TCKPS = 0b011; // Select 1:1 Prescaler
-//	TMR2 = 0x00; // Clear timer register
-//	
-//
-//	IPC2bits.T2IP = 0x01; // Set Timer 2 Interrupt Priority Level
-//	IFS0bits.T2IF = 0; // Clear Timer 2 Interrupt Flag
-//	IEC0bits.T2IE = 0; // Disable Timer 2 interrupt
-//	T2CONbits.TON = 1; // Start Timer
-//    
-//    OC3CONbits.ON = 1;
-    
-    
-    //ADC test
     
     AD1PCFG = 0xFFFF;	//Sart with I/O pins configured as digital I/O
     AD1PCFGbits.PCFG1 = 0;
@@ -126,5 +97,107 @@ int InitBoard()
     AD1CON1bits.ON = 1;
     AD1CON1bits.SAMP = 1;
     
+    
+    //////////////// TEMPERATURE SENSOR ////////////////// 
+    //Onboard temperature sensor (SPI)
+    TEMP_SENSOR_CS_PIN_DIR = PIN_OUTPUT;
+    TEMP_SENSOR_CS_PIN = 1;
+    TEMP_SENSOR_SPI_SDO_PIN_DIR = PIN_OUTPUT;
+    TEMP_SENSOR_SPI_SDI_PIN_DIR = PIN_INPUT;
+    TEMP_SENSOR_SPI_SCK_PIN_DIR = PIN_OUTPUT;
+    SPI3CON = 0;
+    SPI3CONbits.MSTEN = 1;
+    SPI3CONbits.CKE = 1;
+    SPI3CONbits.SMP = 0;
+    SPI3CONbits.CKP = 0;
+    SPI3BRG = SPICalculateBRG(PERIPHERAL_FREQ, 1000000);
+    //  SPI2BRG = SPICalculateBRG(PERIPHERAL_FREQ, 50000);
+    //SPI3CONbits.ON = 1;
+    
+    //////////////// CURRENT SENSOR ////////////////// 
+    //Analog (Hall effect) current sensor
+    CURRENT_SENSOR_IN1_PIN_DIR = PIN_INPUT;     //AN2
+    CURRENT_SENSOR_IN2_PIN_DIR = PIN_INPUT;     //AN0
+    
+    //TODO
+    //    AD1CHS = 0;
+    //    AD1CHSbits.CH0SA = 1;   //AN2
+    //    AD1CON3bits.ADCS = 0xF0;
+    //    AD1CON3bits.SAMC = 0x01;
+    //    AD1CON1bits.ON = 1;
+    //    AD1CON1bits.SAMP = 1;
+    
+    
+    //////////////// LORA ////////////////// 
+    LORA_MODULE_RELAY_PIN_DIR = PIN_OUTPUT;
+    LORA_MODULE_RELAY_PIN = 0;
+    LORA_MODULE_M0_PIN_DIR = PIN_INPUT;
+    LORA_MODULE_M0_PIN = 0;
+    LORA_MODULE_M1_PIN_DIR = PIN_INPUT;
+    LORA_MODULE_M1_PIN = 0;
+    LORA_MODULE_INT_PIN_DIR = PIN_INPUT;
+    LORA_MODULE_RX_LED_PIN_DIR = PIN_OUTPUT;
+    LORA_MODULE_RX_LED_PIN = LED_OFF;  
+    LORA_MODULE_TX_LED_PIN_DIR = PIN_OUTPUT;
+    LORA_MODULE_TX_LED_PIN = LED_OFF;
+    
+    //////////////// LCD SCREEN ////////////////// 
+    //LCD Screen
+    LCD_RS_PIN_DIR = PIN_OUTPUT;
+    LCD_RS_PIN = 0;
+    LCD_RW_PIN_DIR = PIN_OUTPUT;
+    LCD_RW_PIN = 0;
+    LCD_E_PIN_DIR = PIN_OUTPUT;
+    LCD_E_PIN = 0;
+    LCD_DB4_PIN_DIR = PIN_OUTPUT;
+    LCD_DB4_PIN = 0;
+    LCD_DB5_PIN_DIR = PIN_OUTPUT;
+    LCD_DB5_PIN = 0;
+    LCD_DB6_PIN_DIR = PIN_OUTPUT;
+    LCD_DB6_PIN = 0;
+    LCD_DB7_PIN_DIR = PIN_OUTPUT;
+    LCD_DB7_PIN = 0;
+    
+    LCD_SCROLL_BTN_PIN_DIR = PIN_INPUT;
+    
+    
+    
+    
+    ////// MISC UNUSED STUFF ///////////
+    //    IEC0bits.INT1IE = 0;
+    //    IFS0bits.INT1IF = 0;
+    //    INTCONbits.INT1EP = 1;  //Rising edge
+    //    IPC1bits.INT1IP = 2;
+    //    IPC1bits.INT1IS = 1;
+    //    IEC0bits.INT1IE = 1;
+    
+    
+    //	OC3CON = 0;
+    //	OC3R = 0;
+    //	OC3RS = 2000;   //50% PWM
+    //	OC3CONbits.OCTSEL = 0;
+    //	OC3CONbits.OCM = 0b110;	//PWM mode, no fault protection
+    
+    //#ifdef __32MX330F064H__
+    //    RPD2Rbits.RPD2R = 0b1011;   //RD2 peripheral selection = OC3
+    //#endif
+    //	
+    //	T2CONbits.TON = 0; // Disable Timer
+    //    //	T2CONbits.TCS = 0; // Select internal instruction cycle clock
+    //	T2CONbits.TGATE = 0; // Disable Gated Timer mode
+    //	T2CONbits.TCKPS = 0b011; // Select 1:1 Prescaler
+    //	TMR2 = 0x00; // Clear timer register
+    //	
+    //
+    //	IPC2bits.T2IP = 0x01; // Set Timer 2 Interrupt Priority Level
+    //	IFS0bits.T2IF = 0; // Clear Timer 2 Interrupt Flag
+    //	IEC0bits.T2IE = 0; // Disable Timer 2 interrupt
+    //	T2CONbits.TON = 1; // Start Timer
+    //    
+    //    OC3CONbits.ON = 1;
+    
+    
+    
+    
     return RET_OK;
 }

ChaletLora.X/Source/Syslog.c

@@ -0,0 +1,70 @@
+#include "Syslog.h"
+#include "define.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "terminal.h"
+#include "WiFiCtrl.h"
+#include "timer.h"
+
+#define SYSLOG_BUFFER_SIZE 1024
+char mSyslogBuffer[SYSLOG_BUFFER_SIZE];
+int mSyslogBufPtr;
+
+int InitSyslog()
+{
+	mSyslogBufPtr = 0;
+	memset(mSyslogBuffer,0,SYSLOG_BUFFER_SIZE);
+	
+}
+
+
+void SyslogTick()
+{
+	if(IsSyslogClientConnected() == 0)
+	{
+		mSyslogBufPtr = 0;
+		return;
+	}
+	
+	if(mSyslogBufPtr != 0 && IsTimerExpired(SYSLOG_TX_TIMER) == 1)
+	{
+		SendSyslogData(mSyslogBuffer,mSyslogBufPtr);
+		mSyslogBufPtr = 0;
+	}
+	
+}
+
+int SyslogNewByte(char byte)
+{    
+	if(IsSyslogClientConnected() == 0)
+	{
+		mSyslogBufPtr = 0;
+		return 0;
+	}
+	
+	mSyslogBuffer[mSyslogBufPtr] = byte;
+	mSyslogBufPtr++;
+	
+	if(mSyslogBufPtr == SYSLOG_BUFFER_SIZE)
+	{
+		SendSyslogData(mSyslogBuffer,SYSLOG_BUFFER_SIZE);
+		mSyslogBufPtr = 0;
+	}
+	
+	TimerStart(SYSLOG_TX_TIMER,SYSLOG_TX_TIMEOUT);
+	return 1;
+}
+
+int SyslogNewString(char *string)
+{
+	if(IsSyslogClientConnected() == 0)
+	{
+		mSyslogBufPtr = 0;
+		return 0;
+	}
+	
+	SendSyslogData(string,strlen(string));
+	return 1;
+}
+

ChaletLora.X/Source/Syslog.h

@@ -0,0 +1,13 @@
+#ifndef SYSLOG_H
+#define SYSLOG_H
+
+#define SYSLOG_TX_TIMEOUT 100 //ms
+
+
+int InitSyslog();
+void SyslogTick();
+int SyslogNewByte(char byte);
+int SyslogNewString(char *string);
+
+
+#endif

ChaletLora.X/Source/Watchdog.c

@@ -26,17 +26,17 @@
 /* ************************************************************************** */
 /* Includes */
 #include "define.h"
-#include "watchdog.h"
+#include "Watchdog.h"
-//#include "pastatus.h"
+int WatchdogTriggered = 0;
 
 void InitWatchdog(void)
 {
 	if(RCONbits.WDTO == 1)
 	{
-	//	estPAStatus.WatchdogFlag = 1;
+        WatchdogTriggered = 1;
 		printf("Watchdog was triggered\n");
 	}	
-}	
+ }	
 
 void EnableWatchdog(void)
 {

ChaletLora.X/Source/Watchdog.h

@@ -0,0 +1,37 @@
+/*******************************************************************************
+*                                                                              *
+* Copyright 2010 Rheinmetall Canada Inc.                                  	   *
+*                                                                              *
+* No part of this document may be reproduced, stored in                        *
+* a retrieval system, or transmitted, in any form or by any means,             *
+* electronic, mechanical, photocopying, recording, or otherwise,               *
+* without the prior written permission of Rheinmetall Canada Inc.              *
+*                                                                              *
+*******************************************************************************/
+/*
+	Description:
+	This is a template file for standard C header file.
+
+*/
+
+/* ************************************************************************** */
+/* Revision:
+
+
+### YYYYMMDD Initial, Bug Identification
+	Change description.
+ */
+
+#ifndef WATCHDOG_H
+#define WATCHDOG_H
+
+void InitWatchdog(void);
+void EnableWatchdog(void);
+void DisableWatchdog(void);
+void KickWatchdog(void);
+
+#endif
+
+
+//EOF
+

ChaletLora.X/Source/WiFiCtrl.c

@@ -23,8 +23,10 @@ static SOCKET tcp_client_socket = -1;
 SOCKET TerminalSocket = -1, TerminalServerSocket = -1;
 uint8 TerminalRxBuf[1024];
 
-SOCKET PrintfSocket = -1, PrintfServerSocket = -1;
+#ifdef USE_SYSLOG
-uint8 PrintfRxBuf[1024];
+SOCKET SyslogSocket = -1, SyslogServerSocket = -1;
+uint8 SyslogRxBuf[200]; //Syslog shall not receive much data
+#endif
 
 SOCKET NetworkSocket = -1, NetworkServerSocket = -1;
 uint8 NetworkRxBuf[1024];
@@ -95,9 +97,9 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                     {
                         listen(TerminalServerSocket, 0);
                     }
-                    else if(sock == PrintfServerSocket)
+                    else if(sock == SyslogServerSocket)
                     {
-                        listen(PrintfServerSocket,0);                                
+                        listen(SyslogServerSocket,0);                                
                     }
                     else if(sock == NetworkServerSocket)
                     {
@@ -119,7 +121,10 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                     printf("socket %d listen Failed\n",socket);;
                     break;
                 }
-                m2m_periph_gpio_set_val(M2M_PERIPH_GPIO3,1);
+                if(sock == SyslogServerSocket)
+                {
+                    m2m_periph_gpio_set_val(M2M_PERIPH_GPIO3,1);
+                }
                 
                 break;
             }
@@ -136,14 +141,18 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                         TerminalSocket = pstrAccept->sock;
                         recv(TerminalSocket, TerminalRxBuf, sizeof(TerminalRxBuf), 0);
                         SendTerminalData("Bienvenue au chalet!\nLe chalet parle en anglais comme Mr. Pepin\nIf you need help... type help\n\n",strlen("Bienvenue au chalet!\nLe chalet parle en anglais comme Mr. Pepin\nIf you need help... type help\n\n"));
-                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,1);
+//                        SendSyslogData("Terminal client connected\n",strlen("Terminal client connected\n"));
+						printf("Terminal client connected\n");
+//                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,1);
                     }
-                    else if(sock == PrintfServerSocket)
+                    else if(sock == SyslogServerSocket)
                     {
-                        memset(PrintfRxBuf,0,sizeof(PrintfRxBuf));
+                        memset(SyslogRxBuf,0,sizeof(SyslogRxBuf));
                         // Get the accepted socket.
-                        PrintfSocket = pstrAccept->sock;
+                        SyslogSocket = pstrAccept->sock;
-                        recv(PrintfSocket, PrintfRxBuf, sizeof(PrintfRxBuf), 0);
+                        recv(SyslogSocket, SyslogRxBuf, sizeof(SyslogRxBuf), 0);
+                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,1);
+                        SendSyslogData("Syslog Welcome\n",strlen("Syslog Welcome\n"));
                     }
                     else if(sock == NetworkServerSocket)
                     {
@@ -151,6 +160,7 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                         // Get the accepted socket.
                         NetworkSocket = pstrAccept->sock;
                         recv(NetworkSocket, NetworkRxBuf, sizeof(NetworkRxBuf), 0);
+                        printf("Network client connected\n");
                     }
                     
                 }
@@ -173,10 +183,11 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                         RxTerminalBuf(pstrRecvMsg->pu8Buffer, pstrRecvMsg->s16BufferSize);
                         recv(TerminalSocket, TerminalRxBuf, sizeof(TerminalRxBuf), 0);
                     }
-                    else if(sock == PrintfSocket)
+                    else if(sock == SyslogSocket)
                     {
                         //Fwd data to stdin...
-                        recv(PrintfSocket, PrintfRxBuf, sizeof(PrintfRxBuf), 0);
+                        recv(SyslogSocket, SyslogRxBuf, sizeof(SyslogRxBuf), 0);
+                        //Syslog shall ignore data...
                     }
                     else if(sock == NetworkSocket)
                     {
@@ -190,21 +201,32 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
                     {
                         close(TerminalSocket);
                         TerminalSocket = -1;
-                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,0);
+//                        SendSyslogData("Terminal client disconnected\n",strlen("Terminal client disconnected\n"));
+						printf("Terminal client disconnected\n");
+//                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,0);
                     }
-                    else if(sock == PrintfSocket)
+                    else if(sock == SyslogSocket)
                     {
-                        close(PrintfSocket);
+                        close(SyslogSocket);
-                        PrintfSocket = -1;
+                        SyslogSocket = -1;
+                        m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,0);
                     }
                     else if(sock == NetworkSocket)
                     {
                         close(NetworkSocket);
                         NetworkSocket = -1;
+                        printf("Network client disconnected\n");
                     }
                 }
                 break;
             }
+            case SOCKET_MSG_SEND:
+            {
+               if(sock == SyslogSocket)
+               {
+                   
+               } 
+            }
         }
     }
     
@@ -411,6 +433,24 @@ int CloseSockets()
 {
     gbTcpConnection = false;
     close(TerminalServerSocket);
+    if(TerminalSocket != -1)
+    {
+        close(TerminalSocket);
+    }
+    
+    close(NetworkServerSocket);
+    if(NetworkSocket != -1)
+    {
+        close(NetworkSocket);
+    }
+    
+#ifdef USE_SYSLOG
+    close(SyslogServerSocket);
+    if(SyslogSocket != -1)
+    {
+        close(SyslogSocket);
+    }
+#endif
 }
 
 
@@ -447,8 +487,8 @@ void TickWiFi()
         
         OpenTerminalServer();
         OpenNetworkServer();
-#ifdef USE_WIFI_PRINTF
+#ifdef USE_SYSLOG
-        OpenPrintfServer();
+        OpenSyslogServer();
 #endif
         gbTcpConnection = true;
     }
@@ -499,11 +539,11 @@ int OpenNetworkServer()
     struct sockaddr_in strAddr;
     
     NetworkServerSocket = socket(AF_INET, SOCK_STREAM,0);
-    uint16 TerminalPort = NETWORK_SERVER_PORT;
+    uint16 ServerPort = NETWORK_SERVER_PORT;
     if(NetworkServerSocket >= 0)
     {
         strAddr.sin_family = AF_INET;
-        strAddr.sin_port = _htons(TerminalPort);
+        strAddr.sin_port = _htons(ServerPort);
         strAddr.sin_addr.s_addr = 0;
         
         bind(NetworkServerSocket, (struct sockaddr*)&strAddr, sizeof(struct sockaddr_in));
@@ -532,20 +572,20 @@ void SentNetworkByte(uint8 data)
 }
 
 //Printf Server Implementation
-#ifdef USE_WIFI_PRINTF
+#ifdef USE_SYSLOG
-int OpenPrintfServer()
+int OpenSyslogServer()
 {
     struct sockaddr_in strAddr;
     
-    PrintfServerSocket = socket(AF_INET, SOCK_STREAM,0);
+    SyslogServerSocket = socket(AF_INET, SOCK_STREAM,0);
-    uint16 TerminalPort = 5589;
+    uint16 ServerPort = SYSLOG_SERVER_PORT;
-    if(PrintfServerSocket >= 0)
+    if(SyslogServerSocket >= 0)
     {
         strAddr.sin_family = AF_INET;
-        strAddr.sin_port = _htons(TerminalPort);
+        strAddr.sin_port = _htons(ServerPort);
         strAddr.sin_addr.s_addr = 0;
         
-        bind(PrintfServerSocket, (struct sockaddr*)&strAddr, sizeof(struct sockaddr_in));
+        bind(SyslogServerSocket, (struct sockaddr*)&strAddr, sizeof(struct sockaddr_in));
         return RET_OK;
     }
     else
@@ -553,20 +593,30 @@ int OpenPrintfServer()
         return RET_ERROR;
     }
 }
-void SendPrintfData(uint8 *data, int size)
+void SendSyslogData(uint8 *data, int size)
 {
-    if(PrintfSocket != -1);
+    if(SyslogSocket != -1);
     {
-        send(PrintfSocket,data,size,0);
+        send(SyslogSocket,data,size,0);
-        recv(PrintfSocket,TerminalRxBuf,sizeof(TerminalRxBuf),0); 
+        recv(SyslogSocket,SyslogRxBuf,sizeof(SyslogRxBuf),0); 
     }
 }
-void SendPrintfByte(uint8 data)
+void SendSyslogByte(uint8 data)
 {
-    if(PrintfSocket != -1)
+    if(SyslogSocket != -1)
     {
-        send(PrintfSocket,&data,1,0);
+        send(SyslogSocket,&data,1,0);
-        recv(PrintfSocket,TerminalRxBuf,sizeof(TerminalRxBuf),0);
+        recv(SyslogSocket,SyslogRxBuf,sizeof(SyslogRxBuf),0);
     }
 }
+
+int IsSyslogClientConnected()
+{
+    if(SyslogSocket == -1)
+    {
+        return 0;
+    }
+    
+    return 1;
+}
 #endif

ChaletLora.X/Source/WiFiCtrl.h

@@ -26,9 +26,10 @@ int OpenNetworkServer();
 void SendNetworkData(uint8 *data, int size);
 void SentNetworkByte(uint8 data);
 
-int OpenPrintfServer();
+int OpenSyslogServer();
-void SendPrintfData(uint8 *data, int size);
+void SendSyslogData(uint8 *data, int size);
-void SendPrintfByte(uint8 data);
+void SendSyslogByte(uint8 data);
+int IsSyslogClientConnected();
 
 #define USE_STATIC_IP
 
@@ -102,6 +103,7 @@ void SendPrintfByte(uint8 data);
 
 #define TERMINAL_SERVER_PORT 85
 #define NETWORK_SERVER_PORT 86
+#define SYSLOG_SERVER_PORT 87
 
 #define AUTH_CREDENTIALS {M2M_802_1X_USR_NAME, M2M_802_1X_PWD }
 

ChaletLora.X/Source/define.h

@@ -147,8 +147,6 @@ enum eWiFiState
 //#define POLL_UART1_RX
 #define POLL_UART2_RX
 
-// Uncomment next #define for testing with ICCA board
-// #define USE_ICCA_CU_PA_UART_SNOOPING
 
 //#define NO_WIFI
 
@@ -162,22 +160,42 @@ enum eWiFiState
 
 //
 //----------------------------
+//Enable only one of those 3 options
 //#define USE_BLOCKING_PRINTF
-#define USE_PRINTF
+//#define USE_UART_PRINTF
+#define USE_SYSLOG
 
+#ifdef USE_UART_PRINTF 
+#ifdef USE_SYSLOG
+#error "USE_UART_PRINTF and USE_SYSLOG defined simultaneously"
+#endif
+#endif
+//#error test
 
-#ifdef USE_PRINTF
+#ifdef USE_SYSLOG
+#ifdef NO_WIFI
+#undef USE_SYSLOG
+#error "USE_SYSLOG defined with NO_WIFI"
+#endif
+#endif
+
+#ifdef USE_UART_PRINTF
 	#define PRINTF(n, a...)  printf(n, ## a)
+#elif defined USE_SYSLOG
+    #define PRINTF(n, a...)  printf(n, ## a)
+#else
+    #define PRINTF(n, a...)
+#endif
 
 #ifndef NO_WIFI
   //  #define USE_WIFI_PRINTF
 #endif
 
     //#define USE_UART_PRINTF
-#else
+//#else
-	#define PRINTF(n, a...)
+//	
-	#define NO_EXTERNAL_UART
+//	#define NO_EXTERNAL_UART
-#endif
+//#endif
 
 //#define CONNECT_DEVICE_TO_NETWORK
 //#define TERMINAL_USE_TELNET

ChaletLora.X/Source/main.c

@@ -20,6 +20,7 @@
 #include "Uart.h"
 #include "BoardCfg.h"
 #include "timer.h"
+#include "Watchdog.h"
 //#include "PWMCtrl.h"
 //#include "KnobEncoderCtrl.h"
 //#include "LedLightCtrl.h"
@@ -45,6 +46,9 @@
 
 #ifdef USE_PRINTF
     void _mon_putc(char c);	//override from stdio to redirect stdout on uart 3B
+#elif defined USE_SYSLOG
+    #include "Syslog.h"
+    void _mon_putc(char c);	//override from stdio to redirect stdout on uart 3B
 #endif
 
 #define HEARTBEAT_LED_TIMEOUT 400
@@ -52,7 +56,7 @@
 
 static void InitializeBoard(void);
 
-#pragma config FPLLMUL = MUL_20, FPLLIDIV = DIV_2, FPLLODIV = DIV_1, FWDTEN = OFF, WDTPS = PS128
+#pragma config FPLLMUL = MUL_20, FPLLIDIV = DIV_2, FPLLODIV = DIV_1, FWDTEN = OFF, WDTPS = PS4096   //Watchdog timeout = 4,096s
 #pragma config POSCMOD = EC, FNOSC = PRIPLL, FPBDIV = DIV_1
 //#pragma config POSCMOD = XT, FNOSC = PRIPLL, FPBDIV = DIV_1
 #pragma config ICESEL = ICS_PGx2, BWP = OFF
@@ -75,9 +79,11 @@ int main(void)
     INTEnableInterrupts();
     
     TimerInit();
+    InitWatchdog();
    // I2CInit();
     InitChaletPowerRelay();
     InitBatteryMonitor();
+    InitHarakiriRelay();
     
     InitUart();
     ProtocolInit();
@@ -128,17 +134,17 @@ int main(void)
 
 
 //	printf("Lora Monitor Started\n");
+    printf("test %d\n", 1);
     
-//	EnableWatchdog();
+	EnableWatchdog();
+    KickWatchdog();
     mRetCode = 1;
-//    unsigned int LoraData = 0;
- //   float raw,conv;
    
- //   AD1CON1bits.SAMP = 1;
 	while(mRetCode == 1)
 	{
-        //	mRetCode = RunPA();
+
-        //       UartTick();
+        KickWatchdog();        
+        
 #ifndef NO_WIFI
         TickWiFi();
 #endif        
@@ -146,32 +152,12 @@ int main(void)
         UartTick();
         ChaletPowerRelayTick();
         BatteryMonitorTick();
-        
+		SyslogTick();
-
-        
-
 
         if(IsTimerExpired(HEARTBEAT_LED_TMR))
         {
             HEARTBEAT_LED_1_PIN = ~HEARTBEAT_LED_1_PIN;
             TimerStart(HEARTBEAT_LED_TMR,HEARTBEAT_LED_TIMEOUT);
-            
-
-            
-//            AD1CON1bits.SAMP = 0;
-//            while(AD1CON1bits.DONE == 0);
-//            adc = ADC1BUF0;
-//            AD1CON1bits.SAMP = 1;
-//            adc &= 0xFFFE;
-//            conv = (float)adc / 1023;
-//            conv *= 3.3;
-//            raw = conv;
-//            conv *= 11;
-//            conv += 0.2;
-            
-            
-//            printf("Value: 0x%x - %f - %f\n",adc,raw,conv);
-            
         }
 	}
 	
@@ -191,6 +177,12 @@ void _mon_putc(char c)
     U2TXREG = c;
     while (U2STAbits.TRMT==0);
 }
+#elif defined USE_SYSLOG
+void _mon_putc(char c)
+{
+    SyslogNewByte(c);
+}
+
 #endif
 
 //EOF

ChaletLora.X/Source/timer.h

@@ -46,6 +46,7 @@ typedef enum
     CHALET_POWER_RELAY_AUTOTURNOFF_TIMER,
     WIFI_RECONNECT_TIMER,
     WIFI_TICK_TIMER,
+    SYSLOG_TX_TIMER,
 	TIMER_MAX_ID
 }eTimerID;
 

ChaletLora.X/nbproject/Makefile-ChaletDuinoV2_775F512H_.mk

@@ -57,17 +57,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=Source/winc3400/bsp/source/nm_bsp.c Source/winc3400/bus_wrapper/source/nm_bus_wrapper.c Source/winc3400/common/source/nm_common.c Source/winc3400/driver/source/m2m_ate_mode.c Source/winc3400/driver/source/m2m_crypto.c Source/winc3400/driver/source/m2m_hif.c Source/winc3400/driver/source/m2m_ota.c Source/winc3400/driver/source/m2m_periph.c Source/winc3400/driver/source/m2m_ssl.c Source/winc3400/driver/source/m2m_wifi.c Source/winc3400/driver/source/nmasic.c Source/winc3400/driver/source/nmbus.c Source/winc3400/driver/source/nmdrv.c Source/winc3400/driver/source/nmi2c.c Source/winc3400/driver/source/nmspi.c Source/winc3400/driver/source/nmuart.c Source/winc3400/socket/source/socket.c Source/winc3400/spi_flash/source/spi_flash.c Source/winc3400/winc_init.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.c Source/Terminal.c Source/Uart.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/LoraNetworkInterface.c Source/ChaletPowerRelay.c Source/HarakiriRelay.c Source/BatteryMonitor.c Source/ina219.c Source/I2C.c Source/SPI_Flash.c Source/ChaletduinoV2Board.c
+SOURCEFILES_QUOTED_IF_SPACED=Source/winc3400/bsp/source/nm_bsp.c Source/winc3400/bus_wrapper/source/nm_bus_wrapper.c Source/winc3400/common/source/nm_common.c Source/winc3400/driver/source/m2m_ate_mode.c Source/winc3400/driver/source/m2m_crypto.c Source/winc3400/driver/source/m2m_hif.c Source/winc3400/driver/source/m2m_ota.c Source/winc3400/driver/source/m2m_periph.c Source/winc3400/driver/source/m2m_ssl.c Source/winc3400/driver/source/m2m_wifi.c Source/winc3400/driver/source/nmasic.c Source/winc3400/driver/source/nmbus.c Source/winc3400/driver/source/nmdrv.c Source/winc3400/driver/source/nmi2c.c Source/winc3400/driver/source/nmspi.c Source/winc3400/driver/source/nmuart.c Source/winc3400/socket/source/socket.c Source/winc3400/spi_flash/source/spi_flash.c Source/winc3400/winc_init.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.c Source/Terminal.c Source/Uart.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/LoraNetworkInterface.c Source/ChaletPowerRelay.c Source/HarakiriRelay.c Source/BatteryMonitor.c Source/ina219.c Source/I2C.c Source/SPI_Flash.c Source/ChaletduinoV2Board.c Source/Syslog.c Source/Watchdog.c
 
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o ${OBJECTDIR}/Source/winc3400/socket/source/socket.o ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/winc3400/winc_init.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Uart.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/LoraNetworkInterface.o ${OBJECTDIR}/Source/ChaletPowerRelay.o ${OBJECTDIR}/Source/HarakiriRelay.o ${OBJECTDIR}/Source/BatteryMonitor.o ${OBJECTDIR}/Source/ina219.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/ChaletduinoV2Board.o
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o ${OBJECTDIR}/Source/winc3400/socket/source/socket.o ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/winc3400/winc_init.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Uart.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/LoraNetworkInterface.o ${OBJECTDIR}/Source/ChaletPowerRelay.o ${OBJECTDIR}/Source/HarakiriRelay.o ${OBJECTDIR}/Source/BatteryMonitor.o ${OBJECTDIR}/Source/ina219.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o.d ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o.d ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o.d ${OBJECTDIR}/Source/winc3400/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o.d ${OBJECTDIR}/Source/winc3400/winc_init.o.d ${OBJECTDIR}/Source/DigitalIO.o.d ${OBJECTDIR}/Source/InternalUart.o.d ${OBJECTDIR}/Source/NetworkProtocol.o.d ${OBJECTDIR}/Source/Terminal.o.d ${OBJECTDIR}/Source/Uart.o.d ${OBJECTDIR}/Source/Util.o.d ${OBJECTDIR}/Source/exceptions.o.d ${OBJECTDIR}/Source/interrupts.o.d ${OBJECTDIR}/Source/main.o.d ${OBJECTDIR}/Source/system.o.d ${OBJECTDIR}/Source/template.o.d ${OBJECTDIR}/Source/timer.o.d ${OBJECTDIR}/Source/WiFiCtrl.o.d ${OBJECTDIR}/Source/SPI.o.d ${OBJECTDIR}/Source/LoraNetworkInterface.o.d ${OBJECTDIR}/Source/ChaletPowerRelay.o.d ${OBJECTDIR}/Source/HarakiriRelay.o.d ${OBJECTDIR}/Source/BatteryMonitor.o.d ${OBJECTDIR}/Source/ina219.o.d ${OBJECTDIR}/Source/I2C.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/ChaletduinoV2Board.o.d
+POSSIBLE_DEPFILES=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o.d ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o.d ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o.d ${OBJECTDIR}/Source/winc3400/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o.d ${OBJECTDIR}/Source/winc3400/winc_init.o.d ${OBJECTDIR}/Source/DigitalIO.o.d ${OBJECTDIR}/Source/InternalUart.o.d ${OBJECTDIR}/Source/NetworkProtocol.o.d ${OBJECTDIR}/Source/Terminal.o.d ${OBJECTDIR}/Source/Uart.o.d ${OBJECTDIR}/Source/Util.o.d ${OBJECTDIR}/Source/exceptions.o.d ${OBJECTDIR}/Source/interrupts.o.d ${OBJECTDIR}/Source/main.o.d ${OBJECTDIR}/Source/system.o.d ${OBJECTDIR}/Source/template.o.d ${OBJECTDIR}/Source/timer.o.d ${OBJECTDIR}/Source/WiFiCtrl.o.d ${OBJECTDIR}/Source/SPI.o.d ${OBJECTDIR}/Source/LoraNetworkInterface.o.d ${OBJECTDIR}/Source/ChaletPowerRelay.o.d ${OBJECTDIR}/Source/HarakiriRelay.o.d ${OBJECTDIR}/Source/BatteryMonitor.o.d ${OBJECTDIR}/Source/ina219.o.d ${OBJECTDIR}/Source/I2C.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/ChaletduinoV2Board.o.d ${OBJECTDIR}/Source/Syslog.o.d ${OBJECTDIR}/Source/Watchdog.o.d
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o ${OBJECTDIR}/Source/winc3400/socket/source/socket.o ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/winc3400/winc_init.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Uart.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/LoraNetworkInterface.o ${OBJECTDIR}/Source/ChaletPowerRelay.o ${OBJECTDIR}/Source/HarakiriRelay.o ${OBJECTDIR}/Source/BatteryMonitor.o ${OBJECTDIR}/Source/ina219.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/ChaletduinoV2Board.o
+OBJECTFILES=${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o ${OBJECTDIR}/Source/winc3400/bus_wrapper/source/nm_bus_wrapper.o ${OBJECTDIR}/Source/winc3400/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ate_mode.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_crypto.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400/driver/source/nmi2c.o ${OBJECTDIR}/Source/winc3400/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400/driver/source/nmuart.o ${OBJECTDIR}/Source/winc3400/socket/source/socket.o ${OBJECTDIR}/Source/winc3400/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/winc3400/winc_init.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Uart.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/LoraNetworkInterface.o ${OBJECTDIR}/Source/ChaletPowerRelay.o ${OBJECTDIR}/Source/HarakiriRelay.o ${OBJECTDIR}/Source/BatteryMonitor.o ${OBJECTDIR}/Source/ina219.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o
 
 # Source Files
-SOURCEFILES=Source/winc3400/bsp/source/nm_bsp.c Source/winc3400/bus_wrapper/source/nm_bus_wrapper.c Source/winc3400/common/source/nm_common.c Source/winc3400/driver/source/m2m_ate_mode.c Source/winc3400/driver/source/m2m_crypto.c Source/winc3400/driver/source/m2m_hif.c Source/winc3400/driver/source/m2m_ota.c Source/winc3400/driver/source/m2m_periph.c Source/winc3400/driver/source/m2m_ssl.c Source/winc3400/driver/source/m2m_wifi.c Source/winc3400/driver/source/nmasic.c Source/winc3400/driver/source/nmbus.c Source/winc3400/driver/source/nmdrv.c Source/winc3400/driver/source/nmi2c.c Source/winc3400/driver/source/nmspi.c Source/winc3400/driver/source/nmuart.c Source/winc3400/socket/source/socket.c Source/winc3400/spi_flash/source/spi_flash.c Source/winc3400/winc_init.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.c Source/Terminal.c Source/Uart.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/LoraNetworkInterface.c Source/ChaletPowerRelay.c Source/HarakiriRelay.c Source/BatteryMonitor.c Source/ina219.c Source/I2C.c Source/SPI_Flash.c Source/ChaletduinoV2Board.c
+SOURCEFILES=Source/winc3400/bsp/source/nm_bsp.c Source/winc3400/bus_wrapper/source/nm_bus_wrapper.c Source/winc3400/common/source/nm_common.c Source/winc3400/driver/source/m2m_ate_mode.c Source/winc3400/driver/source/m2m_crypto.c Source/winc3400/driver/source/m2m_hif.c Source/winc3400/driver/source/m2m_ota.c Source/winc3400/driver/source/m2m_periph.c Source/winc3400/driver/source/m2m_ssl.c Source/winc3400/driver/source/m2m_wifi.c Source/winc3400/driver/source/nmasic.c Source/winc3400/driver/source/nmbus.c Source/winc3400/driver/source/nmdrv.c Source/winc3400/driver/source/nmi2c.c Source/winc3400/driver/source/nmspi.c Source/winc3400/driver/source/nmuart.c Source/winc3400/socket/source/socket.c Source/winc3400/spi_flash/source/spi_flash.c Source/winc3400/winc_init.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.c Source/Terminal.c Source/Uart.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/LoraNetworkInterface.c Source/ChaletPowerRelay.c Source/HarakiriRelay.c Source/BatteryMonitor.c Source/ina219.c Source/I2C.c Source/SPI_Flash.c Source/ChaletduinoV2Board.c Source/Syslog.c Source/Watchdog.c
 
 
 
@@ -394,6 +394,20 @@ ${OBJECTDIR}/Source/ChaletduinoV2Board.o: Source/ChaletduinoV2Board.c  nbproject
 	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/ChaletduinoV2Board.o.d" -o ${OBJECTDIR}/Source/ChaletduinoV2Board.o Source/ChaletduinoV2Board.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
 	@${FIXDEPS} "${OBJECTDIR}/Source/ChaletduinoV2Board.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
 	
+${OBJECTDIR}/Source/Syslog.o: Source/Syslog.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/Syslog.o.d 
+	@${RM} ${OBJECTDIR}/Source/Syslog.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/Syslog.o.d" -o ${OBJECTDIR}/Source/Syslog.o Source/Syslog.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	@${FIXDEPS} "${OBJECTDIR}/Source/Syslog.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
+	
+${OBJECTDIR}/Source/Watchdog.o: Source/Watchdog.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/Watchdog.o.d 
+	@${RM} ${OBJECTDIR}/Source/Watchdog.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/Watchdog.o.d" -o ${OBJECTDIR}/Source/Watchdog.o Source/Watchdog.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	@${FIXDEPS} "${OBJECTDIR}/Source/Watchdog.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
+	
 else
 ${OBJECTDIR}/Source/winc3400/bsp/source/nm_bsp.o: Source/winc3400/bsp/source/nm_bsp.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}/Source/winc3400/bsp/source" 
@@ -682,6 +696,20 @@ ${OBJECTDIR}/Source/ChaletduinoV2Board.o: Source/ChaletduinoV2Board.c  nbproject
 	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/ChaletduinoV2Board.o.d" -o ${OBJECTDIR}/Source/ChaletduinoV2Board.o Source/ChaletduinoV2Board.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
 	@${FIXDEPS} "${OBJECTDIR}/Source/ChaletduinoV2Board.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
 	
+${OBJECTDIR}/Source/Syslog.o: Source/Syslog.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/Syslog.o.d 
+	@${RM} ${OBJECTDIR}/Source/Syslog.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/Syslog.o.d" -o ${OBJECTDIR}/Source/Syslog.o Source/Syslog.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	@${FIXDEPS} "${OBJECTDIR}/Source/Syslog.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
+	
+${OBJECTDIR}/Source/Watchdog.o: Source/Watchdog.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/Watchdog.o.d 
+	@${RM} ${OBJECTDIR}/Source/Watchdog.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source/winc3400" -I"Source" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/Source/Watchdog.o.d" -o ${OBJECTDIR}/Source/Watchdog.o Source/Watchdog.c    -DXPRJ_ChaletDuinoV2_775F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	@${FIXDEPS} "${OBJECTDIR}/Source/Watchdog.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ 
+	
 endif
 
 # ------------------------------------------------------------------------------------

ChaletLora.X/nbproject/Makefile-genesis.properties

@@ -1,5 +1,5 @@
 #
-#Sat May 22 15:49:00 EDT 2021
+#Sun May 23 13:54:36 EDT 2021
 default.languagetoolchain.version=2.41
 ChaletDuino_775F512H_.languagetoolchain.version=1.33
 default.Pack.dfplocation=C\:\\Users\\JF\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.2.228
@@ -7,7 +7,7 @@ ChaletDuinoV2_775F512H_.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageTool
 conf.ids=default,ChaletDuino_775F512H_,ChaletDuinoV2_775F512H_
 default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v2.41\\bin
 ChaletDuino_775F512H_.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.40\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
-configurations-xml=4d13a0ee9e6aa9ebe3a2e1b14c2f7ecf
+configurations-xml=2a01bf653fdb7018185d7d8721dab7b8
 default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=a5745c99cb5a5032f17cfaf0ff720282
 ChaletDuinoV2_775F512H_.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.40\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=9db8f8a224aa17d0023ea7f468f871dc

ChaletLora.X/nbproject/configurations.xml

@@ -102,6 +102,8 @@
       <itemPath>Source/I2C.h</itemPath>
       <itemPath>Source/winc3400_config.h</itemPath>
       <itemPath>Source/SPI_Flash.h</itemPath>
+      <itemPath>Source/Syslog.h</itemPath>
+      <itemPath>Source/Watchdog.h</itemPath>
     </logicalFolder>
     <logicalFolder name="LinkerScript"
                    displayName="Linker Files"
@@ -201,6 +203,8 @@
       <itemPath>Source/ina219.c</itemPath>
       <itemPath>Source/I2C.c</itemPath>
       <itemPath>Source/SPI_Flash.c</itemPath>
+      <itemPath>Source/Syslog.c</itemPath>
+      <itemPath>Source/Watchdog.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -1147,6 +1151,7 @@
         <property key="UART6" value="true"/>
         <property key="USB" value="true"/>
         <property key="debugoptions.useswbreakpoints" value="true"/>
+        <property key="firmware.download.all" value="false"/>
         <property key="hwtoolclock.frcindebug" value="false"/>
         <property key="memories.aux" value="false"/>
         <property key="memories.bootflash" value="false"/>