Avr/RGBController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working pwm

Browse Source
This commit is contained in:
IMback
2017-05-16 10:37:01 +02:00
parent e2e53267c6
commit cb779f21d4
4 changed files with 115 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -3,14 +3,14 @@
## The settings here work for the Arduino Uno, Rev. 3. ## The settings here work for the Arduino Uno, Rev. 3.
# Project name # Project name
project(cncextension) project(rgbcontroller)
# CMake version # CMake version
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
# Options # Options
# Adjust to your board # Adjust to your board
set(MCU "m328p" CACHE STRING "Processor Type") set(MCU "atmega328p" CACHE STRING "Processor Type")
set(CPU_SPEED "16000000" CACHE STRING "Speed of the CPU") set(CPU_SPEED "16000000" CACHE STRING "Speed of the CPU")
set(PORT "/dev/ttyUSB0" CACHE STRING "USB Port") set(PORT "/dev/ttyUSB0" CACHE STRING "USB Port")
set(PORT_SPEED "57600" CACHE STRING "Serial Port Speed") set(PORT_SPEED "57600" CACHE STRING "Serial Port Speed")
@ -19,7 +19,7 @@ set(COMPILE_FLAGS "" CACHE STRING "Additional Compiler Flags")
# Set own source files # Set own source files
# Simply list all your C / C++ source (not header!) files here # Simply list all your C / C++ source (not header!) files here
set(SRC_FILES main.cpp serial.cpp WirelessRelay.cpp pwm.cpp encoder.cpp) set(SRC_FILES main.cpp serial.cpp WirelessRelay.cpp pwm.cpp)
# Compiler suite specification # Compiler suite specification
set(CMAKE_C_COMPILER /usr/bin/avr-gcc) set(CMAKE_C_COMPILER /usr/bin/avr-gcc)

178
main.cpp
View File

