Merge branch 'master' of github.com:p42/project42
This commit is contained in:
bsx
commit
2b40528b88
2
Makefile
2
Makefile
|
|
@ -27,9 +27,9 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o
|
|||
##########################################################################
|
||||
LDLIBS = -lm
|
||||
LDLIBS += -Lmodules -lmodules
|
||||
LDLIBS += -Lfilesystem -lfat
|
||||
LDLIBS += -Lcore -lcore
|
||||
LDLIBS += -Llcd -llcd
|
||||
LDLIBS += -Lfilesystem -lfat
|
||||
OCFLAGS = --strip-unneeded
|
||||
|
||||
LD_PATH = lpc1xxx
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,285 @@
|
|||
#include <sysinit.h>
|
||||
|
||||
#include "basic/basic.h"
|
||||
|
||||
#include "lcd/render.h"
|
||||
#include "lcd/backlight.h"
|
||||
#include "lcd/allfonts.h"
|
||||
|
||||
#include "filesystem/ff.h"
|
||||
|
||||
void incBacklight(void);
|
||||
void decBacklight(void);
|
||||
void gotoISP(void);
|
||||
void fs_list(void);
|
||||
void fs_create(void);
|
||||
void fs_format(void);
|
||||
void fs_status(void);
|
||||
void fs_mount(void);
|
||||
|
||||
/**************************************************************************/
|
||||
|
||||
struct MENU_DEF {
|
||||
char *text;
|
||||
void (*callback)(void);
|
||||
};
|
||||
|
||||
typedef const struct MENU_DEF * menuentry;
|
||||
|
||||
struct MENU {
|
||||
char *title;
|
||||
menuentry *entries;
|
||||
};
|
||||
|
||||
const struct MENU_DEF menu_incBL = {"Backlight++", &incBacklight};
|
||||
const struct MENU_DEF menu_decBL = {"Backlight--", &decBacklight};
|
||||
const struct MENU_DEF menu_ISP = {"Invoke ISP", &gotoISP};
|
||||
const struct MENU_DEF menu_status = {"FS Status", &fs_status};
|
||||
const struct MENU_DEF menu_mount = {"FS Mount", &fs_mount};
|
||||
const struct MENU_DEF menu_list = {"FS List", &fs_list};
|
||||
const struct MENU_DEF menu_create = {"FS Create", &fs_create};
|
||||
const struct MENU_DEF menu_format = {"FS format", &fs_format};
|
||||
const struct MENU_DEF menu_nop = {"---", NULL};
|
||||
|
||||
static menuentry menu[] = {
|
||||
&menu_ISP,
|
||||
&menu_incBL,
|
||||
&menu_decBL,
|
||||
&menu_mount,
|
||||
&menu_status,
|
||||
&menu_format,
|
||||
&menu_nop,
|
||||
&menu_list,
|
||||
&menu_create,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const struct MENU mainmenu = {"Mainmenu", menu};
|
||||
|
||||
void handleMenu(const struct MENU *the_menu) ;
|
||||
|
||||
void module_fs(void) {
|
||||
|
||||
backlightInit();
|
||||
|
||||
font_direction = FONT_DIR_LTR; // LeftToRight is the default
|
||||
|
||||
while (1) {
|
||||
lcdDisplay(0);
|
||||
delayms(10);
|
||||
|
||||
lcdFill(0); // clear display buffer
|
||||
|
||||
handleMenu(&mainmenu);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void handleMenu(const struct MENU *the_menu) {
|
||||
uint8_t back = 0;
|
||||
int8_t menuselection = 0;
|
||||
uint8_t numentries = 0;
|
||||
uint8_t visible_lines = 0;
|
||||
uint8_t current_offset = 0;
|
||||
|
||||
if (the_menu == NULL) return;
|
||||
|
||||
font = &Font_7x8;
|
||||
|
||||
for (numentries = 0; the_menu->entries[numentries] != NULL; numentries++);
|
||||
|
||||
visible_lines = RESY/font->u8Height;
|
||||
|
||||
if (visible_lines < 2) return;
|
||||
|
||||
visible_lines--; // subtract title line
|
||||
|
||||
while (!back) {
|
||||
uint8_t line = 0;
|
||||
|
||||
lcdFill(0); // clear display buffer
|
||||
|
||||
DoString(0, line, the_menu->title);
|
||||
line += font->u8Height;
|
||||
|
||||
for (uint8_t i = current_offset; i < (visible_lines + current_offset) && i < numentries; i++) {
|
||||
DoString(14, line, the_menu->entries[i]->text);
|
||||
if (i == menuselection) {
|
||||
DoString(0, line, "* ");
|
||||
}
|
||||
line += font->u8Height;
|
||||
}
|
||||
|
||||
lcdDisplay(0);
|
||||
|
||||
switch (getInput()) {
|
||||
case BTN_UP:
|
||||
menuselection--;
|
||||
if (menuselection < current_offset) {
|
||||
if (menuselection < 0) {
|
||||
menuselection = numentries-1;
|
||||
current_offset = ((numentries-1)/visible_lines) * visible_lines;
|
||||
} else {
|
||||
current_offset -= visible_lines;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BTN_DOWN:
|
||||
menuselection++;
|
||||
if (menuselection > (current_offset + visible_lines-1) || menuselection >= numentries) {
|
||||
if (menuselection >= numentries) {
|
||||
menuselection = 0;
|
||||
current_offset = 0;
|
||||
} else {
|
||||
current_offset += visible_lines;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BTN_LEFT:
|
||||
return;
|
||||
case BTN_RIGHT:
|
||||
if (the_menu->entries[menuselection]->callback!=NULL)
|
||||
the_menu->entries[menuselection]->callback();
|
||||
break;
|
||||
case BTN_ENTER:
|
||||
lcdFill(0);
|
||||
if (the_menu->entries[menuselection]->callback!=NULL)
|
||||
the_menu->entries[menuselection]->callback();
|
||||
lcdDisplay(0);
|
||||
while (getInput()==BTN_NONE) delayms(10);
|
||||
|
||||
break;
|
||||
default:
|
||||
/* no button pressed */
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void incBacklight(void) {
|
||||
uint32_t brightness = backlightGetBrightness();
|
||||
if (brightness < 100) {
|
||||
backlightSetBrightness(brightness + 10);
|
||||
}
|
||||
}
|
||||
|
||||
void decBacklight(void) {
|
||||
uint32_t brightness = backlightGetBrightness();
|
||||
if (brightness > 0) {
|
||||
backlightSetBrightness(brightness - 10);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void tick_fs(void){
|
||||
static int foo=0;
|
||||
static int toggle=0;
|
||||
if(foo++>50){
|
||||
toggle=1-toggle;
|
||||
foo=0;
|
||||
gpioSetValue (RB_LED0, toggle);
|
||||
};
|
||||
return;
|
||||
};
|
||||
|
||||
void gotoISP(void) {
|
||||
DoString(0,0,"Enter ISP!");
|
||||
lcdDisplay(0);
|
||||
ISPandReset(5);
|
||||
}
|
||||
|
||||
void fs_list(void){
|
||||
};
|
||||
|
||||
void fs_read(void){
|
||||
};
|
||||
|
||||
void fs_create(void){
|
||||
};
|
||||
|
||||
void fs_format(void){
|
||||
f_mkfs(0,1,0);
|
||||
};
|
||||
|
||||
void put_rc (FRESULT rc)
|
||||
{
|
||||
const TCHAR *p =
|
||||
_T("OK\0DISK_ERR\0INT_ERR\0NOT_READY\0NO_FILE\0NO_PATH\0INVALID_NAME\0")
|
||||
_T("DENIED\0EXIST\0INVALID_OBJECT\0WRITE_PROTECTED\0INVALID_DRIVE\0")
|
||||
_T("NOT_ENABLED\0NO_FILE_SYSTEM\0MKFS_ABORTED\0TIMEOUT\0LOCKED\0")
|
||||
_T("NOT_ENOUGH_CORE\0TOO_MANY_OPEN_FILES\0");
|
||||
FRESULT i;
|
||||
|
||||
for (i = 0; i != rc && *p; i++) {
|
||||
while(*p++) ;
|
||||
}
|
||||
DoString(0,0,p);
|
||||
}
|
||||
|
||||
|
||||
|
||||
long p1, p2, p3;
|
||||
FATFS FatFs[_VOLUMES]; /* File system object for logical drive */
|
||||
//BYTE Buff[32768]; /* Working buffer */
|
||||
FRESULT res;
|
||||
FATFS *fs; /* Pointer to file system object */
|
||||
static const BYTE ft[] = {0, 12, 16, 32};
|
||||
|
||||
void fs_mount(void){
|
||||
put_rc(f_mount(0, &FatFs[0]));
|
||||
};
|
||||
|
||||
void fs_status(void){
|
||||
int dx;
|
||||
int dy=8;
|
||||
|
||||
DWORD clusters;
|
||||
|
||||
res = f_getfree("/", &clusters, &fs);
|
||||
put_rc(res);
|
||||
if(res){
|
||||
return;
|
||||
};
|
||||
|
||||
dx=DoString(0,dy,"FAT type:");
|
||||
dx=DoInt(dx,dy,ft[fs->fs_type & 3]);
|
||||
dx=DoString(dx,dy,"/noFats:");
|
||||
dx=DoInt(dx,dy,fs->n_fats);
|
||||
|
||||
dy+=8;
|
||||
dx=DoString(0,dy,"s/c-size:");
|
||||
dx=DoInt(dx,dy,fs->csize);
|
||||
dx=DoString(dx,dy,"*");
|
||||
dx=DoInt(dx,dy,512);
|
||||
|
||||
/*
|
||||
|
||||
if (fs->fs_type != FS_FAT32) _tprintf(_T("Root DIR entries = %u\n"), fs->n_rootdir);
|
||||
_tprintf(_T("Sectors/FAT = %lu\nNumber of clusters = %lu\nFAT start sector = %lu\nDIR start %s = %lu\nData start sector = %lu\n\n..."),
|
||||
fs->fsize, fs->n_fatent - 2, fs->fatbase, fs->fs_type == FS_FAT32 ? "cluster" : "sector", fs->dirbase, fs->database);
|
||||
acc_size = acc_files = acc_dirs = 0;
|
||||
res = scan_files(ptr);
|
||||
if (res) { put_rc(res); break; }
|
||||
p2 = (fs->n_fatent - 2) * fs->csize;
|
||||
p3 = p1 * fs->csize;
|
||||
#if _MAX_SS != 512
|
||||
p2 *= fs->ssize / 512;
|
||||
p3 *= fs->ssize / 512;
|
||||
#endif
|
||||
p2 /= 2;
|
||||
p3 /= 2;
|
||||
_tprintf(_T("\r%u files, %I64u bytes.\n%u folders.\n%lu KB total disk space.\n"),
|
||||
acc_files, acc_size, acc_dirs, p2);
|
||||
_tprintf(_T("%lu KB available.\n"), p3);
|
||||
*/
|
||||
};
|
||||
|
||||
DWORD get_fattime () {
|
||||
// ToDo!
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue