72b1dc2 · unity8 · git.iko.soy

plugins/Lights/CMakeLists.txt+5−1

compare with xenial

unifiedsplit

@@ -1,5 +1,6 @@

1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

3

4

4include_directories(

5include_directories(

5 SYSTEM

6 SYSTEM

@@ -9,11 +10,14 @@ include_directories(

9add_library(Lights-qml MODULE

10add_library(Lights-qml MODULE

10 plugin.cpp

11 plugin.cpp

11 Lights.cpp

12 Lights.cpp

13+ LegacyLights.cpp

14+ HfdLights.cpp

12 )

15 )

13

16

14target_link_libraries(Lights-qml

17target_link_libraries(Lights-qml

15− Qt5::Qml Qt5::Gui

18+ Qt5::Qml Qt5::Gui Qt5::DBus

16 ${ANDROID_HARDWARE_LIBRARIES}

19 ${ANDROID_HARDWARE_LIBRARIES}

20+ ${ANDROID_PROPERTIES_LIBRARIES}

17 )

21 )

18

22

19add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

23add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

plugins/Lights/HfdLights.cppnew file+62

@@ -0,0 +1,62 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Florian Leeber <florian@ubports.com>

17+ */

18+

19+#include "HfdLights.h"

20+#include <QtCore/QDebug>

21+#include <QDBusArgument>

22+#include <QDBusConnection>

23+#include <iostream>

24+

25+#define HFD_SERVICE_NAME "com.lomiri.hfd"

26+#define HFD_SERVICE_PATH "/com/lomiri/hfd"

27+#define HFD_SERVICE_INTERFACE "com.lomiri.hfd.Leds"

28+

29+HfdLights::HfdLights(QObject* parent)

30+ : Lights(parent)

31+{

32+ m_hfdInterface = new QDBusInterface(

33+ QStringLiteral(HFD_SERVICE_NAME),

34+ QStringLiteral(HFD_SERVICE_PATH),

35+ QStringLiteral(HFD_SERVICE_INTERFACE),

36+ QDBusConnection::systemBus(),

37+ this

38+ );

39+}

40+

41+bool HfdLights::init()

42+{

43+ // hfd does not need any initalization to be used

44+ return true;

45+}

46+

47+void HfdLights::turnOn()

48+{

49+ m_hfdInterface->call(QStringLiteral("setState"), 0);

50+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)m_color.rgba());

51+ m_hfdInterface->call(QStringLiteral("setOnMs"), m_onMs);

52+ m_hfdInterface->call(QStringLiteral("setOffMs"), m_offMs);

53+ m_hfdInterface->call(QStringLiteral("setState"), 1);

54+}

55+

56+void HfdLights::turnOff()

57+{

58+ m_hfdInterface->call(QStringLiteral("setState"), 0);

59+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)0);

60+ m_hfdInterface->call(QStringLiteral("setOnMs"), 0);

61+ m_hfdInterface->call(QStringLiteral("setOffMs"), 0);

62+}

plugins/Lights/HfdLights.hnew file+42

@@ -0,0 +1,42 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Florian Leeber <florian@ubports.com>

17+ */

18+

19+#ifndef UNITY_HFDLIGHTS_H

20+#define UNITY_HFDLIGHTS_H

21+

22+#include <QtCore/QObject>

23+#include <QDBusInterface>

24+#include "Lights.h"

25+

26+class HfdLights: public Lights

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit HfdLights(QObject *parent = 0);

32+

33+protected:

34+ bool init() override;

35+ void turnOff() override;

36+ void turnOn() override;

37+

38+private:

39+ QDBusInterface* m_hfdInterface;

40+};

41+

42+#endif

plugins/Lights/LegacyLights.cppnew file+91

@@ -0,0 +1,91 @@

1+/*

4+ *

5+ * This program is free software; you can redistribute it and/or modify

6+ * it under the terms of the GNU General Public License as published by

7+ * the Free Software Foundation; version 3.

8+ *

9+ * This program is distributed in the hope that it will be useful,

10+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

11+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12+ * GNU General Public License for more details.

13+ *

14+ * You should have received a copy of the GNU General Public License

15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

16+ *

17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

18+ */

19+

20+#include "LegacyLights.h"

21+#include <QtCore/QDebug>

22+

23+extern "C" {

24+#include "android-hardware.h"

25+#include <string.h>

26+}

27+

28+LegacyLights::~LegacyLights()

29+{

30+ if (m_lightDevice) {

31+ hw_device_t* device = (hw_device_t*) m_lightDevice;

32+ device->close(device);

33+ }

34+}

35+

36+bool LegacyLights::init()

37+{

38+ if (m_lightDevice) {

39+ return true;

40+ }

41+

42+ int err;

43+ hw_module_t* module;

44+

45+ err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);

46+ if (err == 0) {

47+ hw_device_t* device;

48+ err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

49+ if (err == 0) {

50+ m_lightDevice = (light_device_t*)device;

51+ turnOff();

52+ return true;

53+ } else {

54+ qWarning() << "Failed to access notification lights";

55+ }

56+ } else {

57+ qWarning() << "Failed to initialize lights hardware.";

58+ }

59+ return false;

60+}

61+

62+void LegacyLights::turnOn()

63+{

64+ // pulse

65+ light_state_t state;

66+ memset(&state, 0, sizeof(light_state_t));

67+ state.color = m_color.rgba();

68+ state.flashMode = LIGHT_FLASH_TIMED;

69+ state.flashOnMS = m_onMs;

70+ state.flashOffMS = m_offMs;

71+ state.brightnessMode = BRIGHTNESS_MODE_USER;

72+

73+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

74+ qWarning() << "Failed to turn the light off";

75+ }

76+}

77+

78+void LegacyLights::turnOff()

79+{

80+ light_state_t state;

81+ memset(&state, 0, sizeof(light_state_t));

82+ state.color = 0x00000000;

83+ state.flashMode = LIGHT_FLASH_NONE;

84+ state.flashOnMS = 0;

85+ state.flashOffMS = 0;

86+ state.brightnessMode = 0;

87+

88+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

89+ qWarning() << "Failed to turn the light off";

90+ }

91+}

plugins/Lights/LegacyLights.hnew file+45

@@ -0,0 +1,45 @@

1+/*

4+ *

5+ * This program is free software; you can redistribute it and/or modify

6+ * it under the terms of the GNU General Public License as published by

7+ * the Free Software Foundation; version 3.

8+ *

9+ * This program is distributed in the hope that it will be useful,

10+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

11+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12+ * GNU General Public License for more details.

13+ *

14+ * You should have received a copy of the GNU General Public License

15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

16+ *

17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

18+ */

19+

20+#ifndef UNITY_LEGACYLIGHTS_H

21+#define UNITY_LEGACYLIGHTS_H

22+

23+#include <QtCore/QObject>

24+#include "Lights.h"

25+

26+struct light_device_t;

27+

28+class LegacyLights: public Lights

29+{

30+ Q_OBJECT

31+

32+public:

33+ ~LegacyLights();

34+

35+protected:

36+ bool init() override;

37+ void turnOff() override;

38+ void turnOn() override;

39+

40+private:

41+ light_device_t* m_lightDevice;

42+

43+};

44+

45+#endif

plugins/Lights/Lights.cpp−65

@@ -26,20 +26,12 @@ extern "C" {

26

27Lights::Lights(QObject* parent)

28 : QObject(parent),

29− m_lightDevice(0),

30 m_color("blue"),

29 m_color("blue"),

31 m_state(Lights::Off),

30 m_state(Lights::Off),

32 m_onMs(1000),

31 m_onMs(1000),

33 m_offMs(3000)

32 m_offMs(3000)

34{

33{

35−}

36

34

37−Lights::~Lights()

38−{

39− if (m_lightDevice) {

40− hw_device_t* device = (hw_device_t*) m_lightDevice;

41− device->close(device);

42− }

43}

35}

44

36

45void Lights::setState(Lights::State newState)

37void Lights::setState(Lights::State newState)

@@ -107,60 +99,3 @@ void Lights::setOffMillisec(int offMs)

107 // FIXME: update the property if the light is already on

99 // FIXME: update the property if the light is already on

108 }

100 }

109}

101}

110−

111−bool Lights::init()

