rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing two errores with networking

Browse Source
This commit is contained in:
Johannes Wendel
2019-10-28 16:38:33 +01:00
parent fa152c6c54
commit 8791f85857
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/src/.directory Normal file
View File

@@ -0,0 +1,6 @@
[Dolphin]
Timestamp=2019,5,6,20,16,26
Version=4
[Settings]
HiddenFilesShown=true

2
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -31,7 +31,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
{ {
utility::LoggerFactory::CreateOutputLogger(); utility::LoggerFactory::CreateOutputLogger();
std::shared_ptr<std::mutex> output_pin_mutex; auto output_pin_mutex = std::make_shared<std::mutex>();
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(output_pin_mutex)); std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(output_pin_mutex));
auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller); auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller);

2
FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
View File

@@ -15,7 +15,7 @@ namespace detail
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex, SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
const uint8_t &fire_address) : const uint8_t &fire_address) :
output_item_mutex(std::move(output_item_mutex)), output_item_mutex(output_item_mutex),
fire_address(fire_address) fire_address(fire_address)
{ {
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController"; CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController";

3
FlippR-Driver/src/output/items/detail/Sound.cpp
View File

@@ -29,7 +29,8 @@ Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, const uint
void Sound::play() void Sound::play()
{ {
CLOG(INFO, OUTPUT_LOGGER) << "Play Sound " << id << " " << name; CLOG(INFO, OUTPUT_LOGGER) << "Play Sound " << id << " " << name;
this->play_task = std::async(std::launch::async, &Sound::playTask, this); //this->play_task = std::async(std::launch::async, &Sound::playTask, this);
this->playTask();
} }
void Sound::playTask() void Sound::playTask()

16
cli/main.py
View File

@@ -51,10 +51,12 @@ def create_lamps_submenu(lamps):
return menu return menu
def create_lamp_submenu(lamp): def create_lamp_submenu(lamp):
args = list()
args.append(lamp['name'])
menu = CursesMenu("Lamps", lamp['name']) menu = CursesMenu("Lamps", lamp['name'])
activate_item = FunctionItem("Activate", networking.activateLamp, lamp['name']) activate_item = FunctionItem("Activate", networking.activateLamp, args)
deactivate_item = FunctionItem("Deactivate", networking.deactivateLamp, lamp['name']) deactivate_item = FunctionItem("Deactivate", networking.deactivateLamp, args)
status_item = FunctionItem("Status", print_lamp_status, lamp['name']) status_item = FunctionItem("Status", print_lamp_status, args)
menu.append_item(activate_item) menu.append_item(activate_item)
menu.append_item(deactivate_item) menu.append_item(deactivate_item)
menu.append_item(status_item) menu.append_item(status_item)
@@ -67,7 +69,9 @@ def print_lamp_status(lamp):
def create_displays_submenu(displays): def create_displays_submenu(displays):
menu = CursesMenu("Output", "Displays") menu = CursesMenu("Output", "Displays")
for display in displays: for display in displays:
fun_item = FunctionItem(display["name"], write_display_score, args=display["name"]) args = list()
args.append(display["name"])
fun_item = FunctionItem(display["name"], write_display_score, args)
menu.append_item(fun_item) menu.append_item(fun_item)
return menu return menu
@@ -78,7 +82,9 @@ def write_display_score(display):
def create_submenu(title, items, fun): def create_submenu(title, items, fun):
menu = CursesMenu("Output", title) menu = CursesMenu("Output", title)
for item in items: for item in items:
fun_item = FunctionItem(item["name"], fun, args=item["name"]) args = list()
args.append(item["name"])
fun_item = FunctionItem(item["name"], fun, args)
menu.append_item(fun_item) menu.append_item(fun_item)
return menu return menu