From 072f305cfea976731a5e476f8d62840ddbfe11b7 Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 5 Mar 2014 11:47:30 +0100 Subject: [PATCH] 3 more files removed --- radio/bootloader/include/gtime.h | 63 --------------- radio/bootloader/include/integer.h | 70 ----------------- radio/bootloader/include/lcd.h | 122 ----------------------------- 3 files changed, 255 deletions(-) delete mode 100644 radio/bootloader/include/gtime.h delete mode 100644 radio/bootloader/include/integer.h delete mode 100644 radio/bootloader/include/lcd.h diff --git a/radio/bootloader/include/gtime.h b/radio/bootloader/include/gtime.h deleted file mode 100644 index 8126d8375..000000000 --- a/radio/bootloader/include/gtime.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Authors (alphabetical order) - * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini - * - Thomas Husterer - * - * open9x is based on code named - * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, - * er9x by Erez Raviv: http://code.google.com/p/er9x/, - * and the original (and ongoing) project by - * Thomas Husterer, th9x: http://code.google.com/p/th9x/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program 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. - * - */ - -#ifndef g9x_time_h -#define g9x_time_h - -#include -#include - -#undef CHAR_BIT -#define CHAR_BIT 8 - -typedef long int gtime_t; - -struct gtm -{ - int8_t tm_sec; /* Seconds. [0-60] (1 leap second) */ - int8_t tm_min; /* Minutes. [0-59] */ - int8_t tm_hour; /* Hours. [0-23] */ - int8_t tm_mday; /* Day. [1-31] */ - int8_t tm_mon; /* Month. [0-11] */ - int8_t tm_year; /* Year - 1900. Limited to the year 2115. Oh no! :P */ - int8_t tm_wday; /* Day of week. [0-6] */ - int16_t tm_yday; /* Day of year. [0-365] Needed internally for calculations */ -}; - -extern const unsigned short int __mon_yday[2][13]; - -extern gtime_t gmktime(struct gtm *tp); -extern gtime_t filltm(gtime_t *t, struct gtm *tp); - -#endif - diff --git a/radio/bootloader/include/integer.h b/radio/bootloader/include/integer.h deleted file mode 100644 index 608873bdf..000000000 --- a/radio/bootloader/include/integer.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Authors (alphabetical order) - * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini - * - Thomas Husterer - * - * open9x is based on code named - * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, - * er9x by Erez Raviv: http://code.google.com/p/er9x/, - * and the original (and ongoing) project by - * Thomas Husterer, th9x: http://code.google.com/p/th9x/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program 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. - * - */ - -/*-------------------------------------------*/ -/* Integer type definitions for FatFs module */ -/*-------------------------------------------*/ - -#ifndef _INTEGER -#define _INTEGER - -#ifdef _WIN32 /* FatFs development platform */ - -#include -#include - -#else /* Embedded platform */ - -/* These types must be 16-bit, 32-bit or larger integer */ -typedef int INT; -typedef unsigned int UINT; - -/* These types must be 8-bit integer */ -typedef char CHAR; -typedef unsigned char UCHAR; -typedef unsigned char BYTE; - -/* These types must be 16-bit integer */ -typedef short SHORT; -typedef unsigned short USHORT; -typedef unsigned short WORD; -typedef unsigned short WCHAR; - -/* These types must be 32-bit integer */ -typedef long LONG; -typedef unsigned long ULONG; -typedef unsigned long DWORD; - -#endif - -#endif diff --git a/radio/bootloader/include/lcd.h b/radio/bootloader/include/lcd.h deleted file mode 100644 index a9e39d09e..000000000 --- a/radio/bootloader/include/lcd.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Author - Mike Blandford - * - * Based on er9x by Erez Raviv - * - * which was Based on th9x -> http://code.google.com/p/th9x/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program 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. - * - */ - -// This version for ARM based ERSKY9X board - -#ifndef lcd_h -#define lcd_h - -#ifdef PCBTARANIS -#define DISPLAY_W 212 -#define DISPLAY_H 64 -#endif - -#ifdef PCBSKY -#define DISPLAY_W 128 -#define DISPLAY_H 64 -#endif - -#define FW 6 -#define FWNUM 5 -#define FH 8 - -/* lcd common flags */ -#define INVERS 0x01 -#define BLINK 0x02 -#define DBLSIZE 0x04 -#define CONDENSED 0x08 - -// putsChnRaw flags -#define MIX_SOURCE 0x10 - -/* lcd outdez flags */ -#define LEADING0 0x10 -#define PREC1 0x20 -#define PREC2 0x30 /* 4 modes in 2bits! */ -#define LEFT 0x40 /* align left */ - -/* time & telemetry flags */ -#define NO_UNIT 0x80 - - - -extern uint8_t LcdLock ; -extern uint8_t LcdInputs ; - -extern uint8_t Lcd_lastPos; -extern uint8_t DisplayBuf[] ; - -extern const uint8_t font_se_extra[] ; -extern const uint8_t font_fr_extra[] ; -extern const uint8_t font_de_extra[] ; - -extern const uint8_t font_se_big_extra[] ; -extern const uint8_t font_fr_big_extra[] ; -extern const uint8_t font_de_big_extra[] ; - -extern const uint8_t *ExtraFont ; -extern const uint8_t *ExtraBigFont ; - -#define PLOT_XOR 0 -#define PLOT_BLACK 1 -#define PLOT_WHITE 2 - -extern uint8_t plotType ; - -extern void lcd_putc(uint8_t x,uint8_t y,const char c ) ; -extern uint8_t lcd_putcAtt( uint8_t x, uint8_t y, const char c, uint8_t mode ) ; -extern void lcd_putsAttIdx(uint8_t x,uint8_t y,const char * s,uint8_t idx,uint8_t att) ; -extern void lcd_putsnAtt(uint8_t x,uint8_t y,const char * s,uint8_t len,uint8_t mode) ; -extern void lcd_putsn_P(uint8_t x,uint8_t y,const char * s,uint8_t len) ; -extern void lcd_outhex4(uint8_t x,uint8_t y,uint16_t val) ; -extern void lcd_outhex2(uint8_t x,uint8_t y,uint8_t val) ; -extern void lcd_img( uint8_t i_x, uint8_t i_y, const unsigned char *imgdat, uint8_t idx, uint8_t mode ) ; -extern uint8_t lcd_putsAtt( uint8_t x, uint8_t y, const char *s, uint8_t mode ) ; -extern void lcd_puts_Pleft( uint8_t y, const char *s ) ; -extern void lcd_puts_P( uint8_t x, uint8_t y, const char *s ) ; -extern void lcd_outdez( uint8_t x, uint8_t y, int16_t val ) ; -extern void lcd_outdezAtt( uint8_t x, uint8_t y, int16_t val, uint8_t mode ) ; -extern void lcd_outdezNAtt( uint8_t x, uint8_t y, int32_t val, uint8_t mode, int8_t len ) ; - -extern void lcd_hbar( uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t percent ) ; -extern void lcd_rect(uint8_t x, uint8_t y, uint8_t w, uint8_t h ) ; -extern void lcd_char_inverse( uint8_t x, uint8_t y, uint8_t w, uint8_t blink ) ; -extern void lcd_plot( uint8_t x, uint8_t y ) ; -extern void lcd_hlineStip( unsigned char x, unsigned char y, signed char w, uint8_t pat ) ; -extern void lcd_hline( uint8_t x, uint8_t y, int8_t w ) ; -extern void lcd_vline( uint8_t x, uint8_t y, int8_t h ) ; -extern void lcd_clear( void ) ; -extern void lcd_init( void ) ; -extern void lcdSetRefVolt(uint8_t val) ; -extern void lcdSendCtl(uint8_t val) ; -extern void refreshDisplay( void ) ; - -extern void putsTime(uint8_t x,uint8_t y,int16_t tme,uint8_t att,uint8_t att2) ; -extern void putsVolts(uint8_t x,uint8_t y, uint8_t volts, uint8_t att) ; -extern void putsVBat(uint8_t x,uint8_t y,uint8_t att) ; - -#ifdef PCBTARANIS -extern void backlight_set( uint16_t brightness ) ; -#endif - -#define BLINK_ON_PHASE (g_blinkTmr10ms & (1<<6)) -#define BLINK_SYNC g_blinkTmr10ms = (3<<5) - -#endif - -