mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent 52e2829082 891e36bff4
commit 89dd15ca8f
15 changed files with 163 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/vfd.h
View File

@@ -42,7 +42,7 @@
#include <pthread.h>
#include <string>
#include <coolstream/cs_vfd.h>
#include <coolstream/cs_frontpanel.h>
class CVFD
{
@@ -143,7 +143,7 @@ class CVFD
void Lock();
void Unlock();
void Clear();
void ShowIcon(vfd_icon icon, bool show);
void ShowIcon(fp_icon icon, bool show);
void ShowText(const char *str);
void wake_up();
MODES getMode(void) { return mode; };