diff --git a/cli/README.md b/cli/README.md index 7b40b4cf..b7e48dc9 100644 --- a/cli/README.md +++ b/cli/README.md @@ -97,7 +97,7 @@ broadlink_cli --device @BEDROOM.device --temperature #### Check humidity ``` -broadlink_cli --device @BEDROOM.device --temperature +broadlink_cli --device @BEDROOM.device --humidity ``` ### Smart plugs diff --git a/cli/broadlink_cli b/cli/broadlink_cli index f7a24ade..01e255fd 100755 --- a/cli/broadlink_cli +++ b/cli/broadlink_cli @@ -82,6 +82,7 @@ parser.add_argument("--turnnloff", action="store_true", help="turn off nightligh parser.add_argument("--switch", action="store_true", help="switch state from on to off and off to on") parser.add_argument("--send", action="store_true", help="send command") parser.add_argument("--sensors", action="store_true", help="check all sensors") +parser.add_argument("--sensorsJson", action="store_true", help="check all sensors and print in json format") parser.add_argument("--learn", action="store_true", help="learn command") parser.add_argument("--rfscanlearn", action="store_true", help="rf scan learning") parser.add_argument("--learnfile", help="save learned command to a specified file") @@ -123,6 +124,16 @@ if args.sensors: data = dev.check_sensors() for key in data: print("{} {}".format(key, data[key])) +if args.sensorsJson: + data = dev.check_sensors() + print("{") + ftt = True + for key in data: + if not ftt: + print(",") + print(" \"{}\" : {}".format(key, data[key])) + ftt = False + print("}") if args.send: data = durations_to_broadlink(parse_durations(' '.join(args.data))) \ if args.durations else bytearray.fromhex(''.join(args.data)) diff --git a/protocol.md b/protocol.md index e2825640..b7a6f7ca 100644 --- a/protocol.md +++ b/protocol.md @@ -132,7 +132,7 @@ You must obtain an authorisation key from the device before you can communicate. |------|--------| |0x00-0x03|00| |0x04-0x12|A 15-digit value that represents this device. Broadlink's implementation uses the IMEI.| -|0x13|01| +|0x1e|0x01| |0x14-0x2c|00| |0x2d|0x01| |0x30-0x7f|NULL-terminated ASCII string containing the device name|