Skip to content

Commit

Permalink
Merge pull request #375 from FujiNetWIFI/tape
Browse files Browse the repository at this point in the history
Tape
  • Loading branch information
tschak909 committed Oct 23, 2020
2 parents 4ea9342 + d79a234 commit 10b43a6
Show file tree
Hide file tree
Showing 11 changed files with 1,155 additions and 485 deletions.
Binary file added data/hello.cas
Binary file not shown.
1 change: 1 addition & 0 deletions data/www/debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[1018/175245.322:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
1,003 changes: 688 additions & 315 deletions data/www/index.html

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions include/version.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/*
This file is automatically modified by the build_version.py script
to update the BUILD and BUILD_DATE values based on the
current Git commit ID and current UTC date/time.
FN_VERSION_MAJOR and FN_VERSION_MINOR should be manually updated
as needed.
*/

#define FN_VERSION_MAJOR 0
#define FN_VERSION_MINOR 5

#define FN_VERSION_BUILD "8934daff"

#define FN_VERSION_DATE "2020-10-20 17:57:42"

#define FN_VERSION_FULL "0.5.8934daff"
/*
This file is automatically modified by the build_version.py script
to update the BUILD and BUILD_DATE values based on the
current Git commit ID and current UTC date/time.
FN_VERSION_MAJOR and FN_VERSION_MINOR should be manually updated
as needed.
*/

#define FN_VERSION_MAJOR 0
#define FN_VERSION_MINOR 5

#define FN_VERSION_BUILD "8934daff"

#define FN_VERSION_DATE "2020-10-20 17:57:42"

#define FN_VERSION_FULL "0.5.8934daff"
18 changes: 17 additions & 1 deletion lib/http/httpServiceConfigurator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#include "printerlist.h"
#include "utils.h"

#include "fuji.h"
extern sioFuji theFuji;

// TODO: This was copied from another source and needs some bounds-checking!
char* fnHttpServiceConfigurator::url_decode(char *dst, const char *src, size_t dstsize)
{
Expand Down Expand Up @@ -149,6 +152,14 @@ void fnHttpServiceConfigurator::config_rotation_sounds(std::string rotation_soun
Config.save();
}

void fnHttpServiceConfigurator::config_cassette(std::string play_record)
{
Debug_printf("New play/record button value: %s\n", play_record.c_str());
theFuji.cassette()->set_buttons(play_record.c_str());
// call the cassette buttons function passing play_record.c_str()
// find cassette via thefuji object?
}

void fnHttpServiceConfigurator::config_midimaze(std::string hostname)
{
Debug_printf("Set MIDIMaze host: %s\n", hostname.c_str());
Expand Down Expand Up @@ -250,7 +261,12 @@ int fnHttpServiceConfigurator::process_config_post(const char * postdata, size_t
} else if(i->first.compare("midimaze_host") == 0)
{
config_midimaze(i->second);
} else if(i->first.compare("rotation_sounds") == 0)
}
else if (i->first.compare("play_record") == 0)
{
config_cassette(i->second);
}
else if (i->first.compare("rotation_sounds") == 0)
{
config_rotation_sounds(i->second);
}
Expand Down
1 change: 1 addition & 0 deletions lib/http/httpServiceConfigurator.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class fnHttpServiceConfigurator
static void config_hsio(std::string hsio_index);
static void config_timezone(std::string timezone);
static void config_midimaze(std::string host_ip);
static void config_cassette(std::string play_record);
static void config_rotation_sounds(std::string rotation_sounds);

public:
Expand Down
Loading

0 comments on commit 10b43a6

Please sign in to comment.