112−{

113− if (m_lightDevice) {

114− return true;

115− }

116−

117− int err;

118− hw_module_t* module;

119−

120− err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);

121− if (err == 0) {

122− hw_device_t* device;

123− err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

124− if (err == 0) {

125− m_lightDevice = (light_device_t*)device;

126− turnOff();

127− return true;

128− } else {

129− qWarning() << "Failed to access notification lights";

130− }

131− } else {

132− qWarning() << "Failed to initialize lights hardware.";

133− }

134− return false;

135−}

136−

137−void Lights::turnOn()

138−{

139− // pulse

140− light_state_t state;

141− memset(&state, 0, sizeof(light_state_t));

142− state.color = m_color.rgba();

143− state.flashMode = LIGHT_FLASH_TIMED;

144− state.flashOnMS = m_onMs;

145− state.flashOffMS = m_offMs;

146− state.brightnessMode = BRIGHTNESS_MODE_USER;

147−

148− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

149− qWarning() << "Failed to turn the light off";

150− }

151−}

152−

153−void Lights::turnOff()

154−{

155− light_state_t state;

156− memset(&state, 0, sizeof(light_state_t));

157− state.color = 0x00000000;

158− state.flashMode = LIGHT_FLASH_NONE;

159− state.flashOnMS = 0;

160− state.flashOffMS = 0;

161− state.brightnessMode = 0;

162−

163− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

164− qWarning() << "Failed to turn the light off";

165− }

166−}

plugins/Lights/Lights.h+4−8

@@ -22,8 +22,6 @@

22#include <QtCore/QObject>

23#include <QtGui/QColor>

24

25−struct light_device_t;

26−

27class Lights: public QObject

25class Lights: public QObject

28{

26{

29 Q_OBJECT

27 Q_OBJECT

@@ -40,7 +38,6 @@ public:

40 Q_ENUM(State)

38 Q_ENUM(State)

41

39

42 explicit Lights(QObject *parent = 0);

40 explicit Lights(QObject *parent = 0);

43− ~Lights();

44

41

45 void setState(State newState);

42 void setState(State newState);

46 State state() const;

43 State state() const;

@@ -60,16 +57,15 @@ Q_SIGNALS:

60 void onMillisecChanged(int onMs);

57 void onMillisecChanged(int onMs);

61 void offMillisecChanged(int offMs);

58 void offMillisecChanged(int offMs);

62

59

63−private:

60+protected:

64− light_device_t* m_lightDevice;

65 QColor m_color;

61 QColor m_color;

66 State m_state;

62 State m_state;

67 int m_onMs;

63 int m_onMs;

68 int m_offMs;

64 int m_offMs;

69

65

70− bool init();

66+ virtual bool init() = 0;

71− void turnOff();

67+ virtual void turnOff() = 0;

72− void turnOn();

68+ virtual void turnOn() = 0;

73};

69};

74

70

75#endif

71#endif

plugins/Lights/plugin.cpp+20−1

@@ -18,6 +18,11 @@

18

19#include "plugin.h"

20#include "Lights.h"

21+#include "HfdLights.h"

22+#include "LegacyLights.h"

23+

24+// libandroid-properties

25+#include <hybris/properties/properties.h>

21

26

22#include <QtQml/qqml.h>

27#include <QtQml/qqml.h>

23

28

@@ -25,7 +30,21 @@ static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25{

30{

26 Q_UNUSED(engine)

31 Q_UNUSED(engine)

27 Q_UNUSED(scriptEngine)

32 Q_UNUSED(scriptEngine)

33+

34+ bool use_hfd = false;

35+ char buffer[PROP_VALUE_MAX];

36+ auto result = property_get("ro.build.version.sdk", buffer, "0");

37+ if (result) {

38+ auto sdkVersion = QString(buffer).toInt();

39+ if (sdkVersion >= 27 || sdkVersion == 0) {

40+ use_hfd = true;

41+ }

42+ }

43+ if (use_hfd) {

28− return new Lights();

44+ return new HfdLights();

45+ } else {

46+ return new LegacyLights();

47+ }

29}

48}

30

49

31void LightsPlugin::registerTypes(const char *uri)

50void LightsPlugin::registerTypes(const char *uri)