working pwm

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

178
main.cpp
View File

@ -6,172 +6,68 @@
#include "writepin.h"
#include "WirelessRelay.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())
{
char buffer[7];
char buffer[20];
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;
}
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()
{
DDRB = 0b11111111;
DDRD = 0b11111011;//(1 << PD3) | (1 << PD7) | (1 << PD3);
DDRC = 0x00;
PORTC = 0xFF;
writePin(&PORTD, PD7, false);
bool StepperEnable = false;
DDRB = 0xFF;//= (1 << PB5) | ( 1 << PB1);
DDRD = 0xFF;//= (1 << PD3) | (1 << PD5);
PORTB = 0x00;
sei();
Serial serial;
Pwm16b pwm;
pwm.setDuty(0x0000);
pwm.on();
/* Pwm16b pwmA;
pwmA.setDuty(10);
pwmA.on();*/
WirelessRelay relayOne(&PORTD, PD3, 0b1001110000000000);
WirelessRelay relayTow(&PORTD, PD3, 0b1001101000000000);
WirelessRelay relayThree(&PORTD, PD3, 0b1001100100000000);
WirelessRelay relayFour(&PORTD, PD3, 0b1001100010000000);
Pwm8b pwmTc0( &TCCR0A, &TCCR0B, &OCR0A, &OCR0B );
//pwmB.on();
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)
{
encoder.poll();
if (serialDispatch(&serial, &relayOne, &relayTow, &relayThree, &relayFour, &pwm)) serialOutput(&serial, &encoder, &PINC );
writePin(&PORTB, PB2, ( PORTB & (1 << PB3) || PORTB & (1 << PB4) || PORTB & (1 << PB5)) );
//char buffer[16];
//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");
}
}
serialDispatch(&serial, &relayOne, &relayTow, &relayThree, &relayFour);
pwmTc0.setDutyA(duty);
pwmTc0.setDutyB(duty);
pwmTc2.setDutyB(duty);
duty++;
_delay_us(50000);
}
return 0; //master interupt.