diff --git a/solar_panel.X/crc.c b/solar_panel.X/crc.c new file mode 100644 index 0000000..c43755b --- /dev/null +++ b/solar_panel.X/crc.c @@ -0,0 +1,60 @@ +/** + * \source indirect : http://stackoverflow.com/questions/20878300/calculate-16-bit-crc-in-java-and-append-it-at-the-end-of-the-byte-array + */ + +#include "crc.h" + +const uint8_t auchCRCHi[] = { + 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, + 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, + 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, + 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, + 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, + 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, + 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, + 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, + 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, + 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, + 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, + 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, + 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, + 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, + 0x40 +}; +const uint8_t auchCRCLo[] = { + 0x00, 0xC0, 0xC1, 0x01, 0xC3, 0x03, 0x02, 0xC2, 0xC6, 0x06, 0x07, 0xC7, 0x05, 0xC5, 0xC4, + 0x04, 0xCC, 0x0C, 0x0D, 0xCD, 0x0F, 0xCF, 0xCE, 0x0E, 0x0A, 0xCA, 0xCB, 0x0B, 0xC9, 0x09, + 0x08, 0xC8, 0xD8, 0x18, 0x19, 0xD9, 0x1B, 0xDB, 0xDA, 0x1A, 0x1E, 0xDE, 0xDF, 0x1F, 0xDD, + 0x1D, 0x1C, 0xDC, 0x14, 0xD4, 0xD5, 0x15, 0xD7, 0x17, 0x16, 0xD6, 0xD2, 0x12, 0x13, 0xD3, + 0x11, 0xD1, 0xD0, 0x10, 0xF0, 0x30, 0x31, 0xF1, 0x33, 0xF3, 0xF2, 0x32, 0x36, 0xF6, 0xF7, + 0x37, 0xF5, 0x35, 0x34, 0xF4, 0x3C, 0xFC, 0xFD, 0x3D, 0xFF, 0x3F, 0x3E, 0xFE, 0xFA, 0x3A, + 0x3B, 0xFB, 0x39, 0xF9, 0xF8, 0x38, 0x28, 0xE8, 0xE9, 0x29, 0xEB, 0x2B, 0x2A, 0xEA, 0xEE, + 0x2E, 0x2F, 0xEF, 0x2D, 0xED, 0xEC, 0x2C, 0xE4, 0x24, 0x25, 0xE5, 0x27, 0xE7, 0xE6, 0x26, + 0x22, 0xE2, 0xE3, 0x23, 0xE1, 0x21, 0x20, 0xE0, 0xA0, 0x60, 0x61, 0xA1, 0x63, 0xA3, 0xA2, + 0x62, 0x66, 0xA6, 0xA7, 0x67, 0xA5, 0x65, 0x64, 0xA4, 0x6C, 0xAC, 0xAD, 0x6D, 0xAF, 0x6F, + 0x6E, 0xAE, 0xAA, 0x6A, 0x6B, 0xAB, 0x69, 0xA9, 0xA8, 0x68, 0x78, 0xB8, 0xB9, 0x79, 0xBB, + 0x7B, 0x7A, 0xBA, 0xBE, 0x7E, 0x7F, 0xBF, 0x7D, 0xBD, 0xBC, 0x7C, 0xB4, 0x74, 0x75, 0xB5, + 0x77, 0xB7, 0xB6, 0x76, 0x72, 0xB2, 0xB3, 0x73, 0xB1, 0x71, 0x70, 0xB0, 0x50, 0x90, 0x91, + 0x51, 0x93, 0x53, 0x52, 0x92, 0x96, 0x56, 0x57, 0x97, 0x55, 0x95, 0x94, 0x54, 0x9C, 0x5C, + 0x5D, 0x9D, 0x5F, 0x9F, 0x9E, 0x5E, 0x5A, 0x9A, 0x9B, 0x5B, 0x99, 0x59, 0x58, 0x98, 0x88, + 0x48, 0x49, 0x89, 0x4B, 0x8B, 0x8A, 0x4A, 0x4E, 0x8E, 0x8F, 0x4F, 0x8D, 0x4D, 0x4C, 0x8C, + 0x44, 0x84, 0x85, 0x45, 0x87, 0x47, 0x46, 0x86, 0x82, 0x42, 0x43, 0x83, 0x41, 0x81, 0x80, + 0x40 +}; + +uint16_t CRC16(const uint8_t *msg, uint16_t length) +{ + uint8_t uchCRCHi = 0xFF; /* high byte of CRC initialized */ + uint8_t uchCRCLo = 0xFF; /* low byte of CRC initialized */ + uint8_t uIndex; /* will index into CRC lookup table */ + + while (length--) /* pass through message buffer */ { + uIndex = uchCRCLo ^ *msg++; /* calculate the CRC */ + uchCRCLo = uchCRCHi ^ auchCRCHi[uIndex]; + uchCRCHi = auchCRCLo[uIndex]; + } + return (uchCRCHi << 8 | uchCRCLo); +} \ No newline at end of file diff --git a/solar_panel.X/crc.h b/solar_panel.X/crc.h new file mode 100644 index 0000000..5d167ba --- /dev/null +++ b/solar_panel.X/crc.h @@ -0,0 +1,19 @@ +/************************************************************************//** + * \file crc.h + * \brief CRC calculation for Modbus + ***************************************************************************/ + +#ifndef CRC_H +#define CRC_H + +#include + +/** + * Compute the CRC using the MODBUS formulae + * @param msg : message to be sent + * @param length : length of the message + * @return the computed CRC value + */ +uint16_t CRC16(const uint8_t *msg, uint16_t length); + +#endif /* CRC_H */ \ No newline at end of file diff --git a/solar_panel.X/measure.c b/solar_panel.X/measure.c new file mode 100644 index 0000000..8f78694 --- /dev/null +++ b/solar_panel.X/measure.c @@ -0,0 +1,55 @@ +#include + +#include "measure.h" +#include "mcc_generated_files/mcc.h" + +#define VOLTAGE_CHANNEL 0x5 +#define CURRENT_CHANNEL 0x6 +#define ADC_RESOLUTION 4096 - 1 +#define ADC_REFH 3300 +#define GAIN 66 +#define RESISTOR 3 + +// Number of samples to do the averaging during measures +#define AVERAGE_SAMPLES 8 + +uint16_t samplesVoltage[AVERAGE_SAMPLES]; +uint16_t samplesCurrent[AVERAGE_SAMPLES]; + + +void adc_init(void) +{ + // TODO -> complete adc initialisation + offsetCurrent = measure_current(0); + +} + +/** + * Read one ADC channel. This function is only + * local to this file. + * + * @param channel : the channel to be measured + * @return the ADC read value + */ +static uint16_t measure_adc(uint8_t channel) +{ + return (uint16_t) (ADC_GetConversion(channel)); +} + +uint16_t measure_voltage() +{ + uint16_t m = measure_adc(VOLTAGE_CHANNEL); + m /= 20; // TODO Explain why 20 + return m; +} + +uint16_t measure_current(uint16_t offset) +{ + uint16_t m = measure_adc(CURRENT_CHANNEL); + m -= offset; + if(m <= 0){ + m = 0; + } + m /= GAIN; + return m; +} \ No newline at end of file diff --git a/solar_panel.X/measure.h b/solar_panel.X/measure.h new file mode 100644 index 0000000..d953cf1 --- /dev/null +++ b/solar_panel.X/measure.h @@ -0,0 +1,39 @@ +/************************************************************************//** + * \file measure.h + * \brief Measuring current and voltage from the solar panel + ***************************************************************************/ + +#ifndef MEASURE_H +#define MEASURE_H + +#include + +static uint16_t offsetCurrent; + +/** + * Initialize ADC and pins for measuring current and voltage + */ +void adc_init(void); + +/** + * Measure the voltage on the channel for the current. + * This function is expected to do some filtering. + * + * @return The offset + */ + +uint16_t measure_voltage(void); + +/** + * Measure the current on the solar panel. + * This function is expected to do some filtering + * + * @param offset : the offset as measured by measure_current_offset + * @return the current in microamperes + */ + +uint16_t measure_current(uint16_t offset); + + + +#endif /* MEASURE_H */ diff --git a/solar_panel.X/modbus.c b/solar_panel.X/modbus.c new file mode 100644 index 0000000..604747c --- /dev/null +++ b/solar_panel.X/modbus.c @@ -0,0 +1,67 @@ +#include "modbus.h" +#include "crc.h" +//#include "uart.h" +#include +#include +#include + +// Modbus functions +#define READ_INPUT_REGISTERS 0x04 +#define READ_HOLDING_REGISTERS 0x03 +#define WRITE_SINGLE_REGISTER 0x06 + +// Modbus data model +uint8_t modbusAddress; +uint16_t input_registers[2]; +uint16_t holding_registers[2]; + +// Modbus error codes +#define ILLEGAL_FUNCTION 1 +#define ILLEGAL_DATA_ADDRESS 2 +#define ILLEGAL_DATA_VALUE 3 +#define SLAVE_DEVICE_FAILURE 4 + +/** + * Buffers for serial receive and send operations + * which are more than one byte long + **/ +uint8_t rx_buf[256]; +uint8_t tx_buf[256]; + +// Current position pointer for storing receive position +uint8_t recPtr = 0; + +void modbus_timer(void) +{ + // TODO -> complete what to do on modbus timer event + +} + +uint8_t modbus_analyse_and_answer(void) +{ + // TODO -> complete the modbus analyse and answer + +} + +void modbus_char_recvd(uint8_t c) +{ + // TODO -> complete modbus char receive +} + +void modbus_send(uint8_t length) +{ + uint16_t temp16; + uint8_t i; + + // TODO -> complete modbus RCR calculation + length += 2; // add 2 CRC bytes for total size + + // For all the bytes to be transmitted + uart_send(tx_buf,length); +} + +void modbus_init(uint8_t address) +{ + modbusAddress = address; + // TODO -> configute timer for modbus usage +} \ No newline at end of file diff --git a/solar_panel.X/modbus.h b/solar_panel.X/modbus.h new file mode 100644 index 0000000..e1feb9c --- /dev/null +++ b/solar_panel.X/modbus.h @@ -0,0 +1,62 @@ +/************************************************************************//** + * \file modbus.h + * \brief Modbus serial library + ***************************************************************************/ + +#ifndef MODBUS_H +#define MODBUS_H + +#include + +extern uint8_t modbusAddress; +extern uint16_t input_registers[2]; +extern uint16_t holding_registers[2]; + +/** + * Initializes this Modbus library. + * + * Initialize pins, timer, serial port and variables. Interrupts + * MUST be initialized for the timer and the serial port. + * + * @param address : the Modbus address of this device + * + * @see modbus_char_recvd + * @see modbus_timer + * @see interrupts.c + */ +void modbus_init(uint8_t address); + +/** + * Analyses the received frame and answer to server + * + * @return an error code if frame not valid + */ +uint8_t modbus_analyse_and_answer(void); + +/** + * Send the Modbus frame on tx_buf with CRC added + * + * @param length : length of the frame without the CRC + */ +void modbus_send(uint8_t length); + +/** + * + * This function will be called every time a character has been received on the + * Modbus serial port. It is called from the interrupt hander. + * + * @param c : the received char + * @see interrupts.c. + */ +void modbus_char_recvd(uint8_t c); + +/** + * Modbus timer finished. This function is called by the interrupt handler + * when a MODBUS frame is finished. It must analyse the received packet + * and reply if required. + * + * @see interrupts.c + */ +void modbus_timer(void); + +#endif /* MODBUS_H */ diff --git a/solar_panel.X/old_main.c b/solar_panel.X/old_main.c new file mode 100644 index 0000000..c380adb --- /dev/null +++ b/solar_panel.X/old_main.c @@ -0,0 +1,55 @@ +/************************************************************************//** + * \file main.c + * \brief Program main file for MODBUS controller + ***************************************************************************/ + + +#include +#include +#include +#include + +#include "lcd/lcd.h" +#include "pwm.h" +#include "measure.h" +#include "modbus.h" +#include "uart.h" + +#define _XTAL_FREQ 64000000L +/** + * Initialize clock, buttons, leds and interrupts + */ +void init_hw() +{ + OSCCON3 = 0; // runs at 64MHz + LCD_Init(LCD_2x16); + adc_init(); + modbus_init(0x80); + pwm_init(); + uart_init(); + // Interrupts configuration + PEIE = 1; + GIE = 1; +} + +uint8_t tmpStr[30]; +uint16_t u; ///< Voltage in milliovolts +uint16_t i; ///< Current in microamperes +uint16_t p; ///< Power in microwatts + +uint16_t offset; +uint16_t pwm = 512; + +void main(void) +{ + init_hw(); + + LCD_2x16_WriteMsg((unsigned char *)"Welcome ! ", 0); // display on line 0 + LCD_2x16_WriteMsg((unsigned char *)"*-*-*-*-*-*-*-*-", 1); // display on line 1 + + // TODO -> complete measure of current offset + + while (true) { + // TODO -> complete the main loop + } +} \ No newline at end of file