added missing includes & added SIPO PWM module

dev
Ondřej Hruška 9 years ago
parent e6b80dc9d3
commit d154d22eb3
  1. 1
      lib/adc.c
  2. 1
      lib/adc.h
  3. 2
      lib/calc.h
  4. 1
      lib/debounce.h
  5. 1
      lib/sd_blockdev.h
  6. 2
      lib/sd_fat.h
  7. 83
      lib/sipo_pwm.c
  8. 44
      lib/sipo_pwm.h
  9. 2
      lib/wsrgb.h

@ -1,5 +1,6 @@
#include <avr/io.h> #include <avr/io.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include "calc.h" #include "calc.h"
#include "adc.h" #include "adc.h"

@ -5,6 +5,7 @@
// //
#include <avr/io.h> #include <avr/io.h>
#include <stdint.h>
/** Initialize the ADC */ /** Initialize the ADC */
void adc_init(); void adc_init();

@ -4,6 +4,8 @@
// Bit and byte manipulation utilities // Bit and byte manipulation utilities
// //
#include <stdint.h>
// --- Increment in range --- // --- Increment in range ---
// when overflown, wraps within range. Lower bound < upper bound. // when overflown, wraps within range. Lower bound < upper bound.

@ -29,6 +29,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include "calc.h" #include "calc.h"
#include "iopins.h" #include "iopins.h"

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "blockdev.h" #include "blockdev.h"
#include <stdbool.h>
/** Initialize the SD card block device */ /** Initialize the SD card block device */
bool sdb_init(BLOCKDEV* dev); bool sdb_init(BLOCKDEV* dev);

@ -7,6 +7,8 @@
// and hides the implementation. All regular ff_* functions will work on the FFILE. // and hides the implementation. All regular ff_* functions will work on the FFILE.
// //
#include <stdint.h>
#include "fat16.h" #include "fat16.h"
#include "stream.h" #include "stream.h"

@ -0,0 +1,83 @@
#include <avr/io.h>
#include <stdbool.h>
#include <stdint.h>
#include "sipo_pwm.h"
#include "iopins.h"
#include "sipo_pwm_config.h"
/* -------- SIPO PWM MODULE ---------- */
/** Buffer for sending bits to SIPO */
bool _buff[SPWM_CHANNELS];
uint8_t spwm_levels[SPWM_CHANNELS];
/** Send _buff to SIPO */
void _send_buffer()
{
for (int8_t i = SPWM_CHANNELS - 1; i >= 0; i--)
{
#if (SPWM_INVERT)
set_pin(SPWM_DATA, !_buff[i]); /* Common anode */
#else
set_pin(SPWM_DATA, _buff[i]); /* Common cathode */
#endif
// send a CLK pulse
pin_high(SPWM_CLK);
pin_low(SPWM_CLK);
}
// send a STR pulse
pin_high(SPWM_STR);
pin_low(SPWM_STR);
}
void spwm_init()
{
// Pin directions
as_output(SPWM_CLK);
as_output(SPWM_STR);
as_output(SPWM_DATA);
// Initial states
pin_low(SPWM_CLK);
pin_low(SPWM_STR);
}
/**
* Display PWM channels.
* This could be called in a Timer ISR.
*/
void spwm_send()
{
// Set all bits to 1 (if their PWM level is 0, set to 0)
for (uint8_t bit = 0; bit < SPWM_CHANNELS; bit++)
{
_buff[bit] = (bool) spwm_levels[bit];
}
// Show initial state
_send_buffer();
// For each PWM level...
for (uint16_t pwm = 0; pwm < SPWM_COLOR_DEPTH; pwm++)
{
// Turn OFF bits that are below the level
for (uint8_t bit = 0; bit < SPWM_CHANNELS; bit++)
{
if (spwm_levels[bit] < pwm)
{
_buff[bit] = 0;
}
}
// And show...
_send_buffer();
}
}

@ -0,0 +1,44 @@
#pragma once
// --- SIPO PWM Module ---
//
// SIPO = Serial IN, Parallel OUT
//
// This module lets you use SIPO outputs as a "software PWM".
//
// Tested on 74HC4094,
// should also work on 74HC595 (may need some small changes)
#include <stdint.h>
// Your file with configs
#include "sipo_pwm_config.h"
/*
// PWM pin aliases
#define SPWM_STR D2
#define SPWM_CLK D3
#define SPWM_DATA D4
// Number of PWM levels (color depth)
#define SPWM_COLOR_DEPTH 256
// Number of SIPO channels
#define SPWM_CHANNELS 24
// Invert outputs (for Common Anode LEDs)
#define SPWM_INVERT 1
*/
// Array for setting PWM levels (PWM_CHANNELS-long)
extern uint8_t spwm_levels[SPWM_CHANNELS];
/** Configure output pins etc */
void spwm_init();
/** Display PWM channels.
* This could be called in a Timer ISR.
*/
void spwm_send();

@ -8,6 +8,8 @@
// Create a config file rgb_config.h next to your main.c // Create a config file rgb_config.h next to your main.c
// //
#include <stdint.h>
#include "iopins.h" #include "iopins.h"
#include "color.h" #include "color.h"

Loading…
Cancel
Save