Work-in-progress.

This commit is contained in:
Dominic Clifton 2014-09-05 20:47:19 +01:00
parent 0c77e27f33
commit 9ce6dde1e7
5 changed files with 289 additions and 5 deletions

View File

@ -237,6 +237,7 @@ EUSTM32F103RC_SRC = startup_stm32f10x_hd_gcc.S \
drivers/bus_i2c_stm32f10x.c \
drivers/bus_spi.c \
drivers/compass_hmc5883l.c \
drivers/display_ug2864hsweg01.h \
drivers/gpio_stm32f10x.c \
drivers/light_led_stm32f10x.c \
drivers/light_ws2811strip.c \

View File

@ -119,8 +119,9 @@ bool i2cWriteBuffer(uint8_t addr_, uint8_t reg_, uint8_t len_, uint8_t *data)
if (!(I2Cx->CR2 & I2C_IT_EVT)) { // if we are restarting the driver
if (!(I2Cx->CR1 & 0x0100)) { // ensure sending a start
while (I2Cx->CR1 & 0x0200 && --timeout > 0) { ; } // wait for any stop to finish sending
if (timeout == 0)
if (timeout == 0) {
return i2cHandleHardwareFailure();
}
I2C_GenerateSTART(I2Cx, ENABLE); // send the start for the new job
}
I2C_ITConfig(I2Cx, I2C_IT_EVT | I2C_IT_ERR, ENABLE); // allow the interrupts to fire off again
@ -128,8 +129,9 @@ bool i2cWriteBuffer(uint8_t addr_, uint8_t reg_, uint8_t len_, uint8_t *data)
timeout = I2C_DEFAULT_TIMEOUT;
while (busy && --timeout > 0) { ; }
if (timeout == 0)
if (timeout == 0) {
return i2cHandleHardwareFailure();
}
return !error;
}
@ -173,11 +175,12 @@ bool i2cRead(uint8_t addr_, uint8_t reg_, uint8_t len, uint8_t* buf)
static void i2c_er_handler(void)
{
// Read the I2C1 status register
// Read the I2Cx status register
volatile uint32_t SR1Register = I2Cx->SR1;
if (SR1Register & 0x0F00) // an error
if (SR1Register & 0x0F00) { // an error
error = true;
}
// If AF, BERR or ARLO, abandon the current job and commence new if there are jobs
if (SR1Register & 0x0700) {

View File

@ -0,0 +1,245 @@
/*
* This file is part of Cleanflight.
*
* Cleanflight is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Cleanflight is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include "platform.h"
#include "bus_i2c.h"
#include "system.h"
#include "display_ug2864hsweg01.h"
static const uint8_t const multiWiiFont[][5] = { // Refer to "Times New Roman" Font Database... 5 x 7 font
{ 0x00,0x00,0x00,0x00,0x00},
{ 0x00,0x00,0x4F,0x00,0x00}, // ( 1) ! - 0x0021 Exclamation Mark
{ 0x00,0x07,0x00,0x07,0x00}, // ( 2) " - 0x0022 Quotation Mark
{ 0x14,0x7F,0x14,0x7F,0x14}, // ( 3) # - 0x0023 Number Sign
{ 0x24,0x2A,0x7F,0x2A,0x12}, // ( 4) $ - 0x0024 Dollar Sign
{ 0x23,0x13,0x08,0x64,0x62}, // ( 5) % - 0x0025 Percent Sign
{ 0x36,0x49,0x55,0x22,0x50}, // ( 6) & - 0x0026 Ampersand
{ 0x00,0x05,0x03,0x00,0x00}, // ( 7) ' - 0x0027 Apostrophe
{ 0x00,0x1C,0x22,0x41,0x00}, // ( 8) ( - 0x0028 Left Parenthesis
{ 0x00,0x41,0x22,0x1C,0x00}, // ( 9) ) - 0x0029 Right Parenthesis
{ 0x14,0x08,0x3E,0x08,0x14}, // ( 10) * - 0x002A Asterisk
{ 0x08,0x08,0x3E,0x08,0x08}, // ( 11) + - 0x002B Plus Sign
{ 0x00,0x50,0x30,0x00,0x00}, // ( 12) , - 0x002C Comma
{ 0x08,0x08,0x08,0x08,0x08}, // ( 13) - - 0x002D Hyphen-Minus
{ 0x00,0x60,0x60,0x00,0x00}, // ( 14) . - 0x002E Full Stop
{ 0x20,0x10,0x08,0x04,0x02}, // ( 15) / - 0x002F Solidus
{ 0x3E,0x51,0x49,0x45,0x3E}, // ( 16) 0 - 0x0030 Digit Zero
{ 0x00,0x42,0x7F,0x40,0x00}, // ( 17) 1 - 0x0031 Digit One
{ 0x42,0x61,0x51,0x49,0x46}, // ( 18) 2 - 0x0032 Digit Two
{ 0x21,0x41,0x45,0x4B,0x31}, // ( 19) 3 - 0x0033 Digit Three
{ 0x18,0x14,0x12,0x7F,0x10}, // ( 20) 4 - 0x0034 Digit Four
{ 0x27,0x45,0x45,0x45,0x39}, // ( 21) 5 - 0x0035 Digit Five
{ 0x3C,0x4A,0x49,0x49,0x30}, // ( 22) 6 - 0x0036 Digit Six
{ 0x01,0x71,0x09,0x05,0x03}, // ( 23) 7 - 0x0037 Digit Seven
{ 0x36,0x49,0x49,0x49,0x36}, // ( 24) 8 - 0x0038 Digit Eight
{ 0x06,0x49,0x49,0x29,0x1E}, // ( 25) 9 - 0x0039 Dight Nine
{ 0x00,0x36,0x36,0x00,0x00}, // ( 26) : - 0x003A Colon
{ 0x00,0x56,0x36,0x00,0x00}, // ( 27) ; - 0x003B Semicolon
{ 0x08,0x14,0x22,0x41,0x00}, // ( 28) < - 0x003C Less-Than Sign
{ 0x14,0x14,0x14,0x14,0x14}, // ( 29) = - 0x003D Equals Sign
{ 0x00,0x41,0x22,0x14,0x08}, // ( 30) > - 0x003E Greater-Than Sign
{ 0x02,0x01,0x51,0x09,0x06}, // ( 31) ? - 0x003F Question Mark
{ 0x32,0x49,0x79,0x41,0x3E}, // ( 32) @ - 0x0040 Commercial At
{ 0x7E,0x11,0x11,0x11,0x7E}, // ( 33) A - 0x0041 Latin Capital Letter A
{ 0x7F,0x49,0x49,0x49,0x36}, // ( 34) B - 0x0042 Latin Capital Letter B
{ 0x3E,0x41,0x41,0x41,0x22}, // ( 35) C - 0x0043 Latin Capital Letter C
{ 0x7F,0x41,0x41,0x22,0x1C}, // ( 36) D - 0x0044 Latin Capital Letter D
{ 0x7F,0x49,0x49,0x49,0x41}, // ( 37) E - 0x0045 Latin Capital Letter E
{ 0x7F,0x09,0x09,0x09,0x01}, // ( 38) F - 0x0046 Latin Capital Letter F
{ 0x3E,0x41,0x49,0x49,0x7A}, // ( 39) G - 0x0047 Latin Capital Letter G
{ 0x7F,0x08,0x08,0x08,0x7F}, // ( 40) H - 0x0048 Latin Capital Letter H
{ 0x00,0x41,0x7F,0x41,0x00}, // ( 41) I - 0x0049 Latin Capital Letter I
{ 0x20,0x40,0x41,0x3F,0x01}, // ( 42) J - 0x004A Latin Capital Letter J
{ 0x7F,0x08,0x14,0x22,0x41}, // ( 43) K - 0x004B Latin Capital Letter K
{ 0x7F,0x40,0x40,0x40,0x40}, // ( 44) L - 0x004C Latin Capital Letter L
{ 0x7F,0x02,0x0C,0x02,0x7F}, // ( 45) M - 0x004D Latin Capital Letter M
{ 0x7F,0x04,0x08,0x10,0x7F}, // ( 46) N - 0x004E Latin Capital Letter N
{ 0x3E,0x41,0x41,0x41,0x3E}, // ( 47) O - 0x004F Latin Capital Letter O
{ 0x7F,0x09,0x09,0x09,0x06}, // ( 48) P - 0x0050 Latin Capital Letter P
{ 0x3E,0x41,0x51,0x21,0x5E}, // ( 49) Q - 0x0051 Latin Capital Letter Q
{ 0x7F,0x09,0x19,0x29,0x46}, // ( 50) R - 0x0052 Latin Capital Letter R
{ 0x46,0x49,0x49,0x49,0x31}, // ( 51) S - 0x0053 Latin Capital Letter S
{ 0x01,0x01,0x7F,0x01,0x01}, // ( 52) T - 0x0054 Latin Capital Letter T
{ 0x3F,0x40,0x40,0x40,0x3F}, // ( 53) U - 0x0055 Latin Capital Letter U
{ 0x1F,0x20,0x40,0x20,0x1F}, // ( 54) V - 0x0056 Latin Capital Letter V
{ 0x3F,0x40,0x38,0x40,0x3F}, // ( 55) W - 0x0057 Latin Capital Letter W
{ 0x63,0x14,0x08,0x14,0x63}, // ( 56) X - 0x0058 Latin Capital Letter X
{ 0x07,0x08,0x70,0x08,0x07}, // ( 57) Y - 0x0059 Latin Capital Letter Y
{ 0x61,0x51,0x49,0x45,0x43}, // ( 58) Z - 0x005A Latin Capital Letter Z
{ 0x00,0x7F,0x41,0x41,0x00}, // ( 59) [ - 0x005B Left Square Bracket
{ 0x02,0x04,0x08,0x10,0x20}, // ( 60) \ - 0x005C Reverse Solidus
{ 0x00,0x41,0x41,0x7F,0x00}, // ( 61) ] - 0x005D Right Square Bracket
{ 0x04,0x02,0x01,0x02,0x04}, // ( 62) ^ - 0x005E Circumflex Accent
{ 0x40,0x40,0x40,0x40,0x40}, // ( 63) _ - 0x005F Low Line
{ 0x01,0x02,0x04,0x00,0x00}, // ( 64) ` - 0x0060 Grave Accent
{ 0x20,0x54,0x54,0x54,0x78}, // ( 65) a - 0x0061 Latin Small Letter A
{ 0x7F,0x48,0x44,0x44,0x38}, // ( 66) b - 0x0062 Latin Small Letter B
{ 0x38,0x44,0x44,0x44,0x20}, // ( 67) c - 0x0063 Latin Small Letter C
{ 0x38,0x44,0x44,0x48,0x7F}, // ( 68) d - 0x0064 Latin Small Letter D
{ 0x38,0x54,0x54,0x54,0x18}, // ( 69) e - 0x0065 Latin Small Letter E
{ 0x08,0x7E,0x09,0x01,0x02}, // ( 70) f - 0x0066 Latin Small Letter F
{ 0x06,0x49,0x49,0x49,0x3F}, // ( 71) g - 0x0067 Latin Small Letter G
{ 0x7F,0x08,0x04,0x04,0x78}, // ( 72) h - 0x0068 Latin Small Letter H
{ 0x00,0x44,0x7D,0x40,0x00}, // ( 73) i - 0x0069 Latin Small Letter I
{ 0x20,0x40,0x44,0x3D,0x00}, // ( 74) j - 0x006A Latin Small Letter J
{ 0x7F,0x10,0x28,0x44,0x00}, // ( 75) k - 0x006B Latin Small Letter K
{ 0x00,0x41,0x7F,0x40,0x00}, // ( 76) l - 0x006C Latin Small Letter L
{ 0x7C,0x04,0x18,0x04,0x7C}, // ( 77) m - 0x006D Latin Small Letter M
{ 0x7C,0x08,0x04,0x04,0x78}, // ( 78) n - 0x006E Latin Small Letter N
{ 0x38,0x44,0x44,0x44,0x38}, // ( 79) o - 0x006F Latin Small Letter O
{ 0x7C,0x14,0x14,0x14,0x08}, // ( 80) p - 0x0070 Latin Small Letter P
{ 0x08,0x14,0x14,0x18,0x7C}, // ( 81) q - 0x0071 Latin Small Letter Q
{ 0x7C,0x08,0x04,0x04,0x08}, // ( 82) r - 0x0072 Latin Small Letter R
{ 0x48,0x54,0x54,0x54,0x20}, // ( 83) s - 0x0073 Latin Small Letter S
{ 0x04,0x3F,0x44,0x40,0x20}, // ( 84) t - 0x0074 Latin Small Letter T
{ 0x3C,0x40,0x40,0x20,0x7C}, // ( 85) u - 0x0075 Latin Small Letter U
{ 0x1C,0x20,0x40,0x20,0x1C}, // ( 86) v - 0x0076 Latin Small Letter V
{ 0x3C,0x40,0x30,0x40,0x3C}, // ( 87) w - 0x0077 Latin Small Letter W
{ 0x44,0x28,0x10,0x28,0x44}, // ( 88) x - 0x0078 Latin Small Letter X
{ 0x0C,0x50,0x50,0x50,0x3C}, // ( 89) y - 0x0079 Latin Small Letter Y
{ 0x44,0x64,0x54,0x4C,0x44}, // ( 90) z - 0x007A Latin Small Letter Z
{ 0x00,0x08,0x36,0x41,0x00}, // ( 91) { - 0x007B Left Curly Bracket
{ 0x00,0x00,0x7F,0x00,0x00}, // ( 92) | - 0x007C Vertical Line
{ 0x00,0x41,0x36,0x08,0x00}, // ( 93) } - 0x007D Right Curly Bracket
{ 0x02,0x01,0x02,0x04,0x02}, // ( 94) ~ - 0x007E Tilde
{ 0x3E,0x55,0x55,0x41,0x22}, // ( 95) C - 0x0080 <Control>
{ 0x00,0x00,0x00,0x00,0x00}, // ( 96) - 0x00A0 No-Break Space
{ 0x00,0x00,0x79,0x00,0x00}, // ( 97) ! - 0x00A1 Inverted Exclamation Mark
{ 0x18,0x24,0x74,0x2E,0x24}, // ( 98) c - 0x00A2 Cent Sign
{ 0x48,0x7E,0x49,0x42,0x40}, // ( 99) L - 0x00A3 Pound Sign
{ 0x5D,0x22,0x22,0x22,0x5D}, // (100) o - 0x00A4 Currency Sign
{ 0x15,0x16,0x7C,0x16,0x15}, // (101) Y - 0x00A5 Yen Sign
{ 0x00,0x00,0x77,0x00,0x00}, // (102) | - 0x00A6 Broken Bar
{ 0x0A,0x55,0x55,0x55,0x28}, // (103) - 0x00A7 Section Sign
{ 0x00,0x01,0x00,0x01,0x00}, // (104) " - 0x00A8 Diaeresis
{ 0x00,0x0A,0x0D,0x0A,0x04}, // (105) - 0x00AA Feminine Ordinal Indicator
{ 0x08,0x14,0x2A,0x14,0x22}, // (106) << - 0x00AB Left-Pointing Double Angle Quotation Mark
{ 0x04,0x04,0x04,0x04,0x1C}, // (107) - 0x00AC Not Sign
{ 0x00,0x08,0x08,0x08,0x00}, // (108) - - 0x00AD Soft Hyphen
{ 0x01,0x01,0x01,0x01,0x01}, // (109) - 0x00AF Macron
{ 0x00,0x02,0x05,0x02,0x00}, // (110) - 0x00B0 Degree Sign
{ 0x44,0x44,0x5F,0x44,0x44}, // (111) +- - 0x00B1 Plus-Minus Sign
{ 0x00,0x00,0x04,0x02,0x01}, // (112) ` - 0x00B4 Acute Accent
{ 0x7E,0x20,0x20,0x10,0x3E}, // (113) u - 0x00B5 Micro Sign
{ 0x06,0x0F,0x7F,0x00,0x7F}, // (114) - 0x00B6 Pilcrow Sign
{ 0x00,0x18,0x18,0x00,0x00}, // (115) . - 0x00B7 Middle Dot
{ 0x00,0x40,0x50,0x20,0x00}, // (116) - 0x00B8 Cedilla
{ 0x00,0x0A,0x0D,0x0A,0x00}, // (117) - 0x00BA Masculine Ordinal Indicator
{ 0x22,0x14,0x2A,0x14,0x08}, // (118) >> - 0x00BB Right-Pointing Double Angle Quotation Mark
{ 0x17,0x08,0x34,0x2A,0x7D}, // (119) /4 - 0x00BC Vulgar Fraction One Quarter
{ 0x17,0x08,0x04,0x6A,0x59}, // (120) /2 - 0x00BD Vulgar Fraction One Half
{ 0x30,0x48,0x45,0x40,0x20}, // (121) ? - 0x00BE Inverted Question Mark
{ 0x42,0x00,0x42,0x00,0x42}, // (122) - 0x00BF Bargraph - 0
{ 0x7E,0x42,0x00,0x42,0x00}, // (123) - 0x00BF Bargraph - 1
{ 0x7E,0x7E,0x00,0x42,0x00}, // (124) - 0x00BF Bargraph - 2
{ 0x7E,0x7E,0x7E,0x42,0x00}, // (125) - 0x00BF Bargraph - 3
{ 0x7E,0x7E,0x7E,0x7E,0x00}, // (126) - 0x00BF Bargraph - 4
{ 0x7E,0x7E,0x7E,0x7E,0x7E}, // (127) - 0x00BF Bargraph - 5
};
#define OLED_address 0x3C // OLED at address 0x3C in 7bit
void i2c_OLED_send_cmd(uint8_t command) {
i2cWrite(OLED_address, 0x80, command);
}
void i2c_OLED_send_byte(uint8_t val) {
i2cWrite(OLED_address, 0x40, val);
}
void i2c_OLED_set_XY(uint8_t col, uint8_t row) { // Not used in MW V2.0 but its here anyway!
i2c_OLED_send_cmd(0xb0+row); //set page address
i2c_OLED_send_cmd(0x00+(8*col&0x0f)); //set low col address
i2c_OLED_send_cmd(0x10+((8*col>>4)&0x0f)); //set high col address
}
void i2c_OLED_set_line(uint8_t row) { // goto the beginning of a single row, compattible with LCD_CONFIG
i2c_OLED_send_cmd(0xb0+row); //set page address
i2c_OLED_send_cmd(0); //set low col address
i2c_OLED_send_cmd(0x10); //set high col address
}
unsigned char CHAR_FORMAT = 0; // use to INVERSE characters
// use INVERSE CHAR_FORMAT = 0b01111111;
// use NORMAL CHAR_FORMAT = 0;
void i2c_OLED_send_char(unsigned char ascii){
unsigned char i;
uint8_t buffer;
for(i=0;i<5;i++){
buffer = multiWiiFont[ascii - 32][i];
buffer ^= CHAR_FORMAT; // apply
i2c_OLED_send_byte(buffer);
}
i2c_OLED_send_byte(CHAR_FORMAT); // the gap
}
void i2c_OLED_send_string(const char *string){
// Sends a string of chars until null terminator
unsigned char i=0;
uint8_t buffer;
while(*string){
for(i=0;i<5;i++){
buffer = multiWiiFont[(*string)- 32][i];
buffer ^= CHAR_FORMAT;
i2c_OLED_send_byte((unsigned char)buffer);
}
i2c_OLED_send_byte(CHAR_FORMAT); // the gap
*string++;
}
}
void ug2864hsweg01InitI2C(void){
i2c_OLED_send_cmd(0xae); //display off
i2c_OLED_send_cmd(0xa4); //SET All pixels OFF
// i2c_OLED_send_cmd(0xa5); //SET ALL pixels ON
delay(50);
i2c_OLED_send_cmd(0x20); //Set Memory Addressing Mode
i2c_OLED_send_cmd(0x02); //Set Memory Addressing Mode to Page addressing mode(RESET)
// i2c_OLED_send_cmd(0xa0); //colum address 0 mapped to SEG0 (POR)*** wires at bottom
i2c_OLED_send_cmd(0xa1); //colum address 127 mapped to SEG0 (POR) ** wires at top of board
// i2c_OLED_send_cmd(0xC0); // Scan from Right to Left (POR) *** wires at bottom
i2c_OLED_send_cmd(0xC8); // Scan from Left to Right ** wires at top
i2c_OLED_send_cmd(0xa6); // Set WHITE chars on BLACK backround
// i2c_OLED_send_cmd(0xa7); // Set BLACK chars on WHITE backround
i2c_OLED_send_cmd(0x81); // Setup CONTRAST CONTROL, following byte is the contrast Value
i2c_OLED_send_cmd(0xaf); // contrast value between 1 ( == dull) to 256 ( == bright)
// i2c_OLED_send_cmd(0xd3); // Display Offset :
// i2c_OLED_send_cmd(0x0); // 0
// delay(20);
// i2c_OLED_send_cmd(0x40); // Display start line [0;63] -> [0x40;0x7f]
// delay(20);
#ifdef DISPLAY_FONT_DSIZE
i2c_OLED_send_cmd(0xd6); // zoom
i2c_OLED_send_cmd(0x01); // on
#else
// i2c_OLED_send_cmd(0xd6); // zoom
// i2c_OLED_send_cmd(0x00); // off
#endif
delay(20);
i2c_OLED_send_cmd(0xaf); //display on
delay(20);
}

View File

@ -0,0 +1,23 @@
/*
* This file is part of Cleanflight.
*
* Cleanflight is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Cleanflight is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void ug2864hsweg01InitI2C(void);
void i2c_OLED_set_line(uint8_t row);
void i2c_OLED_send_string(const char *string);

View File

@ -37,6 +37,7 @@
#include "drivers/pwm_mapping.h"
#include "drivers/pwm_rx.h"
#include "drivers/adc.h"
#include "drivers/display_ug2864hsweg01.h"
#include "flight/flight.h"
#include "flight/mixer.h"
@ -91,7 +92,7 @@ void navigationInit(gpsProfile_t *initialGpsProfile, pidProfile_t *pidProfile);
bool sensorsAutodetect(sensorAlignmentConfig_t *sensorAlignmentConfig, uint16_t gyroLpf, uint8_t accHardwareToUse, int16_t magDeclinationFromConfig);
void imuInit(void);
void ledStripInit(void);
void displayInit(void);
void loop(void);
// FIXME bad naming - this appears to be for some new board that hasn't been made available yet.
@ -116,6 +117,10 @@ void productionDebug(void)
}
#endif
void displayInit(void)
{
ug2864hsweg01InitI2C();
}
void init(void)
{
uint8_t i;
@ -295,6 +300,13 @@ int main(void) {
init();
while (1) {
#if 1
delay(200);
displayInit();
delay(100);
i2c_OLED_set_line(0);
i2c_OLED_send_string("TEST");
#endif
loop();
processLoopback();
}