diff --git a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.componentinfo.xml b/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.componentinfo.xml deleted file mode 100644 index 169ded6..0000000 --- a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.componentinfo.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - Device - Startup - - - Atmel - 2.0.0 - C:/Program Files (x86)\Atmel\Studio\7.0\Packs - - - - - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\2.0.401\include\ - - include - C - - - include/ - - - - - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\2.0.401\include\avr\iom328pb.h - - header - C - ciLFjy803ysEAt1ml/dotQ== - - include/avr/iom328pb.h - - - - - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\2.0.401\templates\main.c - template - source - C Exe - KjvOcFWd++tbnsEMfVPd/w== - - templates/main.c - Main file (.c) - - - - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\2.0.401\templates\main.cpp - template - source - C Exe - jUpFIcLr99QCZJmYGdbF/A== - - templates/main.cpp - Main file (.cpp) - - - - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\2.0.401\gcc\dev\atmega328pb - - libraryPrefix - GCC - - - gcc/dev/atmega328pb - - - - - ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/2.0.401/Atmel.ATmega_DFP.pdsc - 2.0.401 - true - ATmega328PB - - - - Resolved - Fixed - true - - - \ No newline at end of file diff --git a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.cppproj b/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.cppproj deleted file mode 100644 index df15cb6..0000000 --- a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/1xGenTest.cppproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - 2.0 - 7.0 - com.Atmel.AVRGCC8.CPP - {6a6fbffd-b460-4b8d-ac37-72193bed073f} - ATmega328PB - none - Executable - CPP - $(MSBuildProjectName) - .elf - $(MSBuildProjectDirectory)\$(Configuration) - 1xGenTest - 1xGenTest - 1xGenTest - Native - true - false - true - true - 0x20000000 - - true - exception_table - 2 - 0 - 0 - - - - - - - - - - - - - - - - - - -mmcu=atmega328pb -B "%24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\gcc\dev\atmega328pb" - True - True - True - True - False - True - True - - - NDEBUG - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - Optimize for size (-Os) - True - True - True - True - True - - - NDEBUG - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - Optimize for size (-Os) - True - True - True - - - libm - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - - - - - - - -mmcu=atmega328pb -B "%24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\gcc\dev\atmega328pb" - True - True - True - True - False - True - True - - - DEBUG - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - Optimize (-O1) - True - True - Default (-g2) - True - True - True - - - DEBUG - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - Optimize (-O1) - True - True - Default (-g2) - True - - - libm - - - - - %24(PackRepoDir)\Atmel\ATmega_DFP\2.0.401\include\ - - - Default (-Wa,-g) - - - - - - compile - - - - \ No newline at end of file diff --git a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/main.cpp b/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/main.cpp deleted file mode 100644 index 305e843..0000000 --- a/idiBusMaster/IdiBus_Master_v0.26/idiBus_MasterLib/IdiBus_Master/1xGenTest/main.cpp +++ /dev/null @@ -1,150 +0,0 @@ -#ifdef F_CPU -#undef F_CPU -#endif -#define F_CPU 16000000UL - -#include -#include "IdiBusSerialLine.h" -#include "IDIBUS_1xGen.h" -#include "MBOARD_POWER.h" -#include - -IdiBusSerialLine Serial_Line0; -IdiBusSerialLine Serial_Line1; - -void setup() -{ - MBOARD_POWER_OFF_ON(); - delay(50); - - IDIBUS_SERIAL_INIT_TYPEDEF L0Init; - L0Init.USART_NUMBER = IDIBUS_SERIAL_USART2; // select USART - L0Init.TIMER_NUMBER = IDIBUS_TIMER_1; // select timer - L0Init.CONFIG = IDIBUS_SERIAL_8N2; // 8 bit, 2 stop - L0Init.RS485_DIR_PIN = 6; // direction pin in-out - L0Init.BAUDRATE_DIPSW_S0_PIN = 9; // speed selector pins - L0Init.BAUDRATE_DIPSW_S1_PIN = 8; - L0Init.BAUDRATE_DIPSW_S2_PIN = 7; - Serial_Line0.Init(&L0Init); // Init line with with config above - Serial_Line0.UpdateBaudrateFromDipSwitch(); // speed setup - Serial_Line0.Start(); // run! - - IDIBUS_SERIAL_ALTERNATIVE_INIT_TYPEDEF L1Init; - L1Init.USART_NUMBER = IDIBUS_SERIAL_USART1; - L1Init.TIMER_NUMBER = IDIBUS_TIMER_3; - L1Init.CONFIG = IDIBUS_SERIAL_8N2; - L1Init.RS485_DIR_GPIO.PORT = &PORTL; - L1Init.RS485_DIR_GPIO.PIN_NUM = 6; - L1Init.BAUDRATE_DIPSW.S0.PORT = &PORTD; - L1Init.BAUDRATE_DIPSW.S0.PIN_NUM = 1; - L1Init.BAUDRATE_DIPSW.S1.PORT = &PORTD; - L1Init.BAUDRATE_DIPSW.S1.PIN_NUM = 0; - L1Init.BAUDRATE_DIPSW.S2.PORT = &PORTL; - L1Init.BAUDRATE_DIPSW.S2.PIN_NUM = 7; - Serial_Line1.Init(&L1Init); - Serial_Line1.UpdateBaudrateFromDipSwitch(); - Serial_Line1.Start(); - - Serial.begin(115200,SERIAL_8N2); // usart0 for debug - - #define BAUD 16000000UL/16/250000UL-1 // BAUD speed = 250000 bod - UBRR3 = (uint16_t)(BAUD); // USART BAUD RATE INIT - UCSR3B = (1<> 8) & 0xFF), (uint8_t)(Settings.first_mode_pwm_value & 0xFF), - Settings.first_mode_f, Settings.first_mode_invert, Settings.first_mode_R1, - Settings.second_mode_time, - (uint8_t)((Settings.second_mode_pwm_value >> 8) & 0xFF), (uint8_t)(Settings.second_mode_pwm_value & 0xFF), - Settings.second_mode_f, Settings.second_mode_invert, Settings.second_mode_R1}; - TEMP.start_SPI(TxData); - - //TEMP.reset_STM(); - - Serial_Line1.UpdateBaudrateFromDipSwitch(); -} - -uint8_t MBOARD_POWER_SET(uint8_t juction, uint8_t set) // power channel ON/OFF -{ - Serial3.begin(115200,SERIAL_8N1); // usart3 for 328pb on MBoard - uint8_t string[2]; - if((juction==MBOARD_POWER_J89_05V)&&(set==MBOARD_POWER_ON)) - { - Serial3.print("5+"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - else if((juction==MBOARD_POWER_J89_05V)&&(set==MBOARD_POWER_OFF)) - { - Serial3.print("5-"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - else if((juction==MBOARD_POWER_J89_24V)&&(set==MBOARD_POWER_ON)) - { - Serial3.print("J+"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - else if((juction==MBOARD_POWER_J89_24V)&&(set==MBOARD_POWER_OFF)) - { - Serial3.print("J-"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - else if((juction==MBOARD_POWER_J67_24V)&&(set==MBOARD_POWER_ON)) - { - Serial3.print("R+"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - else if((juction==MBOARD_POWER_J67_24V)&&(set==MBOARD_POWER_OFF)) - { - Serial3.print("R-"); delay(10); - Serial3.readBytes(string, 2); - if((string[0]=='O')&&(string[1]=='K')) return MBOARD_POWER_OK; - } - while(Serial3.available()>0) string[0]=Serial3.read(); - return MBOARD_POWER_ERR; -} - -void MBOARD_POWER_OFF_ON(void) // âûêëþ÷åíèå, ïàóçà è ïîñëåäîâàòåëüíîå âêëþ÷åíèå âñåõ ïèòàíèé -{ - MBOARD_POWER_SET(MBOARD_POWER_J89_05V, MBOARD_POWER_OFF); - MBOARD_POWER_SET(MBOARD_POWER_J89_24V, MBOARD_POWER_OFF); - MBOARD_POWER_SET(MBOARD_POWER_J67_24V, MBOARD_POWER_OFF); - delay(1000);wdt_reset(); - MBOARD_POWER_SET(MBOARD_POWER_J89_05V, MBOARD_POWER_ON); - delay(500);wdt_reset(); - MBOARD_POWER_SET(MBOARD_POWER_J89_24V, MBOARD_POWER_ON); - delay(500);wdt_reset(); - MBOARD_POWER_SET(MBOARD_POWER_J67_24V, MBOARD_POWER_ON); - delay(1000);wdt_reset(); - return; -} \ No newline at end of file