Remove custom ISSI lighting code (#22073)
* Remove CU75 custom lighting * Remove LFK78 custom lighting * Remove LFK87 custom lighting * Remove LFKPad custom lighting * Remove Mini1800 custom lighting * Remove SMK65 custom lighting * Remove LFK65-HS custom lighting * Remove LFKeyboards custom lighting * Remove Meira custom lighting
This commit is contained in:
Ryan
GitHub
parent
9c340077f6
commit
6424dadd37
98 changed files with 16 additions and 2929 deletions
|
|
@ -1,300 +0,0 @@
|
|||
/*
|
||||
* TWIlib.c
|
||||
*
|
||||
* Created: 6/01/2014 10:41:33 PM
|
||||
* Author: Chris Herring
|
||||
*/
|
||||
|
||||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "TWIlib.h"
|
||||
#include <util/delay.h>
|
||||
#include "print.h"
|
||||
|
||||
// Global transmit buffer
|
||||
volatile uint8_t *TWITransmitBuffer;
|
||||
// Global receive buffer
|
||||
volatile uint8_t TWIReceiveBuffer[RXMAXBUFLEN];
|
||||
// Buffer indexes
|
||||
volatile int TXBuffIndex; // Index of the transmit buffer. Is volatile, can change at any time.
|
||||
int RXBuffIndex; // Current index in the receive buffer
|
||||
// Buffer lengths
|
||||
int TXBuffLen; // The total length of the transmit buffer
|
||||
int RXBuffLen; // The total number of bytes to read (should be less than RXMAXBUFFLEN)
|
||||
|
||||
TWIInfoStruct TWIInfo;
|
||||
|
||||
void TWIInit(void)
|
||||
{
|
||||
TWIInfo.mode = Ready;
|
||||
TWIInfo.errorCode = 0xFF;
|
||||
TWIInfo.repStart = 0;
|
||||
// Set pre-scalers (no pre-scaling)
|
||||
TWSR = 0;
|
||||
// Set bit rate
|
||||
TWBR = ((F_CPU / TWI_FREQ) - 16) / 2;
|
||||
// Enable TWI and interrupt
|
||||
TWCR = (1 << TWIE) | (1 << TWEN);
|
||||
}
|
||||
|
||||
uint8_t isTWIReady(void)
|
||||
{
|
||||
if ( (TWIInfo.mode == Ready) | (TWIInfo.mode == RepeatedStartSent) )
|
||||
{
|
||||
|
||||
// xprintf("i2c ready\n");
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(TWIInfo.mode == Initializing){
|
||||
switch(TWIInfo.errorCode){
|
||||
case TWI_SUCCESS:
|
||||
break;
|
||||
case TWI_NO_RELEVANT_INFO:
|
||||
|
||||
break;
|
||||
case TWI_LOST_ARBIT:
|
||||
case TWI_MT_DATA_NACK:
|
||||
// Some kind of I2C error, reset and re-init
|
||||
xprintf("I2C init error: %d\n", TWIInfo.errorCode);
|
||||
TWCR = (1 << TWINT)|(1 << TWSTO);
|
||||
TWIInit();
|
||||
break;
|
||||
default:
|
||||
xprintf("Other i2c init error: %d\n", TWIInfo.errorCode);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void TWITransmitData(void *const TXdata, uint8_t dataLen, uint8_t repStart, uint8_t blocking)
|
||||
{
|
||||
// Wait until ready
|
||||
while (!isTWIReady()) {_delay_us(1);}
|
||||
// Reset the I2C stuff
|
||||
TWCR = (1 << TWINT)|(1 << TWSTO);
|
||||
TWIInit();
|
||||
// Set repeated start mode
|
||||
TWIInfo.repStart = repStart;
|
||||
// Copy transmit info to global variables
|
||||
TWITransmitBuffer = (uint8_t *)TXdata;
|
||||
TXBuffLen = dataLen;
|
||||
TXBuffIndex = 0;
|
||||
|
||||
// If a repeated start has been sent, then devices are already listening for an address
|
||||
// and another start does not need to be sent.
|
||||
if (TWIInfo.mode == RepeatedStartSent)
|
||||
{
|
||||
TWIInfo.mode = Initializing;
|
||||
TWDR = TWITransmitBuffer[TXBuffIndex++]; // Load data to transmit buffer
|
||||
TWISendTransmit(); // Send the data
|
||||
}
|
||||
else // Otherwise, just send the normal start signal to begin transmission.
|
||||
{
|
||||
TWIInfo.mode = Initializing;
|
||||
TWISendStart();
|
||||
}
|
||||
if(blocking){
|
||||
// Wait until ready
|
||||
while (!isTWIReady()){_delay_us(1);}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// uint8_t TWITransmitData(void *const TXdata, uint8_t dataLen, uint8_t repStart)
|
||||
// {
|
||||
// if (dataLen <= TXMAXBUFLEN)
|
||||
// {
|
||||
// // Wait until ready
|
||||
// while (!isTWIReady()) {_delay_us(1);}
|
||||
// // Set repeated start mode
|
||||
// TWIInfo.repStart = repStart;
|
||||
// // Copy data into the transmit buffer
|
||||
// uint8_t *data = (uint8_t *)TXdata;
|
||||
// for (int i = 0; i < dataLen; i++)
|
||||
// {
|
||||
// TWITransmitBuffer[i] = data[i];
|
||||
// }
|
||||
// // Copy transmit info to global variables
|
||||
// TXBuffLen = dataLen;
|
||||
// TXBuffIndex = 0;
|
||||
|
||||
// // If a repeated start has been sent, then devices are already listening for an address
|
||||
// // and another start does not need to be sent.
|
||||
// if (TWIInfo.mode == RepeatedStartSent)
|
||||
// {
|
||||
// TWIInfo.mode = Initializing;
|
||||
// TWDR = TWITransmitBuffer[TXBuffIndex++]; // Load data to transmit buffer
|
||||
// TWISendTransmit(); // Send the data
|
||||
// }
|
||||
// else // Otherwise, just send the normal start signal to begin transmission.
|
||||
// {
|
||||
// TWIInfo.mode = Initializing;
|
||||
// TWISendStart();
|
||||
// }
|
||||
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return 1; // return an error if data length is longer than buffer
|
||||
// }
|
||||
// return 0;
|
||||
// }
|
||||
|
||||
uint8_t TWIReadData(uint8_t TWIaddr, uint8_t bytesToRead, uint8_t repStart)
|
||||
{
|
||||
// Check if number of bytes to read can fit in the RXbuffer
|
||||
if (bytesToRead < RXMAXBUFLEN)
|
||||
{
|
||||
// Reset buffer index and set RXBuffLen to the number of bytes to read
|
||||
RXBuffIndex = 0;
|
||||
RXBuffLen = bytesToRead;
|
||||
// Create the one value array for the address to be transmitted
|
||||
uint8_t TXdata[1];
|
||||
// Shift the address and AND a 1 into the read write bit (set to write mode)
|
||||
TXdata[0] = (TWIaddr << 1) | 0x01;
|
||||
// Use the TWITransmitData function to initialize the transfer and address the slave
|
||||
TWITransmitData(TXdata, 1, repStart, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
ISR (TWI_vect)
|
||||
{
|
||||
switch (TWI_STATUS)
|
||||
{
|
||||
// ----\/ ---- MASTER TRANSMITTER OR WRITING ADDRESS ----\/ ---- //
|
||||
case TWI_MT_SLAW_ACK: // SLA+W transmitted and ACK received
|
||||
// Set mode to Master Transmitter
|
||||
TWIInfo.mode = MasterTransmitter;
|
||||
case TWI_START_SENT: // Start condition has been transmitted
|
||||
case TWI_MT_DATA_ACK: // Data byte has been transmitted, ACK received
|
||||
if (TXBuffIndex < TXBuffLen) // If there is more data to send
|
||||
{
|
||||
TWDR = TWITransmitBuffer[TXBuffIndex++]; // Load data to transmit buffer
|
||||
TWIInfo.errorCode = TWI_NO_RELEVANT_INFO;
|
||||
TWISendTransmit(); // Send the data
|
||||
}
|
||||
// This transmission is complete however do not release bus yet
|
||||
else if (TWIInfo.repStart)
|
||||
{
|
||||
TWIInfo.errorCode = 0xFF;
|
||||
TWISendStart();
|
||||
}
|
||||
// All transmissions are complete, exit
|
||||
else
|
||||
{
|
||||
TWIInfo.mode = Ready;
|
||||
TWIInfo.errorCode = 0xFF;
|
||||
TWISendStop();
|
||||
}
|
||||
break;
|
||||
|
||||
// ----\/ ---- MASTER RECEIVER ----\/ ---- //
|
||||
|
||||
case TWI_MR_SLAR_ACK: // SLA+R has been transmitted, ACK has been received
|
||||
// Switch to Master Receiver mode
|
||||
TWIInfo.mode = MasterReceiver;
|
||||
// If there is more than one byte to be read, receive data byte and return an ACK
|
||||
if (RXBuffIndex < RXBuffLen-1)
|
||||
{
|
||||
TWIInfo.errorCode = TWI_NO_RELEVANT_INFO;
|
||||
TWISendACK();
|
||||
}
|
||||
// Otherwise when a data byte (the only data byte) is received, return NACK
|
||||
else
|
||||
{
|
||||
TWIInfo.errorCode = TWI_NO_RELEVANT_INFO;
|
||||
TWISendNACK();
|
||||
}
|
||||
break;
|
||||
|
||||
case TWI_MR_DATA_ACK: // Data has been received, ACK has been transmitted.
|
||||
|
||||
/// -- HANDLE DATA BYTE --- ///
|
||||
TWIReceiveBuffer[RXBuffIndex++] = TWDR;
|
||||
// If there is more than one byte to be read, receive data byte and return an ACK
|
||||
if (RXBuffIndex < RXBuffLen-1)
|
||||
{
|
||||
TWIInfo.errorCode = TWI_NO_RELEVANT_INFO;
|
||||
TWISendACK();
|
||||
}
|
||||
// Otherwise when a data byte (the only data byte) is received, return NACK
|
||||
else
|
||||
{
|
||||
TWIInfo.errorCode = TWI_NO_RELEVANT_INFO;
|
||||
TWISendNACK();
|
||||
}
|
||||
break;
|
||||
|
||||
case TWI_MR_DATA_NACK: // Data byte has been received, NACK has been transmitted. End of transmission.
|
||||
|
||||
/// -- HANDLE DATA BYTE --- ///
|
||||
TWIReceiveBuffer[RXBuffIndex++] = TWDR;
|
||||
// This transmission is complete however do not release bus yet
|
||||
if (TWIInfo.repStart)
|
||||
{
|
||||
TWIInfo.errorCode = 0xFF;
|
||||
TWISendStart();
|
||||
}
|
||||
// All transmissions are complete, exit
|
||||
else
|
||||
{
|
||||
TWIInfo.mode = Ready;
|
||||
TWIInfo.errorCode = 0xFF;
|
||||
TWISendStop();
|
||||
}
|
||||
break;
|
||||
|
||||
// ----\/ ---- MT and MR common ----\/ ---- //
|
||||
|
||||
case TWI_MR_SLAR_NACK: // SLA+R transmitted, NACK received
|
||||
case TWI_MT_SLAW_NACK: // SLA+W transmitted, NACK received
|
||||
case TWI_MT_DATA_NACK: // Data byte has been transmitted, NACK received
|
||||
case TWI_LOST_ARBIT: // Arbitration has been lost
|
||||
// Return error and send stop and set mode to ready
|
||||
if (TWIInfo.repStart)
|
||||
{
|
||||
TWIInfo.errorCode = TWI_STATUS;
|
||||
TWISendStart();
|
||||
}
|
||||
// All transmissions are complete, exit
|
||||
else
|
||||
{
|
||||
TWIInfo.mode = Ready;
|
||||
TWIInfo.errorCode = TWI_STATUS;
|
||||
TWISendStop();
|
||||
}
|
||||
break;
|
||||
case TWI_REP_START_SENT: // Repeated start has been transmitted
|
||||
// Set the mode but DO NOT clear TWINT as the next data is not yet ready
|
||||
TWIInfo.mode = RepeatedStartSent;
|
||||
break;
|
||||
|
||||
// ----\/ ---- SLAVE RECEIVER ----\/ ---- //
|
||||
|
||||
// TODO IMPLEMENT SLAVE RECEIVER FUNCTIONALITY
|
||||
|
||||
// ----\/ ---- SLAVE TRANSMITTER ----\/ ---- //
|
||||
|
||||
// TODO IMPLEMENT SLAVE TRANSMITTER FUNCTIONALITY
|
||||
|
||||
// ----\/ ---- MISCELLANEOUS STATES ----\/ ---- //
|
||||
case TWI_NO_RELEVANT_INFO: // It is not really possible to get into this ISR on this condition
|
||||
// Rather, it is there to be manually set between operations
|
||||
break;
|
||||
case TWI_ILLEGAL_START_STOP: // Illegal START/STOP, abort and return error
|
||||
TWIInfo.errorCode = TWI_ILLEGAL_START_STOP;
|
||||
TWIInfo.mode = Ready;
|
||||
TWISendStop();
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
/*
|
||||
* TWIlib.h
|
||||
*
|
||||
* Created: 6/01/2014 10:38:42 PM
|
||||
* Author: Chris Herring
|
||||
*/
|
||||
|
||||
|
||||
#ifndef TWILIB_H_
|
||||
#define TWILIB_H_
|
||||
// TWI bit rate
|
||||
#define TWI_FREQ 400000
|
||||
// Get TWI status
|
||||
#define TWI_STATUS (TWSR & 0xF8)
|
||||
// Transmit buffer length
|
||||
#define TXMAXBUFLEN 20
|
||||
// Receive buffer length
|
||||
#define RXMAXBUFLEN 20
|
||||
|
||||
typedef enum {
|
||||
Ready,
|
||||
Initializing,
|
||||
RepeatedStartSent,
|
||||
MasterTransmitter,
|
||||
MasterReceiver,
|
||||
SlaceTransmitter,
|
||||
SlaveReciever
|
||||
} TWIMode;
|
||||
|
||||
typedef struct TWIInfoStruct{
|
||||
TWIMode mode;
|
||||
uint8_t errorCode;
|
||||
uint8_t repStart;
|
||||
}TWIInfoStruct;
|
||||
|
||||
extern TWIInfoStruct TWIInfo;
|
||||
|
||||
// TWI Status Codes
|
||||
#define TWI_START_SENT 0x08 // Start sent
|
||||
#define TWI_REP_START_SENT 0x10 // Repeated Start sent
|
||||
// Master Transmitter Mode
|
||||
#define TWI_MT_SLAW_ACK 0x18 // SLA+W sent and ACK received
|
||||
#define TWI_MT_SLAW_NACK 0x20 // SLA+W sent and NACK received
|
||||
#define TWI_MT_DATA_ACK 0x28 // DATA sent and ACK received
|
||||
#define TWI_MT_DATA_NACK 0x30 // DATA sent and NACK received
|
||||
// Master Receiver Mode
|
||||
#define TWI_MR_SLAR_ACK 0x40 // SLA+R sent, ACK received
|
||||
#define TWI_MR_SLAR_NACK 0x48 // SLA+R sent, NACK received
|
||||
#define TWI_MR_DATA_ACK 0x50 // Data received, ACK returned
|
||||
#define TWI_MR_DATA_NACK 0x58 // Data received, NACK returned
|
||||
|
||||
// Miscellaneous States
|
||||
#define TWI_LOST_ARBIT 0x38 // Arbitration has been lost
|
||||
#define TWI_NO_RELEVANT_INFO 0xF8 // No relevant information available
|
||||
#define TWI_ILLEGAL_START_STOP 0x00 // Illegal START or STOP condition has been detected
|
||||
#define TWI_SUCCESS 0xFF // Successful transfer, this state is impossible from TWSR as bit2 is 0 and read only
|
||||
|
||||
|
||||
#define TWISendStart() (TWCR = (1<<TWINT)|(1<<TWSTA)|(1<<TWEN)|(1<<TWIE)) // Send the START signal, enable interrupts and TWI, clear TWINT flag to resume transfer.
|
||||
#define TWISendStop() (TWCR = (1<<TWINT)|(1<<TWSTO)|(1<<TWEN)|(1<<TWIE)) // Send the STOP signal, enable interrupts and TWI, clear TWINT flag.
|
||||
#define TWISendTransmit() (TWCR = (1<<TWINT)|(1<<TWEN)|(1<<TWIE)) // Used to resume a transfer, clear TWINT and ensure that TWI and interrupts are enabled.
|
||||
#define TWISendACK() (TWCR = (1<<TWINT)|(1<<TWEN)|(1<<TWIE)|(1<<TWEA)) // FOR MR mode. Resume a transfer, ensure that TWI and interrupts are enabled and respond with an ACK if the device is addressed as a slave or after it receives a byte.
|
||||
#define TWISendNACK() (TWCR = (1<<TWINT)|(1<<TWEN)|(1<<TWIE)) // FOR MR mode. Resume a transfer, ensure that TWI and interrupts are enabled but DO NOT respond with an ACK if the device is addressed as a slave or after it receives a byte.
|
||||
|
||||
// Function declarations
|
||||
void TWITransmitData(void *const TXdata, uint8_t dataLen, uint8_t repStart, uint8_t blocking);
|
||||
void TWIInit(void);
|
||||
uint8_t TWIReadData(uint8_t TWIaddr, uint8_t bytesToRead, uint8_t repStart);
|
||||
uint8_t isTWIReady(void);
|
||||
|
||||
#endif // TWICOMMS_H_
|
||||
|
|
@ -21,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* key matrix size */
|
||||
#define MATRIX_ROWS 4
|
||||
#define MATRIX_COLS 12
|
||||
|
||||
#define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Column pins to demux in LSB order
|
||||
#define MATRIX_COL_PINS { C7, B7, B6, C6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
|
||||
#define MATRIX_COL_PINS_SCANNED { C7, B7, B6, C6 }
|
||||
#define LED_EN_PIN D2
|
||||
|
||||
#define AUDIO_PIN B5
|
||||
#define AUDIO_VOICES
|
||||
|
|
|
|||
|
|
@ -8,16 +8,6 @@
|
|||
"pid": "0x6061",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"backlight": {
|
||||
"driver": "custom",
|
||||
"levels": 10
|
||||
},
|
||||
"rgblight": {
|
||||
"led_count": 15
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "D3"
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"layout_aliases": {
|
||||
|
|
|
|||
|
|
@ -1,286 +0,0 @@
|
|||
#ifdef ISSI_ENABLE
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <util/delay.h>
|
||||
#include <avr/sfr_defs.h>
|
||||
#include <avr/io.h>
|
||||
#include <util/twi.h>
|
||||
#include "issi.h"
|
||||
#include "print.h"
|
||||
#include "TWIlib.h"
|
||||
|
||||
#define ISSI_ADDR_DEFAULT 0xE8
|
||||
|
||||
#define ISSI_REG_CONFIG 0x00
|
||||
#define ISSI_REG_CONFIG_PICTUREMODE 0x00
|
||||
#define ISSI_REG_CONFIG_AUTOPLAYMODE 0x08
|
||||
|
||||
#define ISSI_CONF_PICTUREMODE 0x00
|
||||
#define ISSI_CONF_AUTOFRAMEMODE 0x04
|
||||
#define ISSI_CONF_AUDIOMODE 0x08
|
||||
|
||||
#define ISSI_REG_PICTUREFRAME 0x01
|
||||
|
||||
#define ISSI_REG_SHUTDOWN 0x0A
|
||||
#define ISSI_REG_AUDIOSYNC 0x06
|
||||
|
||||
#define ISSI_COMMANDREGISTER 0xFD
|
||||
#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'
|
||||
uint8_t control[8][9] = {
|
||||
{0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
ISSIDeviceStruct *issi_devices[4] = {0, 0, 0, 0};
|
||||
|
||||
#ifndef cbi
|
||||
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
|
||||
#endif
|
||||
|
||||
#ifndef sbi
|
||||
#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
|
||||
#endif
|
||||
|
||||
#define I2C_WRITE 0
|
||||
#define F_SCL 400000UL // SCL frequency
|
||||
#define Prescaler 1
|
||||
#define TWBR_val ((((F_CPU / F_SCL) / Prescaler) - 16 ) / 2)
|
||||
|
||||
uint8_t i2c_start(uint8_t address)
|
||||
{
|
||||
// reset TWI control register
|
||||
TWCR = 0;
|
||||
// transmit START condition
|
||||
TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
|
||||
// wait for end of transmission
|
||||
while( !(TWCR & (1<<TWINT)) );
|
||||
|
||||
// check if the start condition was successfully transmitted
|
||||
if((TWSR & 0xF8) != TW_START){ return 1; }
|
||||
|
||||
// load slave address into data register
|
||||
TWDR = address;
|
||||
// start transmission of address
|
||||
TWCR = (1<<TWINT) | (1<<TWEN);
|
||||
// wait for end of transmission
|
||||
while( !(TWCR & (1<<TWINT)) );
|
||||
|
||||
// check if the device has acknowledged the READ / WRITE mode
|
||||
uint8_t twst = TW_STATUS & 0xF8;
|
||||
if ( (twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK) ) return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint8_t i2c_write(uint8_t data)
|
||||
{
|
||||
// load data into data register
|
||||
TWDR = data;
|
||||
// start transmission of data
|
||||
TWCR = (1 << TWINT) | (1 << TWEN);
|
||||
// wait for end of transmission
|
||||
while (!(TWCR & (1 << TWINT)))
|
||||
;
|
||||
|
||||
if ((TWSR & 0xF8) != TW_MT_DATA_ACK) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length)
|
||||
{
|
||||
TWBR = (uint8_t)TWBR_val;
|
||||
if (i2c_start(address | I2C_WRITE))
|
||||
return 1;
|
||||
for (uint16_t i = 0; i < length; i++) {
|
||||
if (i2c_write(data[i]))
|
||||
return 1;
|
||||
}
|
||||
// transmit STOP condition
|
||||
TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTO);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void setFrame(uint8_t device, uint8_t frame)
|
||||
{
|
||||
static uint8_t current_frame = -1;
|
||||
if(current_frame != frame){
|
||||
uint8_t payload[] = {
|
||||
ISSI_ADDR_DEFAULT | device << 1,
|
||||
ISSI_COMMANDREGISTER,
|
||||
frame
|
||||
};
|
||||
TWITransmitData(payload, sizeof(payload), 0, 1);
|
||||
}
|
||||
// static uint8_t current_frame = 0xFF;
|
||||
// if(current_frame == frame){
|
||||
// // return;
|
||||
// }
|
||||
// uint8_t payload[2] = { ISSI_COMMANDREGISTER, frame };
|
||||
// i2c_transmit(ISSI_ADDR_DEFAULT | device << 1, payload, 2);
|
||||
// current_frame = frame;
|
||||
}
|
||||
|
||||
void writeRegister8(uint8_t device, uint8_t frame, uint8_t reg, uint8_t data)
|
||||
{
|
||||
// Set the frame
|
||||
setFrame(device, frame);
|
||||
|
||||
// Write to the register
|
||||
uint8_t payload[] = {
|
||||
ISSI_ADDR_DEFAULT | device << 1,
|
||||
reg,
|
||||
data
|
||||
};
|
||||
TWITransmitData(payload, sizeof(payload), 0, 1);
|
||||
}
|
||||
|
||||
// void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm)
|
||||
// {
|
||||
// xprintf("activeLED: %02X %02X %02X %02X\n", matrix, cy, cx, pwm);
|
||||
// uint8_t x = cx - 1; // funciton takes 1 based counts, but we need 0...
|
||||
// uint8_t y = cy - 1; // creating them once for less confusion
|
||||
// if(pwm == 0){
|
||||
// cbi(control[matrix][y], x);
|
||||
// }else{
|
||||
// sbi(control[matrix][y], x);
|
||||
// }
|
||||
// uint8_t device = (matrix & 0x06) >> 1;
|
||||
// uint8_t control_reg = (y << 1) | (matrix & 0x01);
|
||||
// uint8_t pwm_reg = 0;
|
||||
// switch(matrix & 0x01){
|
||||
// case 0:
|
||||
// pwm_reg = 0x24;
|
||||
// break;
|
||||
// case 1:
|
||||
// pwm_reg = 0x2C;
|
||||
// break;
|
||||
// }
|
||||
// pwm_reg += (y << 4) + x;
|
||||
// xprintf(" device: %02X\n", device);
|
||||
// xprintf(" control: %02X %02X\n", control_reg, control[matrix][y]);
|
||||
// xprintf(" pwm: %02X %02X\n", pwm_reg, pwm);
|
||||
// writeRegister8(device, 0, control_reg, control[matrix][y]);
|
||||
// writeRegister8(device, 0, control_reg + 0x12, control[matrix][y]);
|
||||
// writeRegister8(device, 0, pwm_reg, pwm);
|
||||
// }
|
||||
|
||||
void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm)
|
||||
{
|
||||
uint8_t device_addr = (matrix & 0x06) >> 1;
|
||||
ISSIDeviceStruct *device = issi_devices[device_addr];
|
||||
if(device == 0){
|
||||
return;
|
||||
}
|
||||
// xprintf("activeLED: %02X %02X %02X %02X\n", matrix, cy, cx, pwm);
|
||||
uint8_t x = cx - 1; // funciton takes 1 based counts, but we need 0...
|
||||
uint8_t y = cy - 1; // creating them once for less confusion
|
||||
uint8_t control_reg = (y << 1) | (matrix & 0x01);
|
||||
if(pwm == 0){
|
||||
cbi(device->led_ctrl[control_reg], x);
|
||||
cbi(device->led_blink_ctrl[control_reg], x);
|
||||
}else{
|
||||
sbi(device->led_ctrl[control_reg], x);
|
||||
sbi(device->led_blink_ctrl[control_reg], x);
|
||||
}
|
||||
uint8_t pwm_reg = 0;
|
||||
switch(matrix & 0x01){
|
||||
case 0:
|
||||
pwm_reg = 0x00;
|
||||
break;
|
||||
case 1:
|
||||
pwm_reg = 0x08;
|
||||
break;
|
||||
}
|
||||
pwm_reg += (y << 4) + x;
|
||||
// xprintf(" device_addr: %02X\n", device_addr);
|
||||
// xprintf(" control: %02X %02X\n", control_reg, control[matrix][y]);
|
||||
// xprintf(" pwm: %02X %02X\n", pwm_reg, pwm);
|
||||
// writeRegister8(device_addr, 0, control_reg, control[matrix][y]);
|
||||
device->led_pwm[pwm_reg] = pwm;
|
||||
device->led_dirty = 1;
|
||||
|
||||
// writeRegister8(device_addr, 0, control_reg + 0x12, control[matrix][y]);
|
||||
// writeRegister8(device_addr, 0, pwm_reg, pwm);
|
||||
}
|
||||
|
||||
void update_issi(uint8_t device_addr, uint8_t blocking)
|
||||
{
|
||||
// This seems to take about 6ms
|
||||
ISSIDeviceStruct *device = issi_devices[device_addr];
|
||||
if(device != 0){
|
||||
if(device->fn_dirty){
|
||||
device->fn_dirty = 0;
|
||||
setFrame(device_addr, ISSI_BANK_FUNCTIONREG);
|
||||
TWITransmitData(&device->fn_device_addr, sizeof(device->fn_registers) + 2, 0, 1);
|
||||
}
|
||||
if(device->led_dirty){
|
||||
device->led_dirty = 0;
|
||||
setFrame(device_addr, 0);
|
||||
TWITransmitData(&device->led_device_addr, 0xB6, 0, blocking);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void issi_init(void)
|
||||
{
|
||||
// Set LED_EN/SDB high to enable the chip
|
||||
xprintf("Enabing SDB on pin: %d\n", LED_EN_PIN);
|
||||
_SFR_IO8((LED_EN_PIN >> 4) + 1) &= ~_BV(LED_EN_PIN & 0xF); // IN
|
||||
_SFR_IO8((LED_EN_PIN >> 4) + 2) |= _BV(LED_EN_PIN & 0xF); // HI
|
||||
TWIInit();
|
||||
for(uint8_t device_addr = 0; device_addr < 4; device_addr++){
|
||||
xprintf("ISSI Init device: %d\n", device_addr);
|
||||
// If this device has been previously allocated, free it
|
||||
if(issi_devices[device_addr] != 0){
|
||||
free(issi_devices[device_addr]);
|
||||
}
|
||||
// Try to shutdown the device, if this fails skip this device
|
||||
writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x00);
|
||||
while (!isTWIReady()){_delay_us(1);}
|
||||
if(TWIInfo.errorCode != 0xFF){
|
||||
xprintf("ISSI init failed %d %02X %02X\n", device_addr, TWIInfo.mode, TWIInfo.errorCode);
|
||||
continue;
|
||||
}
|
||||
// Allocate the device structure - calloc zeros it for us
|
||||
ISSIDeviceStruct *device = (ISSIDeviceStruct *)calloc(sizeof(ISSIDeviceStruct) * 2, 1);
|
||||
issi_devices[device_addr] = device;
|
||||
device->fn_device_addr = ISSI_ADDR_DEFAULT | device_addr << 1;
|
||||
device->fn_register_addr = 0;
|
||||
device->led_device_addr = ISSI_ADDR_DEFAULT | device_addr << 1;
|
||||
device->led_register_addr = 0;
|
||||
// set dirty bits so that all of the buffered data is written out
|
||||
device->fn_dirty = 1;
|
||||
device->led_dirty = 1;
|
||||
update_issi(device_addr, 1);
|
||||
// Set the function register to picture mode
|
||||
// device->fn_reg[ISSI_REG_CONFIG] = ISSI_REG_CONFIG_PICTUREMODE;
|
||||
writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x01);
|
||||
}
|
||||
|
||||
// Shutdown and set all registers to 0
|
||||
// writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x00);
|
||||
// for(uint8_t bank = 0; bank <= 7; bank++){
|
||||
// for (uint8_t reg = 0x00; reg <= 0xB3; reg++) {
|
||||
// writeRegister8(device_addr, bank, reg, 0x00);
|
||||
// }
|
||||
// }
|
||||
// for (uint8_t reg = 0; reg <= 0x0C; reg++) {
|
||||
// writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, reg, 0x00);
|
||||
// }
|
||||
// writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);
|
||||
// writeRegister8(device_addr, ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x01);
|
||||
// picture mode
|
||||
// writeRegister8(ISSI_BANK_FUNCTIONREG, 0x01, 0x01);
|
||||
|
||||
//Enable blink
|
||||
// writeRegister8(ISSI_BANK_FUNCTIONREG, 0x05, 0x48B);
|
||||
|
||||
//Enable Breath
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef ISSI_ENABLE
|
||||
|
||||
typedef struct ISSIDeviceStruct{
|
||||
uint8_t fn_dirty; // function registers need to be resent
|
||||
uint8_t fn_device_addr;
|
||||
uint8_t fn_register_addr;
|
||||
uint8_t fn_registers[13];
|
||||
uint8_t led_dirty; // LED data has changed and needs to be resent
|
||||
uint8_t led_device_addr;
|
||||
uint8_t led_register_addr;
|
||||
uint8_t led_ctrl[18];
|
||||
uint8_t led_blink_ctrl[18];
|
||||
uint8_t led_pwm[144];
|
||||
}ISSIDeviceStruct;
|
||||
|
||||
extern ISSIDeviceStruct *issi_devices[];
|
||||
|
||||
// Low level commands- 'device' is the 2-bit i2c id.
|
||||
void issi_init(void);
|
||||
void set_shutdown(uint8_t device, uint8_t shutdown);
|
||||
void writeRegister8(uint8_t device, uint8_t frame, uint8_t reg, uint8_t data);
|
||||
|
||||
// Higher level, no device is given, but it is calculated from 'matrix'
|
||||
// Each device has 2 blocks, max of 4 devices:
|
||||
// Device | Block = Matrix
|
||||
// 0 A 0
|
||||
// 0 B 1
|
||||
// 1 A 2
|
||||
// 1 B 3
|
||||
// 2 A 4
|
||||
// 2 B 5
|
||||
// 3 A 6
|
||||
// 3 B 7
|
||||
void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm);
|
||||
void update_issi(uint8_t device_addr, uint8_t blocking);
|
||||
|
||||
#endif
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
#include "lighting.h"
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
//Following line allows macro to read current RGB settings
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
#include "lighting.h"
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
// Following line allows macro to read current RGB settings
|
||||
|
|
|
|||
|
|
@ -268,15 +268,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
return false;
|
||||
break;
|
||||
case BL_TOGG:
|
||||
#ifdef ISSI_ENABLE
|
||||
if (record->event.pressed) {
|
||||
print("Enabling backlight\n");
|
||||
issi_init();
|
||||
}
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case BL_STEP:
|
||||
if (record->event.pressed) {
|
||||
print("Stepping backlight\n");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
AUDIO_ENABLE = yes # Audio output on port C6
|
||||
LTO_ENABLE = yes # -4-7k
|
||||
MOUSEKEY_ENABLE = no # Mouse keys(-47kb)
|
||||
ISSI_ENABLE = no
|
||||
BACKLIGHT_ENABLE = no
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
#include "lighting.h"
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
//Following line allows macro to read current RGB settings
|
||||
|
|
@ -189,15 +188,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
return false;
|
||||
break;
|
||||
case BL_TOGG:
|
||||
#ifdef ISSI_ENABLE
|
||||
if (record->event.pressed) {
|
||||
print("Enabling backlight\n");
|
||||
issi_init();
|
||||
}
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case BL_STEP:
|
||||
if (record->event.pressed) {
|
||||
print("Stepping backlight\n");
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
#ifdef ISSI_ENABLE
|
||||
|
||||
|
||||
#include <avr/sfr_defs.h>
|
||||
#include <avr/timer_avr.h>
|
||||
#include <avr/wdt.h>
|
||||
#include "meira.h"
|
||||
#include "issi.h"
|
||||
#include "TWIlib.h"
|
||||
#include "lighting.h"
|
||||
#include "debug.h"
|
||||
#include "audio.h"
|
||||
|
||||
|
||||
const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP;
|
||||
|
||||
const uint8_t switch_matrices[] = {0, 1};
|
||||
|
||||
void backlight_set(uint8_t level){
|
||||
#ifdef BACKLIGHT_ENABLE
|
||||
uint8_t pwm_value = 0;
|
||||
if(level >= BACKLIGHT_LEVELS){
|
||||
level = BACKLIGHT_LEVELS;
|
||||
}
|
||||
if(level > 0){
|
||||
pwm_value = backlight_pwm_map[level-1];
|
||||
}
|
||||
xprintf("BACKLIGHT_LEVELS: %d\n", BACKLIGHT_LEVELS);
|
||||
xprintf("backlight_set level: %d pwm: %d\n", level, pwm_value);
|
||||
for(int x = 1; x <= 9; x++){
|
||||
for(int y = 1; y <= 9; y++){
|
||||
activateLED(switch_matrices[0], x, y, pwm_value);
|
||||
activateLED(switch_matrices[1], x, y, pwm_value);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
void set_backlight_by_keymap(uint8_t col, uint8_t row){
|
||||
// dprintf("LED: %02X, %d %d %d\n", lookup_value, matrix, led_col, led_row);
|
||||
// activateLED(matrix, led_col, led_row, 255);
|
||||
}
|
||||
|
||||
void force_issi_refresh(void){
|
||||
issi_devices[0]->led_dirty = true;
|
||||
update_issi(0, true);
|
||||
issi_devices[3]->led_dirty = true;
|
||||
update_issi(3, true);
|
||||
}
|
||||
|
||||
void led_test(void){
|
||||
#ifdef WATCHDOG_ENABLE
|
||||
// This test take a long time to run, disable the WTD until its complete
|
||||
wdt_disable();
|
||||
#endif
|
||||
backlight_set(0);
|
||||
force_issi_refresh();
|
||||
// for(uint8_t x = 0; x < sizeof(rgb_sequence); x++){
|
||||
// set_rgb(rgb_sequence[x], 255, 0, 0);
|
||||
// force_issi_refresh();
|
||||
// _delay_ms(250);
|
||||
// set_rgb(rgb_sequence[x], 0, 255, 0);
|
||||
// force_issi_refresh();
|
||||
// _delay_ms(250);
|
||||
// set_rgb(rgb_sequence[x], 0, 0, 255);
|
||||
// force_issi_refresh();
|
||||
// _delay_ms(250);
|
||||
// set_rgb(rgb_sequence[x], 0, 0, 0);
|
||||
// force_issi_refresh();
|
||||
// }
|
||||
#ifdef WATCHDOG_ENABLE
|
||||
wdt_enable(WDTO_250MS);
|
||||
#endif
|
||||
}
|
||||
|
||||
void backlight_init_ports(void){
|
||||
xprintf("backlight_init_ports\n");
|
||||
issi_init();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
void led_test(void);
|
||||
void force_issi_refresh(void);
|
||||
void set_backlight(uint8_t level);
|
||||
void set_backlight_by_keymap(uint8_t col, uint8_t row);
|
||||
|
|
@ -19,18 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/*
|
||||
* scan matrix
|
||||
*/
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#if defined(__AVR__)
|
||||
#include <avr/io.h>
|
||||
#endif
|
||||
#include "matrix.h"
|
||||
#include "meira.h"
|
||||
#include "wait.h"
|
||||
#include "print.h"
|
||||
#include "debug.h"
|
||||
#include "util.h"
|
||||
#include "matrix.h"
|
||||
#include "config.h"
|
||||
#include "timer.h"
|
||||
|
||||
#ifndef DEBOUNCE
|
||||
|
|
|
|||
|
|
@ -14,24 +14,12 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "meira.h"
|
||||
#include "issi.h"
|
||||
#include "TWIlib.h"
|
||||
#include "lighting.h"
|
||||
#include "quantum.h"
|
||||
|
||||
extern void backlight_set(uint8_t level);
|
||||
|
||||
void matrix_init_kb(void)
|
||||
{
|
||||
debug_enable=true;
|
||||
print("meira matrix_init_kb\n");
|
||||
|
||||
#ifdef ISSI_ENABLE
|
||||
issi_init();
|
||||
#endif
|
||||
#ifdef BACKLIGHT_ENABLE
|
||||
backlight_set(5);
|
||||
#endif
|
||||
#ifdef WATCHDOG_ENABLE
|
||||
// This is done after turning the layer LED red, if we're caught in a loop
|
||||
// we should get a flashing red light
|
||||
|
|
@ -47,30 +35,6 @@ void matrix_scan_kb(void)
|
|||
{
|
||||
#ifdef WATCHDOG_ENABLE
|
||||
wdt_reset();
|
||||
#endif
|
||||
#ifdef ISSI_ENABLE
|
||||
// switch/underglow lighting update
|
||||
static uint32_t issi_device = 0;
|
||||
static uint32_t twi_last_ready = 0;
|
||||
if(twi_last_ready > 1000){
|
||||
// Its been way too long since the last ISSI update, reset the I2C bus and start again
|
||||
xprintf("TWI failed to recover, TWI re-init\n");
|
||||
twi_last_ready = 0;
|
||||
TWIInit();
|
||||
force_issi_refresh();
|
||||
}
|
||||
if(isTWIReady()){
|
||||
twi_last_ready = 0;
|
||||
// If the i2c bus is available, kick off the issi update, alternate between devices
|
||||
update_issi(issi_device, issi_device);
|
||||
if(issi_device){
|
||||
issi_device = 0;
|
||||
}else{
|
||||
issi_device = 3;
|
||||
}
|
||||
}else{
|
||||
twi_last_ready++;
|
||||
}
|
||||
#endif
|
||||
matrix_scan_user();
|
||||
}
|
||||
|
|
@ -80,9 +44,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
|||
// set_backlight_by_keymap(record->event.key.col, record->event.key.row);
|
||||
if (keycode == QK_BOOT) {
|
||||
reset_keyboard_kb();
|
||||
} else {
|
||||
}
|
||||
return process_record_user(keycode, record);
|
||||
return process_record_user(keycode, record);
|
||||
}
|
||||
|
||||
void reset_keyboard_kb(void){
|
||||
|
|
|
|||
|
|
@ -16,6 +16,5 @@
|
|||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
#include "issi.h"
|
||||
|
||||
void reset_keyboard_kb(void);
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
SRC += matrix.c TWIlib.c issi.c lighting.c
|
||||
|
||||
#ifeq ($(strip $(ISSI_ENABLE)), yes)
|
||||
# OPT_DEFS += -DISSI_ENABLE
|
||||
#endif
|
||||
|
||||
#ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
|
||||
# OPT_DEFS += -DWATCHDOG_ENABLE
|
||||
#endif
|
||||
|
|
@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define MATRIX_COL_PINS { B1, B3, B2, B6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
|
||||
#define MATRIX_COL_PINS_SCANNED { B1, B3, B2, B6 }
|
||||
|
||||
#define LED_EN_PIN D2
|
||||
|
||||
/*
|
||||
* Feature disable options
|
||||
* These options are also useful to firmware size reduction.
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
|
|||
CONSOLE_ENABLE = no # Console for debug
|
||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||
NKRO_ENABLE = no # Enable N-Key Rollover
|
||||
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality, also set ISSI_ENABLE below for Meira
|
||||
ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
|
||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
|
||||
CUSTOM_MATRIX = yes
|
||||
SRC += matrix.c
|
||||
|
||||
DEFAULT_FOLDER = woodkeys/meira/promicro
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue