Comm avec chalet fonctionnelle
This commit is contained in:
@@ -87,56 +87,55 @@ extern "C" {
|
||||
#define WIFI_CHP_RST_PIN_DIR TRISEbits.TRISE4
|
||||
#define WIFI_CHP_RST_PIN LATEbits.LATE4
|
||||
|
||||
//Chalet power relay
|
||||
#define POWER_RELAY_ON_PIN_DIR TRISEbits.TRISE7
|
||||
#define POWER_RELAY_ON_PIN LATEbits.LATE7 //X2-
|
||||
#define POWER_RELAY_OFF_PIN_DIR TRISGbits.TRISG9
|
||||
#define POWER_RELAY_OFF_PIN LATGbits.LATG9 //X3-
|
||||
|
||||
//Harakiri relay
|
||||
#define HARAKIRI_RELAY_ON_PIN_DIR TRISDbits.TRISD6
|
||||
#define HARAKIRI_RELAY_ON_PIN LATDbits.LATD6
|
||||
|
||||
//12V presence detection input
|
||||
#define CHALET_12V_PRESENCE_PIN_DIR TRISBbits.TRISB15
|
||||
#define CHALET_12V_PRESENCE_PIN PORTBbits.RB15 //X2-
|
||||
|
||||
//Battery voltage measurement (analog input)
|
||||
#define BATTERY_VOLTAGE_ANALOG_PIN_DIR TRISBbits.TRISB1 //X2-7
|
||||
|
||||
// //Current sensor. Those pins tristate is controlled by the I2C module
|
||||
//#define CURRENT_MODULE_I2C_SCL_PIN_DIR TRISDbits.TRISD3
|
||||
//#define CURRENT_MODULE_I2C_SDA_PIN_DIR TRISDbits.TRISD2
|
||||
|
||||
//Onboard temperature sensor (SPI)
|
||||
#define TEMP_SENSOR_CS_PIN_DIR TRISDbits.TRISD4
|
||||
#define TEMP_SENSOR_CS_PIN LATDbits.LATD4
|
||||
#define TEMP_SENSOR_SPI_SDO_PIN_DIR TRISDbits.TRISD3
|
||||
#define TEMP_SENSOR_SPI_SDI_PIN_DIR TRISDbits.TRISD2
|
||||
#define TEMP_SENSOR_SPI_SCK_PIN_DIR TRISDbits.TRISD1
|
||||
|
||||
|
||||
//Analog (Hall effect) current sensor
|
||||
#define CURRENT_SENSOR_IN1_PIN_DIR TRISBbits.TRISB2
|
||||
#define CURRENT_SENSOR_IN2_PIN_DIR TRISBbits.TRISB0
|
||||
// //Chalet power relay
|
||||
//#define POWER_RELAY_ON_PIN_DIR TRISEbits.TRISE7
|
||||
//#define POWER_RELAY_ON_PIN LATEbits.LATE7 //X2-
|
||||
//#define POWER_RELAY_OFF_PIN_DIR TRISGbits.TRISG9
|
||||
//#define POWER_RELAY_OFF_PIN LATGbits.LATG9 //X3-
|
||||
//
|
||||
// //Harakiri relay
|
||||
//#define HARAKIRI_RELAY_ON_PIN_DIR TRISDbits.TRISD6
|
||||
//#define HARAKIRI_RELAY_ON_PIN LATDbits.LATD6
|
||||
//
|
||||
// //12V presence detection input
|
||||
//#define CHALET_12V_PRESENCE_PIN_DIR TRISBbits.TRISB15
|
||||
//#define CHALET_12V_PRESENCE_PIN PORTBbits.RB15 //X2-
|
||||
//
|
||||
// //Battery voltage measurement (analog input)
|
||||
//#define BATTERY_VOLTAGE_ANALOG_PIN_DIR TRISBbits.TRISB1 //X2-7
|
||||
//
|
||||
// // //Current sensor. Those pins tristate is controlled by the I2C module
|
||||
// //#define CURRENT_MODULE_I2C_SCL_PIN_DIR TRISDbits.TRISD3
|
||||
// //#define CURRENT_MODULE_I2C_SDA_PIN_DIR TRISDbits.TRISD2
|
||||
//
|
||||
// //Onboard temperature sensor (SPI)
|
||||
//#define TEMP_SENSOR_CS_PIN_DIR TRISDbits.TRISD4
|
||||
//#define TEMP_SENSOR_CS_PIN LATDbits.LATD4
|
||||
//#define TEMP_SENSOR_SPI_SDO_PIN_DIR TRISDbits.TRISD3
|
||||
//#define TEMP_SENSOR_SPI_SDI_PIN_DIR TRISDbits.TRISD2
|
||||
//#define TEMP_SENSOR_SPI_SCK_PIN_DIR TRISDbits.TRISD1
|
||||
//
|
||||
//
|
||||
// //Analog (Hall effect) current sensor
|
||||
//#define CURRENT_SENSOR_IN1_PIN_DIR TRISBbits.TRISB2
|
||||
//#define CURRENT_SENSOR_IN2_PIN_DIR TRISBbits.TRISB0
|
||||
|
||||
//LoRa
|
||||
#define LORA_MODULE_RELAY_PIN_DIR TRISDbits.TRISD11
|
||||
#define LORA_MODULE_RELAY_PIN LATDbits.LATD11
|
||||
#define LORA_MODULE_M0_PIN_DIR TRISDbits.TRISD3 //V2
|
||||
#define LORA_MODULE_M0_PIN LATDbits.LATD3
|
||||
#define LORA_MODULE_M1_PIN_DIR TRISDbits.TRISD9
|
||||
#define LORA_MODULE_M1_PIN LATDbits.LATD9
|
||||
|
||||
#define LORA_MODULE_M0_PIN_DIR TRISBbits.TRISB15 //V2
|
||||
#define LORA_MODULE_M0_PIN LATBbits.LATB15
|
||||
#define LORA_MODULE_M1_PIN_DIR TRISBbits.TRISB13
|
||||
#define LORA_MODULE_M1_PIN LATBbits.LATB13
|
||||
#define LORA_MODULE_INT_PIN_DIR TRISDbits.TRISD8
|
||||
#define LORA_MODULE_INT_PIN PORTDbits.RD8
|
||||
//#define LORA_MODULE_RX_LED_PIN_DIR TRISCbits.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.LATC13
|
||||
#define LORA_MODULE_RX_LED_PIN_DIR TRISBbits.TRISB4
|
||||
#define LORA_MODULE_RX_LED_PIN LATBbits.LATB4
|
||||
#define LORA_MODULE_TX_LED_PIN_DIR TRISFbits.TRISF1
|
||||
#define LORA_MODULE_TX_LED_PIN LATFbits.LATF1
|
||||
//#define LORA_MODULE_RX_LED_PIN_DIR TRISBbits.TRISB4
|
||||
//#define LORA_MODULE_RX_LED_PIN LATBbits.LATB4
|
||||
//#define LORA_MODULE_TX_LED_PIN_DIR TRISFbits.TRISF1
|
||||
//#define LORA_MODULE_TX_LED_PIN LATFbits.LATF1
|
||||
|
||||
|
||||
//LCD Screen
|
||||
|
||||
@@ -135,10 +135,10 @@ int InitBoard()
|
||||
//////////////// 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_M0_PIN_DIR = PIN_OUTPUT;
|
||||
LORA_MODULE_M0_PIN = 0;
|
||||
LORA_MODULE_M1_PIN_DIR = PIN_OUTPUT;
|
||||
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;
|
||||
|
||||
@@ -5,8 +5,22 @@
|
||||
#include "timer.h"
|
||||
|
||||
|
||||
int InitE220Module()
|
||||
int InitLoraModule()
|
||||
{
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int SetLoraModuleTxMode()
|
||||
{
|
||||
LORA_MODULE_M0_PIN = 1;
|
||||
LORA_MODULE_M1_PIN = 1;
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int SetLoraModuleConfigMode()
|
||||
{
|
||||
LORA_MODULE_M0_PIN = 0;
|
||||
LORA_MODULE_M1_PIN = 0;
|
||||
return RET_OK;
|
||||
}
|
||||
@@ -9,7 +9,10 @@
|
||||
#define E220_MODULE_H
|
||||
#include "define.h"
|
||||
|
||||
int InitE220Module();
|
||||
int InitLoraModule();
|
||||
|
||||
int SetLoraModuleTxMode();
|
||||
int SetLoraModuleConfigMode();
|
||||
|
||||
|
||||
#endif /* E220_MODULE_H */
|
||||
|
||||
@@ -319,7 +319,6 @@ int SendInternalUartData(char *p_pcDataBuf, int p_iDataSize, int p_iUartPort, ch
|
||||
// KickWatchdog();
|
||||
U2TXREG = *p_stUartDataPtr->pcTxDataPtr++;
|
||||
while(U2STAbits.TRMT == 0);
|
||||
LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
}
|
||||
p_stUartDataPtr->iIsBusy = 0;
|
||||
DataSentNotification(p_stUartDataPtr->iUartHandle,iBufSize);
|
||||
@@ -343,11 +342,11 @@ int SendInternalUartDataBlocking(char *p_pcDataBuf, int p_iDataSize, int p_iUart
|
||||
IEC0bits.U1TXIE = 0;
|
||||
for(i = 0; i < p_iDataSize; i++)
|
||||
{
|
||||
LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
//LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
U1TXREG = *p_pcDataBuf++;
|
||||
while(U1STAbits.TRMT == 0);
|
||||
}
|
||||
LORA_MODULE_TX_LED_PIN = LED_OFF;
|
||||
//LORA_MODULE_TX_LED_PIN = LED_OFF;
|
||||
IFS0bits.U1TXIF = 0;
|
||||
IEC1 = temp;
|
||||
break;
|
||||
@@ -357,11 +356,11 @@ int SendInternalUartDataBlocking(char *p_pcDataBuf, int p_iDataSize, int p_iUart
|
||||
IEC1bits.U2TXIE = 0;
|
||||
for(i = 0; i < p_iDataSize; i++)
|
||||
{
|
||||
LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
//LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
U2TXREG = *p_pcDataBuf++;
|
||||
while(U2STAbits.TRMT == 0);
|
||||
}
|
||||
LORA_MODULE_TX_LED_PIN = LED_OFF;
|
||||
// LORA_MODULE_TX_LED_PIN = LED_OFF;
|
||||
IFS1bits.U2TXIF = 0;
|
||||
IEC1 = temp;
|
||||
|
||||
@@ -436,7 +435,7 @@ void TickInternalUart(void)
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void __ISR(_UART_1_VECTOR, ipl7) InternalUart1AInterrupt(void)
|
||||
void __ISR(_UART_1_VECTOR, ipl7) InternalUart1AInterrupt(void) //Internal UART 1 = port série vers le Network
|
||||
{
|
||||
stInternalUartData *p_acUartDataPtr = &astInternalUartData[INTERNAL_UART_PORT_1];
|
||||
|
||||
@@ -502,7 +501,7 @@ void __ISR(_UART_1_VECTOR, ipl7) InternalUart1AInterrupt(void)
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void __ISR(_UART_2_VECTOR, ipl7) InternalUart2Interrupt(void)
|
||||
void __ISR(_UART_2_VECTOR, ipl7) InternalUart2Interrupt(void) //UART2 = port série vers le module LoRa
|
||||
{
|
||||
stInternalUartData *p_acUartDataPtr = &astInternalUartData[INTERNAL_UART_PORT_2];
|
||||
if(IFS1bits.U2TXIF && IEC1bits.U2TXIE)
|
||||
@@ -521,7 +520,6 @@ void __ISR(_UART_2_VECTOR, ipl7) InternalUart2Interrupt(void)
|
||||
{
|
||||
U2TXREG = *p_acUartDataPtr->pcTxDataPtr++; //send data
|
||||
p_acUartDataPtr->iNbFIFOPendingBytes--;
|
||||
LORA_MODULE_TX_LED_PIN = ~ LORA_MODULE_TX_LED_PIN;
|
||||
}
|
||||
while((U2STAbits.UTXBF == 0) && //while there is space in buffer
|
||||
(p_acUartDataPtr->iNbFIFOPendingBytes != 0)); //and data to send
|
||||
@@ -546,7 +544,6 @@ void __ISR(_UART_2_VECTOR, ipl7) InternalUart2Interrupt(void)
|
||||
{
|
||||
NewByte = U2RXREG;
|
||||
acIntUartRxBuff[INTERNAL_UART_PORT_2][i++] = NewByte;
|
||||
LORA_MODULE_RX_LED_PIN = ~LORA_MODULE_RX_LED_PIN;
|
||||
}
|
||||
UartReceiveData(p_acUartDataPtr->iUartHandle,&acIntUartRxBuff[INTERNAL_UART_PORT_2][0], i);
|
||||
|
||||
|
||||
@@ -3,12 +3,102 @@
|
||||
#include "LoraInterface.h"
|
||||
#include "BoardCfg.h"
|
||||
#include "timer.h"
|
||||
#include "NetworkInterface.h"
|
||||
#include "ProtocolDefs.h"
|
||||
#include "Uart.h"
|
||||
|
||||
|
||||
short mModuleModel;
|
||||
|
||||
|
||||
int InitLoraInterface()
|
||||
{
|
||||
mModuleModel = LORA_MODULE_MODEL;
|
||||
SetLoraModuleTxMode();
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int LoraInterfaceRxData(char Data)
|
||||
{
|
||||
LoraRxStateMachine(Data,LORA_RX_SM_NEW_DATA_EVENT);
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int LoraRxStateMachine(char Data, int Event)
|
||||
{
|
||||
switch(mLoraRxSMState)
|
||||
{
|
||||
case LORA_RX_SM_STANBY_STATE:
|
||||
{
|
||||
switch(Event)
|
||||
{
|
||||
case LORA_RX_SM_NEW_DATA_EVENT:
|
||||
{
|
||||
mLoraModuleBuffer[mBufferIndex++] = Data;
|
||||
mLoraRxSMState = LORA_RX_SM_RECEIVING_STATE;
|
||||
TimerStart(LORA_MODULE_COMM_TIMER,LORA_RX_INTERBYTE_TIMEOUT);
|
||||
break;
|
||||
}
|
||||
case LORA_RX_SM_TICK_EVENT:
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case LORA_RX_SM_RECEIVING_STATE:
|
||||
{
|
||||
switch(Event)
|
||||
{
|
||||
case LORA_RX_SM_NEW_DATA_EVENT:
|
||||
{
|
||||
mLoraModuleBuffer[mBufferIndex++] = Data;
|
||||
TimerStart(LORA_MODULE_COMM_TIMER,LORA_RX_INTERBYTE_TIMEOUT);
|
||||
if(mBufferIndex >= MAX_LORA_BUFFER_SIZE)
|
||||
{
|
||||
//TODO: Manage the exception with the MasterCtrl.
|
||||
LoraResetRxStateMachine();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case LORA_RX_SM_TICK_EVENT:
|
||||
{
|
||||
if(IsTimerExpired(LORA_MODULE_COMM_TIMER))
|
||||
{
|
||||
SendNetworkCommand(LORA_IF_NEW_FRAME_RESPONSE,mLoraModuleBuffer,mBufferIndex);
|
||||
LoraResetRxStateMachine();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
void LoraResetRxStateMachine()
|
||||
{
|
||||
mLoraRxSMState = LORA_RX_SM_STANBY_STATE;
|
||||
mBufferIndex = 0;
|
||||
}
|
||||
|
||||
int LoraInterfaceTransmitLoRaData(char *Payload, unsigned int PayloadSize)
|
||||
{
|
||||
if(mLoraRxSMState != LORA_RX_SM_STANBY_STATE)
|
||||
{
|
||||
//TODO: Manage this...
|
||||
|
||||
// return LORA_IF_RET_BUSY_CHANNEL;
|
||||
}
|
||||
|
||||
SendInternalUartDataBlocking(Payload,PayloadSize,LORA_MODULE_UART_PORT);
|
||||
|
||||
return LORA_IF_RET_OK;
|
||||
}
|
||||
|
||||
void LoraInterfaceTick()
|
||||
{
|
||||
LoraRxStateMachine(0,LORA_RX_SM_TICK_EVENT);
|
||||
}
|
||||
@@ -9,6 +9,14 @@
|
||||
#define LORA_INTERFACE_H
|
||||
#include "define.h"
|
||||
|
||||
#define MAX_LORA_BUFFER_SIZE 2048
|
||||
#define LORA_RX_INTERBYTE_TIMEOUT 200 //ms
|
||||
|
||||
|
||||
int mLoraRxSMState;
|
||||
char mLoraModuleBuffer[MAX_LORA_BUFFER_SIZE];
|
||||
int mBufferIndex;
|
||||
|
||||
enum eLoraModuleModel
|
||||
{
|
||||
LORA_MODULE_E32_MODEL = 32,
|
||||
@@ -18,9 +26,40 @@ enum eLoraModuleModel
|
||||
|
||||
};
|
||||
|
||||
enum eLoraRxSMStates
|
||||
{
|
||||
LORA_RX_SM_STANBY_STATE,
|
||||
LORA_RX_SM_RECEIVING_STATE,
|
||||
|
||||
LORA_RX_SM_MAX_STATE
|
||||
};
|
||||
|
||||
enum eLoraRxSMEvents
|
||||
{
|
||||
LORA_RX_SM_NEW_DATA_EVENT,
|
||||
LORA_RX_SM_TICK_EVENT,
|
||||
|
||||
LORA_RX_SM_MAX_EVENT
|
||||
};
|
||||
|
||||
enum eLoraInterfaceStatusCodes
|
||||
{
|
||||
LORA_IF_RET_OK,
|
||||
LORA_IF_RET_GENERAL_ERROR,
|
||||
LORA_IF_RET_BUSY_CHANNEL,
|
||||
|
||||
LORA_IF_MAX_STATUS_CODE
|
||||
|
||||
};
|
||||
|
||||
#define LORA_MODULE_MODEL LORA_MODULE_E220_MODEL
|
||||
|
||||
int InitLoraInterface();
|
||||
int LoraInterfaceRxData(char Data);
|
||||
int LoraRxStateMachine(char Data, int Event);
|
||||
void LoraResetRxStateMachine();
|
||||
int LoraInterfaceTransmitLoRaData(char *Payload, unsigned int PayloadSize);
|
||||
void LoraInterfaceTick();
|
||||
|
||||
|
||||
#endif /* LORA_MODULE_H */
|
||||
|
||||
@@ -28,10 +28,7 @@ unsigned int mTotalMasterNbRequests = 0;
|
||||
void ExecuteMasterCommand(int Command, unsigned char *Data, int DataSize)
|
||||
{
|
||||
//Whatever was the command, we are online...
|
||||
LORA_MODULE_RX_LED_PIN = LED_OFF;
|
||||
// KickLoraWatchdog();
|
||||
// printf("EXEC\n\n");
|
||||
// ChaletPowerRelayKickTimer();
|
||||
|
||||
mTotalMasterNbRequests++;
|
||||
switch(Command)
|
||||
{
|
||||
@@ -44,6 +41,18 @@ void ExecuteMasterCommand(int Command, unsigned char *Data, int DataSize)
|
||||
}
|
||||
case LORA_IF_SEND_FRAME_REQUEST:
|
||||
{
|
||||
// //First 4 bytes of data are the payload size.
|
||||
// int DataSize = 0;
|
||||
// DataSize = (unsigned int)Data[0];
|
||||
// DataSize <<= 8;
|
||||
// DataSize |= (unsigned int)Data[1];
|
||||
// DataSize <<= 8;
|
||||
// DataSize |= (unsigned int)Data[2];
|
||||
// DataSize <<= 8;
|
||||
// DataSize |= (unsigned int)Data[3];
|
||||
|
||||
LoraInterfaceTransmitLoRaData(Data,DataSize);
|
||||
|
||||
break;
|
||||
}
|
||||
case LORA_IF_GET_MODULE_CONFIG_REQUEST:
|
||||
|
||||
@@ -39,7 +39,8 @@
|
||||
#include "digitalio.h"
|
||||
//#include "DriveProtocol.h"
|
||||
#include "terminal.h"
|
||||
|
||||
#include "NetworkProtocol.h"
|
||||
#include "LoraInterface.h"
|
||||
|
||||
|
||||
/* ************************************************************************** */
|
||||
@@ -97,7 +98,8 @@ void InitUart(void)
|
||||
setbuf(stdout,NULL); //to use printf without \r
|
||||
fflush(stdout);
|
||||
|
||||
UartOpenComPort(NETWORK_UART_PORT,9600,UART_ONE_STOP_BIT,UART_NO_PARITY); //Open console port
|
||||
UartOpenComPort(NETWORK_UART_PORT,9600,UART_ONE_STOP_BIT,UART_NO_PARITY); //Open Network port
|
||||
UartOpenComPort(LORA_MODULE_UART_PORT,9600,UART_ONE_STOP_BIT,UART_NO_PARITY); //Open Lora module port
|
||||
#ifdef USE_PRINTF
|
||||
//UartOpenComPort(CONSOLE_UART_PORT,115200,UART_ONE_STOP_BIT,UART_NO_PARITY); //Open console port
|
||||
|
||||
@@ -480,7 +482,6 @@ int DataSentNotification(int p_iUartHandle,int DataSize)
|
||||
else
|
||||
{
|
||||
astUartData[p_iUartHandle].iDataPending = 0;
|
||||
LORA_MODULE_TX_LED_PIN = LED_OFF;
|
||||
}
|
||||
|
||||
return UART_OK;
|
||||
@@ -596,6 +597,18 @@ int UartTick(void)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case LORA_MODULE_UART_PORT:
|
||||
{
|
||||
//HEARTBEAT_LED_1_TOGGLE_REG = HEARTBEAT_LED_1_TOGGLE_MASK;
|
||||
//UartTransmitData(CONSOLE_UART_PORT, aTempBuffer, iNbPendingData);//echo received character
|
||||
int i = 0;
|
||||
for(i = 0; i< iNbPendingData; i++)
|
||||
{
|
||||
LoraInterfaceRxData(aTempBuffer[i]);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,8 +38,8 @@
|
||||
//
|
||||
enum eUartHandles
|
||||
{
|
||||
UART_1, //(232) Uart 1 - Drive
|
||||
UART_2, //(232) Uart 2 - CU
|
||||
UART_1, //(232)
|
||||
UART_2, //(232)
|
||||
//UART_3, // !!!EXTERNAL!!! SPI daughter board...
|
||||
MAX_UART_HANDLE,
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
|
||||
{
|
||||
//Fwd data to Terminal...
|
||||
recv(TerminalSocket, TerminalRxBuf, sizeof(TerminalRxBuf), 0);
|
||||
RxTerminalBuf(TerminalRxBuf, pstrRecvMsg->s16BufferSize);
|
||||
// RxTerminalBuf(TerminalRxBuf, pstrRecvMsg->s16BufferSize);
|
||||
|
||||
}
|
||||
else if(sock == SyslogSocket)
|
||||
|
||||
@@ -154,11 +154,9 @@ enum eWiFiState
|
||||
|
||||
//Define the com port assignations
|
||||
//----------------------------
|
||||
#define NETWORK_UART_PORT UART_1
|
||||
#define NETWORK_UART_PORT UART_1 //Network
|
||||
|
||||
#ifndef NO_WIFI
|
||||
#define WIFI_MODULE_UART_PORT UART_2
|
||||
#endif
|
||||
#define LORA_MODULE_UART_PORT UART_2 //Module LoRa
|
||||
|
||||
//
|
||||
//----------------------------
|
||||
|
||||
@@ -34,14 +34,15 @@
|
||||
//#include "FatFS/ff.h"
|
||||
#include "main.h"
|
||||
#include "NetworkProtocol.h"
|
||||
#include "ChaletPowerRelay.h"
|
||||
#include "BatteryMonitor.h"
|
||||
#include "CurrentSensor.h"
|
||||
//#include "ChaletPowerRelay.h"
|
||||
//#include "BatteryMonitor.h"
|
||||
//#include "CurrentSensor.h"
|
||||
#include "I2C.h"
|
||||
#include "SPI_Flash.h"
|
||||
#include "TemperatureSensor.h"
|
||||
#include "LoraWatchdog.h"
|
||||
#include "LCDCtrl.h"
|
||||
//#include "TemperatureSensor.h"
|
||||
//#include "LoraWatchdog.h"
|
||||
//#include "LCDCtrl.h"
|
||||
#include "LoraInterface.h"
|
||||
|
||||
#include "BootloaderInterface.h"
|
||||
|
||||
@@ -95,7 +96,7 @@ int main(void)
|
||||
InitWatchdog();
|
||||
// I2CInit();
|
||||
// InitChaletPowerRelay();
|
||||
InitBatteryMonitor();
|
||||
// InitBatteryMonitor();
|
||||
// InitHarakiriRelay();
|
||||
//InitTempSensor();
|
||||
|
||||
@@ -105,6 +106,7 @@ int main(void)
|
||||
// InitLoraWatchdog();
|
||||
|
||||
InitSPIFlash();
|
||||
InitLoraInterface();
|
||||
// InitLCDCtrl();
|
||||
|
||||
|
||||
@@ -146,7 +148,7 @@ int main(void)
|
||||
|
||||
|
||||
#ifndef NO_WIFI
|
||||
InitTerminal();
|
||||
// InitTerminal();
|
||||
|
||||
InitWiFi();
|
||||
|
||||
@@ -199,10 +201,11 @@ int main(void)
|
||||
#ifndef NO_WIFI
|
||||
TickWiFi();
|
||||
#endif
|
||||
TickTerminal();
|
||||
// TickTerminal();
|
||||
UartTick();
|
||||
LoraInterfaceTick();
|
||||
// ChaletPowerRelayTick();
|
||||
BatteryMonitorTick();
|
||||
// BatteryMonitorTick();
|
||||
SyslogTick();
|
||||
// TickTempSensor();
|
||||
BootloaderInterfaceTick();
|
||||
|
||||
@@ -40,17 +40,18 @@
|
||||
typedef enum
|
||||
{
|
||||
HEARTBEAT_LED_TMR = 0,
|
||||
CHALET_POWER_RELAY_COIL_TIMER,
|
||||
// CHALET_POWER_RELAY_COIL_TIMER,
|
||||
SLEEP_FCN_TIMER,
|
||||
BATTERY_MONITOR_TIMER,
|
||||
CHALET_POWER_RELAY_AUTOTURNOFF_TIMER,
|
||||
// BATTERY_MONITOR_TIMER,
|
||||
// CHALET_POWER_RELAY_AUTOTURNOFF_TIMER,
|
||||
WIFI_RECONNECT_TIMER,
|
||||
WIFI_TICK_TIMER,
|
||||
SYSLOG_TX_TIMER,
|
||||
TEMP_SENSOR_REFRESH_TIMER,
|
||||
// TEMP_SENSOR_REFRESH_TIMER,
|
||||
BOOTLOADER_FLASH_POLL_TIMER,
|
||||
LORA_WATCHDOG_TIMER,
|
||||
LCD_CTRL_TIMER,
|
||||
LORA_MODULE_COMM_TIMER,
|
||||
// LORA_WATCHDOG_TIMER,
|
||||
// LCD_CTRL_TIMER,
|
||||
TIMER_MAX_ID
|
||||
}eTimerID;
|
||||
|
||||
|
||||
Binary file not shown.
+4322
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+6465
-7668
File diff suppressed because it is too large
Load Diff
+1637
-2413
File diff suppressed because it is too large
Load Diff
@@ -51,17 +51,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
|
||||
DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
|
||||
|
||||
# Source Files Quoted if spaced
|
||||
SOURCEFILES_QUOTED_IF_SPACED=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.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/BatteryMonitor.c Source/I2C.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/LoraInterface.c Source/NetworkInterface.c
|
||||
SOURCEFILES_QUOTED_IF_SPACED=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.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/I2C.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/LoraInterface.c Source/NetworkInterface.c Source/E220Module.c
|
||||
|
||||
# Object Files Quoted if spaced
|
||||
OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.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/BatteryMonitor.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/LoraInterface.o ${OBJECTDIR}/Source/NetworkInterface.o
|
||||
POSSIBLE_DEPFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o.d ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.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/BatteryMonitor.o.d ${OBJECTDIR}/Source/I2C.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/Syslog.o.d ${OBJECTDIR}/Source/Watchdog.o.d ${OBJECTDIR}/Source/BootloaderInterface.o.d ${OBJECTDIR}/Source/BootloaderProtocol.o.d ${OBJECTDIR}/Source/crc32.o.d ${OBJECTDIR}/Source/LoraInterface.o.d ${OBJECTDIR}/Source/NetworkInterface.o.d
|
||||
OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.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/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/LoraInterface.o ${OBJECTDIR}/Source/NetworkInterface.o ${OBJECTDIR}/Source/E220Module.o
|
||||
POSSIBLE_DEPFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o.d ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o.d ${OBJECTDIR}/Source/DigitalIO.o.d ${OBJECTDIR}/Source/InternalUart.o.d ${OBJECTDIR}/Source/NetworkProtocol.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/I2C.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/Syslog.o.d ${OBJECTDIR}/Source/Watchdog.o.d ${OBJECTDIR}/Source/BootloaderInterface.o.d ${OBJECTDIR}/Source/BootloaderProtocol.o.d ${OBJECTDIR}/Source/crc32.o.d ${OBJECTDIR}/Source/LoraInterface.o.d ${OBJECTDIR}/Source/NetworkInterface.o.d ${OBJECTDIR}/Source/E220Module.o.d
|
||||
|
||||
# Object Files
|
||||
OBJECTFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.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/BatteryMonitor.o ${OBJECTDIR}/Source/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/LoraInterface.o ${OBJECTDIR}/Source/NetworkInterface.o
|
||||
OBJECTFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/InternalUart.o ${OBJECTDIR}/Source/NetworkProtocol.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/I2C.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/LoraInterface.o ${OBJECTDIR}/Source/NetworkInterface.o ${OBJECTDIR}/Source/E220Module.o
|
||||
|
||||
# Source Files
|
||||
SOURCEFILES=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.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/BatteryMonitor.c Source/I2C.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/LoraInterface.c Source/NetworkInterface.c
|
||||
SOURCEFILES=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/InternalUart.c Source/NetworkProtocol.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/I2C.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/LoraInterface.c Source/NetworkInterface.c Source/E220Module.c
|
||||
|
||||
|
||||
|
||||
@@ -215,12 +215,6 @@ ${OBJECTDIR}/Source/NetworkProtocol.o: Source/NetworkProtocol.c .generated_file
|
||||
@${RM} ${OBJECTDIR}/Source/NetworkProtocol.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/NetworkProtocol.o.d" -o ${OBJECTDIR}/Source/NetworkProtocol.o Source/NetworkProtocol.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/Terminal.o: Source/Terminal.c .generated_files/flags/ChaletDuinoV2_795F512H_/babe6d00597039ab54429247213172867aa240bd .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/Terminal.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/Terminal.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/Terminal.o.d" -o ${OBJECTDIR}/Source/Terminal.o Source/Terminal.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/Uart.o: Source/Uart.c .generated_files/flags/ChaletDuinoV2_795F512H_/20fcf7b73e9dcf742a977d908823e2bde4de74f1 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/Uart.o.d
|
||||
@@ -281,12 +275,6 @@ ${OBJECTDIR}/Source/SPI.o: Source/SPI.c .generated_files/flags/ChaletDuinoV2_79
|
||||
@${RM} ${OBJECTDIR}/Source/SPI.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/SPI.o.d" -o ${OBJECTDIR}/Source/SPI.o Source/SPI.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/BatteryMonitor.o: Source/BatteryMonitor.c .generated_files/flags/ChaletDuinoV2_795F512H_/cec1b9ec2b8d20aa5ab741b850be2e2462939fb7 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/BatteryMonitor.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/BatteryMonitor.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/BatteryMonitor.o.d" -o ${OBJECTDIR}/Source/BatteryMonitor.o Source/BatteryMonitor.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/I2C.o: Source/I2C.c .generated_files/flags/ChaletDuinoV2_795F512H_/70acf5f334233a5a3fd41ce782c46cd03caf5937 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/I2C.o.d
|
||||
@@ -341,6 +329,12 @@ ${OBJECTDIR}/Source/NetworkInterface.o: Source/NetworkInterface.c .generated_fi
|
||||
@${RM} ${OBJECTDIR}/Source/NetworkInterface.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/NetworkInterface.o.d" -o ${OBJECTDIR}/Source/NetworkInterface.o Source/NetworkInterface.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/E220Module.o: Source/E220Module.c .generated_files/flags/ChaletDuinoV2_795F512H_/d08380548615c1395a522b0d342c8aade6e1b354 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/E220Module.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/E220Module.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" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/E220Module.o.d" -o ${OBJECTDIR}/Source/E220Module.o Source/E220Module.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
else
|
||||
${OBJECTDIR}/Source/ChaletduinoV2Board.o: Source/ChaletduinoV2Board.c .generated_files/flags/ChaletDuinoV2_795F512H_/50dd7dbc91e4ee60e2b78bba659626ce1f579ac0 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@@ -456,12 +450,6 @@ ${OBJECTDIR}/Source/NetworkProtocol.o: Source/NetworkProtocol.c .generated_file
|
||||
@${RM} ${OBJECTDIR}/Source/NetworkProtocol.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/NetworkProtocol.o.d" -o ${OBJECTDIR}/Source/NetworkProtocol.o Source/NetworkProtocol.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/Terminal.o: Source/Terminal.c .generated_files/flags/ChaletDuinoV2_795F512H_/f839ff36c0a7a18895cb1f117746a72e5eac0f1d .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/Terminal.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/Terminal.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/Terminal.o.d" -o ${OBJECTDIR}/Source/Terminal.o Source/Terminal.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/Uart.o: Source/Uart.c .generated_files/flags/ChaletDuinoV2_795F512H_/77801378a02321a014070c4bbd8810fa5327bb23 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/Uart.o.d
|
||||
@@ -522,12 +510,6 @@ ${OBJECTDIR}/Source/SPI.o: Source/SPI.c .generated_files/flags/ChaletDuinoV2_79
|
||||
@${RM} ${OBJECTDIR}/Source/SPI.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/SPI.o.d" -o ${OBJECTDIR}/Source/SPI.o Source/SPI.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/BatteryMonitor.o: Source/BatteryMonitor.c .generated_files/flags/ChaletDuinoV2_795F512H_/17796590026b7d1ed3ef1bb13eae984c43b31a46 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/BatteryMonitor.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/BatteryMonitor.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/BatteryMonitor.o.d" -o ${OBJECTDIR}/Source/BatteryMonitor.o Source/BatteryMonitor.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/I2C.o: Source/I2C.c .generated_files/flags/ChaletDuinoV2_795F512H_/699b2f186e19673ef2250295c6f4a1cc1865d36f .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/I2C.o.d
|
||||
@@ -582,6 +564,12 @@ ${OBJECTDIR}/Source/NetworkInterface.o: Source/NetworkInterface.c .generated_fi
|
||||
@${RM} ${OBJECTDIR}/Source/NetworkInterface.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/NetworkInterface.o.d" -o ${OBJECTDIR}/Source/NetworkInterface.o Source/NetworkInterface.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
${OBJECTDIR}/Source/E220Module.o: Source/E220Module.c .generated_files/flags/ChaletDuinoV2_795F512H_/9dbfbf30d390cfa1e9bdb544d432e91ab6515ab8 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}/Source"
|
||||
@${RM} ${OBJECTDIR}/Source/E220Module.o.d
|
||||
@${RM} ${OBJECTDIR}/Source/E220Module.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/E220Module.o.d" -o ${OBJECTDIR}/Source/E220Module.o Source/E220Module.c -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD)
|
||||
|
||||
endif
|
||||
|
||||
# ------------------------------------------------------------------------------------
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
#Thu Mar 16 00:13:01 EDT 2023
|
||||
#Tue Mar 21 14:58:27 EDT 2023
|
||||
ChaletDuinoV2_795F512H_.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
|
||||
default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
|
||||
proj.dir=D\:\\Main\\PicDev\\Projets\\LoraInterface\\LoraInterface.X
|
||||
@@ -7,7 +7,7 @@ com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=bcd6e5453a11ce86a
|
||||
ChaletDuinoV2_795F512H_.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
|
||||
default.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
|
||||
default.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
|
||||
configurations-xml=1331778249a0ace91bbd182b44b8caab
|
||||
configurations-xml=13314899052ac1eccd59cdf7d0e045c4
|
||||
ChaletDuino_775F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
|
||||
host.platform=windows
|
||||
ChaletDuinoV2_795F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
|
||||
|
||||
@@ -97,6 +97,7 @@
|
||||
<itemPath>Source/LCDCtrl.h</itemPath>
|
||||
<itemPath>Source/LoraInterface.h</itemPath>
|
||||
<itemPath>Source/NetworkInterface.h</itemPath>
|
||||
<itemPath>Source/E220Module.h</itemPath>
|
||||
</logicalFolder>
|
||||
<logicalFolder name="LinkerScript"
|
||||
displayName="Linker Files"
|
||||
@@ -193,6 +194,7 @@
|
||||
<itemPath>Source/LCDCtrl.c</itemPath>
|
||||
<itemPath>Source/LoraInterface.c</itemPath>
|
||||
<itemPath>Source/NetworkInterface.c</itemPath>
|
||||
<itemPath>Source/E220Module.c</itemPath>
|
||||
</logicalFolder>
|
||||
<logicalFolder name="ExternalFiles"
|
||||
displayName="Important Files"
|
||||
@@ -1317,6 +1319,22 @@
|
||||
<property key="programoptions.uselvpprogramming" value="false"/>
|
||||
<property key="voltagevalue" value="3.25"/>
|
||||
</ICD3PlatformTool>
|
||||
<item path="Source/BatteryMonitor.c" ex="true" overriding="false">
|
||||
<C32>
|
||||
</C32>
|
||||
<C32-AR>
|
||||
</C32-AR>
|
||||
<C32-AS>
|
||||
</C32-AS>
|
||||
<C32-CO>
|
||||
</C32-CO>
|
||||
<C32-LD>
|
||||
</C32-LD>
|
||||
<C32CPP>
|
||||
</C32CPP>
|
||||
<C32Global>
|
||||
</C32Global>
|
||||
</item>
|
||||
<item path="Source/BoardCfg_Chaletduino.h" ex="true" overriding="false">
|
||||
<C32>
|
||||
</C32>
|
||||
@@ -1589,7 +1607,7 @@
|
||||
<C32Global>
|
||||
</C32Global>
|
||||
</item>
|
||||
<item path="Source/Terminal.c" ex="false" overriding="false">
|
||||
<item path="Source/Terminal.c" ex="true" overriding="false">
|
||||
<C32>
|
||||
</C32>
|
||||
<C32-AR>
|
||||
|
||||
Reference in New Issue
Block a user