Skip to content

Commit

Permalink
Merge pull request #4 from CyBear-Jinni/master
Browse files Browse the repository at this point in the history
Pull
  • Loading branch information
guyluz11 authored Nov 3, 2020
2 parents 0736243 + f613d74 commit e0551fc
Show file tree
Hide file tree
Showing 9 changed files with 201 additions and 136 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

# Welcome!

This repository is in charge of controlling smart devices and is part of the [CyBear Jinni Smart Home](https://github.com/CyBear-Jinni/CBJ_Smart-Home.git) system.
This repository is in charge of controlling smart devices and is part of the [CyBear Jinni Smart Home](https://github.com/CyBear-Jinni/CBJ_Smart-Home) system.

These smart devices allow you to control lamps and blinds.
The softwer is writen in [dart](https://dart.dev) and allows you to control lamps and blinds.

You can control these devices using physical buttons and from the [CyBear Jinni App](https://github.com/CyBear-Jinni/CBJ_App.git).
You can control these devices using physical buttons and from the [CyBear Jinni App](https://github.com/CyBear-Jinni/CBJ_App).

This part is using the snap store in order to have easy way to update all the devices software versions with new features and security updates.

Expand All @@ -31,11 +31,11 @@ This part is using the snap store in order to have easy way to update all the de

### Smart device preparations:

Setting up instructions for the new device can be found in the [CyBear Jinni Smart Device Resources](https://github.com/CyBear-Jinni/CBJ_Smart-Device_Resources.git) repository.
Setting up instructions for the new device can be found in the [CyBear Jinni Smart Device Resources](https://github.com/CyBear-Jinni/CBJ_Smart-Device_Resources) repository.

It is recommended to lock the IP of the smart device in the router settings if you intend to use the local option and not just the remote (that is using google Firebase platform).

Explanations on how to connect the device with the app will be given in the [CyBear Jinni App](https://github.com/CyBear-Jinni/CBJ_App.git) Readme file.
Explanations on how to connect the device with the app will be given in the [CyBear Jinni App](https://github.com/CyBear-Jinni/CBJ_App) Readme file.


# Social Media Links
Expand Down
2 changes: 1 addition & 1 deletion SmartDeviceDart/bin/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:SmartDeviceDart/features/smart_device/infrastructure/datasources
void main(List<String> arguments) async {
print('Smart device is activated');

// await configureInjection(Env.dev_pi);
// await configureInjection(Env.dev_pi);
try {
SharedVariables(arguments[0]);
} catch (error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SmartDeviceManagerU {
/// Setting up all the device from the memory
_setDevicesUseCase.setAllDevices(deviceList: smartDeviceFromDb);

print(await getIps());
print('Device local IP: ${await getIps()}');

/// Start listen for in incoming connections from the local internet (LAN/Wifi)
_smartServerUseCase.waitForConnection(firebaseAccountsInformationD);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class SmartServerU extends SmartServerServiceBase {

final SmartServerU smartServer = SmartServerU();
smartServer.startListen(
firebaseAccountsInformationD); // Will go throw the model with the grpc logic and converter to objects
firebaseAccountsInformationD); // Will go throw the model with the
// grpc logic and converter to objects
}

/// Listening in the background to incoming connections
Expand All @@ -41,8 +42,8 @@ class SmartServerU extends SmartServerServiceBase {
if (firebaseAccountInformationD.areAllValuesNotNull()) {
CloudValueChangeU cloudValueChangeUseCases =
CloudValueChangeU(firebaseAccountInformationD);
cloudValueChangeUseCases
.listenToDataBase(); // Listen to changes in the database for this device
cloudValueChangeUseCases.listenToDataBase(); // Listen to changes in the
// database for this device
}
}

Expand Down
Loading

0 comments on commit e0551fc

Please sign in to comment.