@ -6,172 +6,68 @@
#include "writepin.h" #include "writepin.h"
#include "WirelessRelay.h" #include "WirelessRelay.h"
#include "pwm.h" #include "pwm.h"
#include "encoder.h"
bool serialDispatch(Serial* serial , WirelessRelay* relayOne, WirelessRelay* relayTow, WirelessRelay* relayThree, WirelessRelay* relayFour, Pwm16b* pwm) bool serialDispatch(Serial* serial , WirelessRelay* relayOne, WirelessRelay* relayTow, WirelessRelay* relayThree, WirelessRelay* relayFour)
{ {
if(serial->dataIsWaiting()) if(serial->dataIsWaiting())
{ {
char buffer[7]; char buffer[20];
const int length = serial->getString(buffer, 7); const int length = serial->getString(buffer, 7);
if(length == 4 && buffer[0] == 'S' && buffer[1] == 'T' && buffer[2] == 'A' && buffer[3] == 'T' ) return true;
else if(length == 5)
{
if (buffer[0] == 'C' && buffer[1] == 'H' )
{
switch(buffer[2])
{
case '0':
//writePin(&PORTB, PB3, buffer[4] == '1' ? true : false); pin is dead
serial->putString("OK\n");
break;
case '1':
writePin(&PORTB, PB4, buffer[4] == '1' ? true : false);
serial->putString("OK\n");
break;
case '2':
writePin(&PORTB, PB5, buffer[4] == '1' ? true : false);
serial->putString("OK\n");
break;
}
}
else if (buffer[0] == 'W' && buffer[1] == 'R' )
{
switch(buffer[2])
{
case '0':
serial->putString("OK\n");
buffer[4] == '1' ? relayOne->on() : relayOne->off();
break;
case '1':
serial->putString("OK\n");
buffer[4] == '1' ? relayTow->on() : relayTow->off();
break;
case '2':
serial->putString("OK\n");
buffer[4] == '1' ? relayThree->on() : relayThree->off();
break;
}
}
else if (buffer[0] == 'O' && buffer[1] == 'P' && buffer[2] == 'T')
{
writePin(&PORTB, PB0, buffer[4] == '1' ? true : false);
serial->putString("OK\n");
}
}
else if (length == 6 && buffer[0] == 'P' && buffer[1] == 'W' && buffer[2] == 'M')
{
char inNumber[2];
inNumber[0]=buffer[4];
inNumber[1]=buffer[5];
pwm->setDuty(atoi(inNumber));
serial->putString("OK\n");
}
else if (length == 6 && buffer[0] == 'L' && buffer[1] == 'E' && buffer[2] == 'D')
{
switch(buffer[3])
{
case '0':
writePin(&PORTC, PC4, buffer[5] == '1' ? true : false);
serial->putString("OK\n");
break;
case '1':
writePin(&PORTC, PC5, buffer[5] == '1' ? true : false);
serial->putString("OK\n");
break;
case '2':
writePin(&PORTD, PD4, buffer[5] == '1' ? true : false);
serial->putString("OK\n");
break;
}
}
} }
return false; return false;
} }
void serialOutput(Serial* serial, Encoder* encoder, volatile unsigned char *inPort)
{
serial->putString("VARS_");
readPin( inPort, PC1 ) ? serial->putChar('0') : serial->putChar('1');
readPin( inPort, PC2 ) ? serial->putChar('0') : serial->putChar('1');
int16_t buffer = encoder->getPosition();
serial->putString( (char*)&buffer, sizeof(buffer));
serial->putChar('\n');
}
int main() int main()
{ {
DDRB = 0b11111111; DDRB = 0xFF;//= (1 << PB5) | ( 1 << PB1);
DDRD = 0b11111011;//(1 << PD3) | (1 << PD7) | (1 << PD3); DDRD = 0xFF;//= (1 << PD3) | (1 << PD5);
DDRC = 0x00;
PORTC = 0xFF;
writePin(&PORTD, PD7, false);
bool StepperEnable = false;
PORTB = 0x00;
sei(); sei();
Serial serial; Serial serial;
Pwm16b pwm;
pwm.setDuty(0x0000); /* Pwm16b pwmA;
pwm.on(); pwmA.setDuty(10);
pwmA.on();*/
WirelessRelay relayOne(&PORTD, PD3, 0b1001110000000000); Pwm8b pwmTc0( &TCCR0A, &TCCR0B, &OCR0A, &OCR0B );
WirelessRelay relayTow(&PORTD, PD3, 0b1001101000000000); //pwmB.on();
WirelessRelay relayThree(&PORTD, PD3, 0b1001100100000000);
WirelessRelay relayFour(&PORTD, PD3, 0b1001100010000000);
Encoder encoder(&PINC, PC3, PC4); Pwm8b pwmTc2( &TCCR2A, &TCCR2B, &OCR2A, &OCR2B, 0b00000101, false, true );
serial.putString("CNCextension v1.2 starting\n"); //pwmTc0.setDutyA(10);
//pwmTc0.setDutyB(10);
pwmTc2.setDutyB(128);
/*
//fast 8 bit PWM pwm A
TCCR0A|= (1<<COM0A1) | (1<<COM0B1);
TCCR0A|=(1<<WGM01) | (1<<WGM00);
//start with /1024 prescaller
TCCR0B =(1 << CS00) | (1 << CS01);*/
WirelessRelay relayOne(&PORTB, PB5, 0b1001110000000000);
WirelessRelay relayTow(&PORTB, PB5, 0b1001101000000000);
WirelessRelay relayThree(&PORTB, PB5, 0b1001100100000000);
WirelessRelay relayFour(&PORTB, PB5, 0b1001100010000000);
serial.putString("RGBController v0.1 starting\n");
uint8_t duty = 0;
while(true) while(true)
{ {
encoder.poll(); serialDispatch(&serial, &relayOne, &relayTow, &relayThree, &relayFour);
if (serialDispatch(&serial, &relayOne, &relayTow, &relayThree, &relayFour, &pwm)) serialOutput(&serial, &encoder, &PINC ); pwmTc0.setDutyA(duty);
pwmTc0.setDutyB(duty);
writePin(&PORTB, PB2, ( PORTB & (1 << PB3) || PORTB & (1 << PB4) || PORTB & (1 << PB5)) ); pwmTc2.setDutyB(duty);
duty++;
//char buffer[16]; _delay_us(50000);
//sprintf(buffer, "ENC_%05d\n", encoder.getPosition());
//serial.putString(buffer);
if(!readPin(&PIND, PD2) && StepperEnable == false)
{
bool abort = false;
for (int i = 0; i < 100; i++)
{
if(readPin(&PIND, PD2)) abort = true;
_delay_ms(10);
}
if(!abort)
{
StepperEnable = true;
writePin(&PORTD, PD7, true);
//serial.putString("Enabeling Steppers\n");
}
}
else if( readPin(&PIND, PD2) && StepperEnable == true )
{
bool abort = false;
for (int i = 0; i < 10; i++)
{
if(!readPin(&PIND, PD2)) abort = true;
_delay_ms(5);
}
if(!abort)
{
StepperEnable = false;
writePin(&PORTD, PD7, false);
//serial.putString("Disabeling Steppers\n");
}
}
} }
return 0; //master interupt. return 0; //master interupt.

58
pwm.cpp
View File

@ -1,10 +1,11 @@
#include "pwm.h" #include "pwm.h"
//16bit
Pwm16b::Pwm16b() Pwm16b::Pwm16b()
{ {
DDRB |= (1<<PB1); DDRB |= (1<<PB1);
OCR1A = 0x0; //0% pwm to start0 OCR1A = 0x00; //0% pwm to start A
TCNT1=0; TCNT1=0;
TCCR1A|=(1<<COM1A1); //enable OCR1A only; TCCR1A|=(1<<COM1A1); //enable OCR1A only;
ICR1=100; ICR1=100;
@ -20,7 +21,7 @@ void Pwm16b::on()
{ {
// Phase and freq correct 16 bit PWM start pwm with /1024 prescaller // Phase and freq correct 16 bit PWM start pwm with /1024 prescaller
TCCR1B|=(1<<WGM13) | (1<<WGM10); TCCR1B|=(1<<WGM13) | (1<<WGM10);
TCCR1B|= (1 << CS12); TCCR1B|= (1 << CS00) | (1 << CS01);
} }
void Pwm16b::setDuty(const uint16_t duty) void Pwm16b::setDuty(const uint16_t duty)
@ -32,3 +33,56 @@ Pwm16b::~Pwm16b()
{ {
off(); off();
} }
//8bit
Pwm8b::Pwm8b( volatile unsigned char *timerControlRegisterA, volatile unsigned char *timerControlRegisterB, volatile unsigned char *compareRegisterA, volatile unsigned char *compareRegisterB, const uint8_t speed, const bool enableA, const bool enableB, const uint8_t dutyA, const uint8_t dutyB)
{
_timerControlRegisterA = timerControlRegisterA;
_timerControlRegisterB = timerControlRegisterB;
_compareRegisterA = compareRegisterA;
_compareRegisterB = compareRegisterB;
_speed=speed;
*_timerControlRegisterA = 0x00;
off();
//fast 8 bit PWM pwm A
if(enableA) *_timerControlRegisterA|= (1<<COM0A1);
if(enableB) *_timerControlRegisterA|= (1<<COM0B1);
*_timerControlRegisterA|= (1<<WGM01) | (1<<WGM00);
*_compareRegisterA = 0; //0% pwm to start0
*_compareRegisterB = 0; //0% pwm to start0
on();
}
void Pwm8b::off()
{
*_timerControlRegisterB = 0x00;
}
void Pwm8b::on()
{
off();
//start with /1024 prescaller
//*_timerControlRegisterB =(1 << CS00) | (1 << CS01);
*_timerControlRegisterB |= _speed;
}
void Pwm8b::setDutyA(const uint8_t duty)
{
*_compareRegisterA = duty;
}
void Pwm8b::setDutyB(const uint8_t duty)
{
*_compareRegisterB = duty;
}
Pwm8b::~Pwm8b()
{
off();
}

20
pwm.h
View File

@ -3,7 +3,7 @@
#include <avr/io.h> #include <avr/io.h>
class Pwm16b class Pwm16b //TC1 pwm on PB1 & PB2
{ {
public: public:
Pwm16b(); Pwm16b();
@ -13,4 +13,22 @@ public:
void on(); void on();
}; };
class Pwm8b
{
private:
volatile unsigned char *_timerControlRegisterA; //TCCRxA
volatile unsigned char *_timerControlRegisterB; //TCCRxB
volatile unsigned char *_compareRegisterA; //OCRxA
volatile unsigned char *_compareRegisterB; //OCRxB
uint8_t _speed = 0b00000011;
public:
Pwm8b( volatile unsigned char *timerControlRegisterA, volatile unsigned char *timerControlRegisterB, volatile unsigned char *compareRegisterA, volatile unsigned char *compareRegisterB, const uint8_t speed = 0b00000011, const bool enableA = true, const bool enableB = true, const uint8_t dutyA = 0, const uint8_t dutyB = 0 );
~Pwm8b();
void setDutyA(const uint8_t duty);
void setDutyB(const uint8_t duty);
void off();
void on();
};
#endif #endif