Skip to content

Commit 5157daf

Browse files
ViezeVingertjesViezeVingertjes
committed
Remove individual HW_RESP_* defines, use HW_RESP() macro directly
1 parent 00b44c4 commit 5157daf

2 files changed

Lines changed: 24 additions & 47 deletions

File tree

‎examples/kiss_modem/KissModem.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void KissModem::onPacketReceived(int8_t snr, int8_t rssi, const uint8_t* packet,
310310
}
311311

312312
void KissModem::handleGetIdentity() {
313-
writeHardwareFrame(HW_RESP_IDENTITY, _identity.pub_key, PUB_KEY_SIZE);
313+
writeHardwareFrame(HW_RESP(HW_CMD_GET_IDENTITY), _identity.pub_key, PUB_KEY_SIZE);
314314
}
315315

316316
void KissModem::handleGetRandom(const uint8_t* data, uint16_t len) {
@@ -327,7 +327,7 @@ void KissModem::handleGetRandom(const uint8_t* data, uint16_t len) {
327327

328328
uint8_t buf[64];
329329
_rng.random(buf, requested);
330-
writeHardwareFrame(HW_RESP_RANDOM, buf, requested);
330+
writeHardwareFrame(HW_RESP(HW_CMD_GET_RANDOM), buf, requested);
331331
}
332332

333333
void KissModem::handleVerifySignature(const uint8_t* data, uint16_t len) {
@@ -342,7 +342,7 @@ void KissModem::handleVerifySignature(const uint8_t* data, uint16_t len) {
342342
uint16_t msg_len = len - PUB_KEY_SIZE - SIGNATURE_SIZE;
343343

344344
uint8_t result = signer.verify(signature, msg, msg_len) ? 0x01 : 0x00;
345-
writeHardwareFrame(HW_RESP_VERIFY, &result, 1);
345+
writeHardwareFrame(HW_RESP(HW_CMD_VERIFY_SIGNATURE), &result, 1);
346346
}
347347

348348
void KissModem::handleSignData(const uint8_t* data, uint16_t len) {
@@ -353,7 +353,7 @@ void KissModem::handleSignData(const uint8_t* data, uint16_t len) {
353353

354354
uint8_t signature[SIGNATURE_SIZE];
355355
_identity.sign(signature, data, len);
356-
writeHardwareFrame(HW_RESP_SIGNATURE, signature, SIGNATURE_SIZE);
356+
writeHardwareFrame(HW_RESP(HW_CMD_SIGN_DATA), signature, SIGNATURE_SIZE);
357357
}
358358

359359
void KissModem::handleEncryptData(const uint8_t* data, uint16_t len) {
@@ -370,7 +370,7 @@ void KissModem::handleEncryptData(const uint8_t* data, uint16_t len) {
370370
int encrypted_len = mesh::Utils::encryptThenMAC(key, buf, plaintext, plaintext_len);
371371

372372
if (encrypted_len > 0) {
373-
writeHardwareFrame(HW_RESP_ENCRYPTED, buf, encrypted_len);
373+
writeHardwareFrame(HW_RESP(HW_CMD_ENCRYPT_DATA), buf, encrypted_len);
374374
} else {
375375
writeHardwareError(HW_ERR_ENCRYPT_FAILED);
376376
}
@@ -390,7 +390,7 @@ void KissModem::handleDecryptData(const uint8_t* data, uint16_t len) {
390390
int decrypted_len = mesh::Utils::MACThenDecrypt(key, buf, ciphertext, ciphertext_len);
391391

392392
if (decrypted_len > 0) {
393-
writeHardwareFrame(HW_RESP_DECRYPTED, buf, decrypted_len);
393+
writeHardwareFrame(HW_RESP(HW_CMD_DECRYPT_DATA), buf, decrypted_len);
394394
} else {
395395
writeHardwareError(HW_ERR_MAC_FAILED);
396396
}
@@ -404,7 +404,7 @@ void KissModem::handleKeyExchange(const uint8_t* data, uint16_t len) {
404404

405405
uint8_t shared_secret[PUB_KEY_SIZE];
406406
_identity.calcSharedSecret(shared_secret, data);
407-
writeHardwareFrame(HW_RESP_SHARED_SECRET, shared_secret, PUB_KEY_SIZE);
407+
writeHardwareFrame(HW_RESP(HW_CMD_KEY_EXCHANGE), shared_secret, PUB_KEY_SIZE);
408408
}
409409

410410
void KissModem::handleHash(const uint8_t* data, uint16_t len) {
@@ -415,7 +415,7 @@ void KissModem::handleHash(const uint8_t* data, uint16_t len) {
415415

416416
uint8_t hash[32];
417417
mesh::Utils::sha256(hash, 32, data, len);
418-
writeHardwareFrame(HW_RESP_HASH, hash, 32);
418+
writeHardwareFrame(HW_RESP(HW_CMD_HASH), hash, 32);
419419
}
420420

421421
void KissModem::handleSetRadio(const uint8_t* data, uint16_t len) {
@@ -467,18 +467,18 @@ void KissModem::handleGetRadio() {
467467
memcpy(buf + 4, &_config.bw_hz, 4);
468468
buf[8] = _config.sf;
469469
buf[9] = _config.cr;
470-
writeHardwareFrame(HW_RESP_RADIO, buf, 10);
470+
writeHardwareFrame(HW_RESP(HW_CMD_GET_RADIO), buf, 10);
471471
}
472472

473473
void KissModem::handleGetTxPower() {
474-
writeHardwareFrame(HW_RESP_TX_POWER, &_config.tx_power, 1);
474+
writeHardwareFrame(HW_RESP(HW_CMD_GET_TX_POWER), &_config.tx_power, 1);
475475
}
476476

477477
void KissModem::handleGetVersion() {
478478
uint8_t buf[2];
479479
buf[0] = KISS_FIRMWARE_VERSION;
480480
buf[1] = 0;
481-
writeHardwareFrame(HW_RESP_VERSION, buf, 2);
481+
writeHardwareFrame(HW_RESP(HW_CMD_GET_VERSION), buf, 2);
482482
}
483483

484484
void KissModem::handleGetCurrentRssi() {
@@ -489,12 +489,12 @@ void KissModem::handleGetCurrentRssi() {
489489

490490
float rssi = _getCurrentRssiCallback();
491491
int8_t rssi_byte = (int8_t)rssi;
492-
writeHardwareFrame(HW_RESP_CURRENT_RSSI, (uint8_t*)&rssi_byte, 1);
492+
writeHardwareFrame(HW_RESP(HW_CMD_GET_CURRENT_RSSI), (uint8_t*)&rssi_byte, 1);
493493
}
494494

495495
void KissModem::handleIsChannelBusy() {
496496
uint8_t busy = _radio.isReceiving() ? 0x01 : 0x00;
497-
writeHardwareFrame(HW_RESP_CHANNEL_BUSY, &busy, 1);
497+
writeHardwareFrame(HW_RESP(HW_CMD_IS_CHANNEL_BUSY), &busy, 1);
498498
}
499499

500500
void KissModem::handleGetAirtime(const uint8_t* data, uint16_t len) {
@@ -505,12 +505,12 @@ void KissModem::handleGetAirtime(const uint8_t* data, uint16_t len) {
505505

506506
uint8_t packet_len = data[0];
507507
uint32_t airtime = _radio.getEstAirtimeFor(packet_len);
508-
writeHardwareFrame(HW_RESP_AIRTIME, (uint8_t*)&airtime, 4);
508+
writeHardwareFrame(HW_RESP(HW_CMD_GET_AIRTIME), (uint8_t*)&airtime, 4);
509509
}
510510

511511
void KissModem::handleGetNoiseFloor() {
512512
int16_t noise_floor = _radio.getNoiseFloor();
513-
writeHardwareFrame(HW_RESP_NOISE_FLOOR, (uint8_t*)&noise_floor, 2);
513+
writeHardwareFrame(HW_RESP(HW_CMD_GET_NOISE_FLOOR), (uint8_t*)&noise_floor, 2);
514514
}
515515

516516
void KissModem::handleGetStats() {
@@ -525,16 +525,16 @@ void KissModem::handleGetStats() {
525525
memcpy(buf, &rx, 4);
526526
memcpy(buf + 4, &tx, 4);
527527
memcpy(buf + 8, &errors, 4);
528-
writeHardwareFrame(HW_RESP_STATS, buf, 12);
528+
writeHardwareFrame(HW_RESP(HW_CMD_GET_STATS), buf, 12);
529529
}
530530

531531
void KissModem::handleGetBattery() {
532532
uint16_t mv = _board.getBattMilliVolts();
533-
writeHardwareFrame(HW_RESP_BATTERY, (uint8_t*)&mv, 2);
533+
writeHardwareFrame(HW_RESP(HW_CMD_GET_BATTERY), (uint8_t*)&mv, 2);
534534
}
535535

536536
void KissModem::handlePing() {
537-
writeHardwareFrame(HW_RESP_PONG, nullptr, 0);
537+
writeHardwareFrame(HW_RESP(HW_CMD_PING), nullptr, 0);
538538
}
539539

540540
void KissModem::handleGetSensors(const uint8_t* data, uint16_t len) {
@@ -546,9 +546,9 @@ void KissModem::handleGetSensors(const uint8_t* data, uint16_t len) {
546546
uint8_t permissions = data[0];
547547
CayenneLPP telemetry(255);
548548
if (_sensors.querySensors(permissions, telemetry)) {
549-
writeHardwareFrame(HW_RESP_SENSORS, telemetry.getBuffer(), telemetry.getSize());
549+
writeHardwareFrame(HW_RESP(HW_CMD_GET_SENSORS), telemetry.getBuffer(), telemetry.getSize());
550550
} else {
551-
writeHardwareFrame(HW_RESP_SENSORS, nullptr, 0);
551+
writeHardwareFrame(HW_RESP(HW_CMD_GET_SENSORS), nullptr, 0);
552552
}
553553
}
554554

@@ -559,7 +559,7 @@ void KissModem::handleGetMCUTemp() {
559559
return;
560560
}
561561
int16_t temp_tenths = (int16_t)(temp * 10.0f);
562-
writeHardwareFrame(HW_RESP_MCU_TEMP, (uint8_t*)&temp_tenths, 2);
562+
writeHardwareFrame(HW_RESP(HW_CMD_GET_MCU_TEMP), (uint8_t*)&temp_tenths, 2);
563563
}
564564

565565
void KissModem::handleReboot() {
@@ -571,7 +571,7 @@ void KissModem::handleReboot() {
571571

572572
void KissModem::handleGetDeviceName() {
573573
const char* name = _board.getManufacturerName();
574-
writeHardwareFrame(HW_RESP_DEVICE_NAME, (const uint8_t*)name, strlen(name));
574+
writeHardwareFrame(HW_RESP(HW_CMD_GET_DEVICE_NAME), (const uint8_t*)name, strlen(name));
575575
}
576576

577577
void KissModem::handleSetSignalReport(const uint8_t* data, uint16_t len) {
@@ -581,10 +581,10 @@ void KissModem::handleSetSignalReport(const uint8_t* data, uint16_t len) {
581581
}
582582
_signal_report_enabled = (data[0] != 0x00);
583583
uint8_t val = _signal_report_enabled ? 0x01 : 0x00;
584-
writeHardwareFrame(HW_RESP_SIGNAL_REPORT, &val, 1);
584+
writeHardwareFrame(HW_RESP(HW_CMD_GET_SIGNAL_REPORT), &val, 1);
585585
}
586586

587587
void KissModem::handleGetSignalReport() {
588588
uint8_t val = _signal_report_enabled ? 0x01 : 0x00;
589-
writeHardwareFrame(HW_RESP_SIGNAL_REPORT, &val, 1);
589+
writeHardwareFrame(HW_RESP(HW_CMD_GET_SIGNAL_REPORT), &val, 1);
590590
}

‎examples/kiss_modem/KissModem.h‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,6 @@
5757
/* Response code = command code | 0x80. Generic / unsolicited use 0xF0+. */
5858
#define HW_RESP(cmd) ((cmd) | 0x80)
5959

60-
#define HW_RESP_IDENTITY HW_RESP(HW_CMD_GET_IDENTITY) /* 0x81 */
61-
#define HW_RESP_RANDOM HW_RESP(HW_CMD_GET_RANDOM) /* 0x82 */
62-
#define HW_RESP_VERIFY HW_RESP(HW_CMD_VERIFY_SIGNATURE) /* 0x83 */
63-
#define HW_RESP_SIGNATURE HW_RESP(HW_CMD_SIGN_DATA) /* 0x84 */
64-
#define HW_RESP_ENCRYPTED HW_RESP(HW_CMD_ENCRYPT_DATA) /* 0x85 */
65-
#define HW_RESP_DECRYPTED HW_RESP(HW_CMD_DECRYPT_DATA) /* 0x86 */
66-
#define HW_RESP_SHARED_SECRET HW_RESP(HW_CMD_KEY_EXCHANGE) /* 0x87 */
67-
#define HW_RESP_HASH HW_RESP(HW_CMD_HASH) /* 0x88 */
68-
#define HW_RESP_RADIO HW_RESP(HW_CMD_GET_RADIO) /* 0x8B */
69-
#define HW_RESP_TX_POWER HW_RESP(HW_CMD_GET_TX_POWER) /* 0x8C */
70-
#define HW_RESP_CURRENT_RSSI HW_RESP(HW_CMD_GET_CURRENT_RSSI) /* 0x8D */
71-
#define HW_RESP_CHANNEL_BUSY HW_RESP(HW_CMD_IS_CHANNEL_BUSY) /* 0x8E */
72-
#define HW_RESP_AIRTIME HW_RESP(HW_CMD_GET_AIRTIME) /* 0x8F */
73-
#define HW_RESP_NOISE_FLOOR HW_RESP(HW_CMD_GET_NOISE_FLOOR) /* 0x90 */
74-
#define HW_RESP_VERSION HW_RESP(HW_CMD_GET_VERSION) /* 0x91 */
75-
#define HW_RESP_STATS HW_RESP(HW_CMD_GET_STATS) /* 0x92 */
76-
#define HW_RESP_BATTERY HW_RESP(HW_CMD_GET_BATTERY) /* 0x93 */
77-
#define HW_RESP_MCU_TEMP HW_RESP(HW_CMD_GET_MCU_TEMP) /* 0x94 */
78-
#define HW_RESP_SENSORS HW_RESP(HW_CMD_GET_SENSORS) /* 0x95 */
79-
#define HW_RESP_DEVICE_NAME HW_RESP(HW_CMD_GET_DEVICE_NAME) /* 0x96 */
80-
#define HW_RESP_PONG HW_RESP(HW_CMD_PING) /* 0x97 */
81-
#define HW_RESP_SIGNAL_REPORT HW_RESP(HW_CMD_GET_SIGNAL_REPORT) /* 0x9A */
82-
8360
/* Generic responses (shared by multiple commands) */
8461
#define HW_RESP_OK 0xF0
8562
#define HW_RESP_ERROR 0xF1

0 commit comments

Comments
 (0)