Commit 3c8eca97 authored by Martin Enriquez's avatar Martin Enriquez

Mergeando con el git ignore

parents 590f7ab3 3b53c76d
# Created by https://www.gitignore.io/api/eclipse
### Eclipse ###
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
# Eclipse Core
.project
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT)
.factorypath
# PDT-specific
.buildpath
# sbteclipse plugin
.target
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
ejemplos-td-2/.metadata/
ejemplos-td-2/RemoteSystemsTempFiles/
firmware/.metadata/
firmware/RemoteSystemsTempFiles/
!SESSION 2015-11-30 11:21:48.470 -----------------------------------------------
eclipse.buildId=4.5.1.M20150904-0015
java.version=1.7.0_79
java.vendor=Oracle Corporation
BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=es_AR
Framework arguments: -product org.eclipse.epp.package.cpp.product
Command-line arguments: -data /home/martin/Documentos/Digitales III/proyecto-digitales/ejemplos-td-2 -os linux -ws gtk -arch x86_64 -product org.eclipse.epp.package.cpp.product
!ENTRY org.eclipse.cdt.core 1 0 2015-11-30 11:26:06.252
!MESSAGE Indexed 'Remoto-con-8' (3 sources, 24 headers) in 2,56 sec: 596 declarations; 1.656 references; 1 unresolved inclusions; 1 syntax errors; 52 unresolved names (2,3 %)
!SESSION 2015-11-30 11:43:41.568 -----------------------------------------------
eclipse.buildId=4.5.1.M20150904-0015
java.version=1.7.0_79
java.vendor=Oracle Corporation
BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=es_AR
Framework arguments: -product org.eclipse.epp.package.cpp.product
Command-line arguments: -os linux -ws gtk -arch x86_64 -product org.eclipse.epp.package.cpp.product
!ENTRY org.eclipse.cdt.core 1 0 2015-11-30 11:45:23.394
!MESSAGE Indexed 'modulo_on_off' (3 sources, 21 headers) in 1,86 sec: 435 declarations; 1.325 references; 1 unresolved inclusions; 1 syntax errors; 49 unresolved names (2,7 %)
!ENTRY org.eclipse.cdt.core 1 0 2015-11-30 11:45:47.099
!MESSAGE Indexed 'modulo_luces' (3 sources, 21 headers) in 0,74 sec: 443 declarations; 1.330 references; 1 unresolved inclusions; 1 syntax errors; 49 unresolved names (2,7 %)
*** SESSION nov. 30, 2015 11:22:04.27 ------------------------------------------
*** SESSION nov. 30, 2015 11:43:54.78 ------------------------------------------
*** SESSION nov. 30, 2015 15:59:02.12 ------------------------------------------
*** SESSION dic. 01, 2015 17:12:51.31 ------------------------------------------
<?xml version="1.0" encoding="UTF-8" standalone="no"?><SharedRoot><SharedProperty id="" value=""/></SharedRoot>
\ No newline at end of file
17:41:35 **** Incremental Build of configuration Release for project Remoto-con-8 ****
make all
Building file: ../main.c
Invoking: AVR Compiler
avr-gcc -Wall -Os -fpack-struct -fshort-enums -ffunction-sections -fdata-sections -std=gnu99 -funsigned-char -funsigned-bitfields -mmcu=atmega8 -DF_CPU=8000000UL -MMD -MP -MF"main.d" -MT"main.o" -c -o "main.o" "../main.c"
Finished building: ../main.c
Building target: Remoto-con-8.elf
Invoking: AVR C Linker
avr-gcc -Wl,-Map,Remoto-con-8.map -mmcu=atmega8 -o "Remoto-con-8.elf" ./main.o ./mcu.o ./nrf24l01.o
Finished building target: Remoto-con-8.elf
Invoking: AVR Create Extended Listing
avr-objdump -h -S Remoto-con-8.elf >"Remoto-con-8.lss"
Finished building: Remoto-con-8.lss
Create Flash image (ihex format)
avr-objcopy -R .eeprom -R .fuse -R .lock -R .signature -O ihex Remoto-con-8.elf "Remoto-con-8.hex"
Finished building: Remoto-con-8.hex
Create eeprom image (ihex format)
avr-objcopy -j .eeprom --no-change-warnings --change-section-lma .eeprom=0 -O ihex Remoto-con-8.elf "Remoto-con-8.eep"
Finished building: Remoto-con-8.eep
Invoking: Print Size
avr-size --format=avr --mcu=atmega8 Remoto-con-8.elf
AVR Memory Usage
----------------
Device: atmega8
Program: 1530 bytes (18.7% Full)
(.text + .data + .bootloader)
Data: 14 bytes (1.4% Full)
(.data + .bss + .noinit)
Finished building: sizedummy
17:41:36 Build Finished (took 161ms)
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="completion_proposal_size">
</section>
<section name="org.eclipse.cdt.ui.text.hover.CMacroExpansionExploration">
</section>
</section>
17:43:41 **** Incremental Build of configuration Release for project modulo_luces ****
make all
Invoking: Print Size
avr-size --format=avr --mcu=atmega8 modulo_luces.elf
AVR Memory Usage
----------------
Device: atmega8
Program: 1484 bytes (18.1% Full)
(.text + .data + .bootloader)
Data: 19 bytes (1.9% Full)
(.data + .bss + .noinit)
Finished building: sizedummy
17:43:41 **** Incremental Build of configuration Release for project modulo_luces ****
make all
Invoking: Print Size
avr-size --format=avr --mcu=atmega8 modulo_luces.elf
AVR Memory Usage
----------------
Device: atmega8
Program: 1484 bytes (18.1% Full)
(.text + .data + .bootloader)
Data: 19 bytes (1.9% Full)
(.data + .bss + .noinit)
Finished building: sizedummy
17:43:41 Build Finished (took 121ms)
16:48:22 **** Incremental Build of configuration Release for project modulo_on_off ****
make all
Building file: ../main.c
Invoking: AVR Compiler
avr-gcc -Wall -Os -fpack-struct -fshort-enums -ffunction-sections -fdata-sections -std=gnu99 -funsigned-char -funsigned-bitfields -mmcu=atmega8 -DF_CPU=8000000UL -MMD -MP -MF"main.d" -MT"main.o" -c -o "main.o" "../main.c"
Finished building: ../main.c
Building target: modulo_on_off.elf
Invoking: AVR C Linker
avr-gcc -Wl,-Map,modulo_on_off.map -mmcu=atmega8 -o "modulo_on_off.elf" ./main.o ./mcu.o ./nrf24l01.o
Finished building target: modulo_on_off.elf
Invoking: AVR Create Extended Listing
avr-objdump -h -S modulo_on_off.elf >"modulo_on_off.lss"
Finished building: modulo_on_off.lss
Create Flash image (ihex format)
avr-objcopy -R .eeprom -R .fuse -R .lock -R .signature -O ihex modulo_on_off.elf "modulo_on_off.hex"
Finished building: modulo_on_off.hex
Create eeprom image (ihex format)
avr-objcopy -j .eeprom --no-change-warnings --change-section-lma .eeprom=0 -O ihex modulo_on_off.elf "modulo_on_off.eep"
Finished building: modulo_on_off.eep
Invoking: Print Size
avr-size --format=avr --mcu=atmega8 modulo_on_off.elf
AVR Memory Usage
----------------
Device: atmega8
Program: 1348 bytes (16.5% Full)
(.text + .data + .bootloader)
Data: 15 bytes (1.5% Full)
(.data + .bss + .noinit)
Finished building: sizedummy
16:48:22 Build Finished (took 183ms)
avrtarget/ClockFrequency=8000000
avrtarget/ExtRAMSize=0
avrtarget/ExtendedRAM=false
avrtarget/MCUType=atmega328p
avrtarget/UseEEPROM=false
avrtarget/UseExtendedRAMforHeap=true
avrtarget/avrdude/BitBangDelay=
avrtarget/avrdude/Bitclock=
avrtarget/avrdude/EEPROMFile=
avrtarget/avrdude/EEPROMFromConfig=true
avrtarget/avrdude/FlashFile=
avrtarget/avrdude/FlashFromConfig=true
avrtarget/avrdude/NoChipErase=false
avrtarget/avrdude/NoSigCheck=false
avrtarget/avrdude/NoVerify=false
avrtarget/avrdude/NoWrite=false
avrtarget/avrdude/OtherOptions=
avrtarget/avrdude/ProgrammerID=programmerconfig.1
avrtarget/avrdude/UseCounter=false
avrtarget/avrdude/WriteEEPROM=false
avrtarget/avrdude/WriteFlash=true
avrtarget/perConfig=false
eclipse.preferences.version=1
/*
* main.c
*
* Created on: 5/2/2015
* Author: Mart�n
*/
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <util/delay.h>
#include <avr/interrupt.h>
#include "nrf24l01.h"
#include "mcu.h"
#include "hardware.h"
#include "comunicacion.h"
volatile unsigned char luces = 0, duty = 255, duty_ant = 250, cambiar_duty = 0, reportar = 0;
volatile unsigned char tmr0_ovf = 0;
uint8_t *data;
int main(void)
{
init_megazord();
while(1)
{
if (demora_tx >= 20)
{
reset();
Modo_RX();
CE = 1;
demora_tx = 0;
}
if(reportar)
{
Modo_TX();
data[1] = luces? LUCES_ON : LUCES_OFF;
transmit_payload(data);
reportar = 0;
Modo_RX();
}
}
return 0;
}
ISR(INT0_vect)
{
cli();
CE = 0; // CE bajo
data = WriteToNrf(R, R_RX_PAYLOAD, data, dataLen); //Leo el mensaje
switch(data[1])
{
case LUCES_TOGGLE:
if(luces)
{
LED = 1;
duty_ant = duty;
duty = 255;
luces = 0;
}
else
{
LED = 0;
duty = duty_ant;
luces = 1;
}
// Probando solo con el led onboard
LED ^= 1; //Toggle
reportar = 1;
break;
case LUCES_AUMENTAR:
if(duty <= 230)
duty = duty + 25;
duty_ant = duty;
break;
case LUCES_DISMINUIR:
if(duty >= 25)
duty = duty - 25;
duty_ant = duty;
break;
default:
break;
}
data[1] = 0;
sei();
CE = 1; // CE alto
}
ISR (TIMER0_OVF_vect)
{
TCNT0 = 55; // Desborda cada 200us
tmr0_ovf++;
if(tmr0_ovf == 5)
{
//Pas� 1ms
tmr0_ovf = 0;
demora_tx++;
tiempo_tx++;
}
}
ISR (TIMER1_OVF_vect)
{
OCR1A = duty;
}
/*
* main.c
*
* Created on: 5/2/2015
* Author: Mart�n
*/
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <util/delay.h>
#include <avr/interrupt.h>
#include "nrf24l01.h"
#include "mcu.h"
#include "hardware.h"
#include "comunicacion.h"
volatile unsigned char luces = 0, duty = 255, duty_ant = 250, cambiar_duty = 0, reportar = 0;
volatile unsigned char tmr0_ovf = 0;
uint8_t *data;
int main(void)
{
init_megazord();
while(1)
{
if (demora_tx >= 20)
{
reset();
Modo_RX();
CE = 1;
demora_tx = 0;
}
if(reportar)
{
Modo_TX();
data[1] = luces? LUCES_ON : LUCES_OFF;
transmit_payload(data);
reportar = 0;
Modo_RX();
}
}
return 0;
}
ISR(INT0_vect)
{
cli();
CE = 0; // CE bajo
data = WriteToNrf(R, R_RX_PAYLOAD, data, dataLen); //Leo el mensaje
switch(data[1])
{
case LUCES_TOGGLE:
if(luces)
{
LED = 1;
duty_ant = duty;
duty = 255;
luces = 0;
}
else
{
LED = 0;
duty = duty_ant;
luces = 1;
}
// Probando solo con el led onboard
LED ^= 1; //Toggle
reportar = 1;
break;
case LUCES_AUMENTAR:
if(duty <= 230)
duty = duty + 25;
duty_ant = duty;
break;
case LUCES_DISMINUIR:
if(duty >= 25)
duty = duty - 25;
duty_ant = duty;
break;
default:
break;
}
data[1] = 0;
sei();
CE = 1; // CE alto
}
ISR (TIMER0_OVF_vect)
{
TCNT0 = 55; // Desborda cada 200us
tmr0_ovf++;
if(tmr0_ovf == 5)
{
//Pas� 1ms
tmr0_ovf = 0;
demora_tx++;
tiempo_tx++;
}
}
ISR (TIMER1_OVF_vect)
{
OCR1A = duty;
}
/*
* main.c
*
* Created on: 25/1/2015
* Author: Enrquez Martn | Leandro Lanzieri
*/
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include <util/delay.h>
#include <avr/interrupt.h>
#include "nrf24l01.h"
#include "mcu.h"
#include "hardware.h"
#include "comunicacion.h"
uint8_t *data;
volatile boton_t boton;
int main(void)
{
init_megazord();
LED = 1;
int i;
// El mirco est vivo... EST VIVOOO! (?)
for(i = 0; i < 10; i++)
{
LED ^= 1; // Toggle LED
_delay_ms(200);
}
Set_frec(FREC_ON_OFF);
while(1)
{
if (demora_tim1 >= 20)
{
reset();
Modo_RX();
CE = 1;
demora_tim1 = 0;
}
_delay_ms(500);
data[0] = RELE_TOGGLE;
Modo_TX();
transmit_payload(data);
reset();
demora_tx = 0;
/*
leer_botones();
switch(boton)
{
case LUZ:
Set_frec(FREC_LUCES);
_delay_ms(20);
data[0] = LUCES_TOGGLE;