Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor changes #13

Merged
merged 3 commits into from
Jan 14, 2022
Merged

minor changes #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96348de
minor changes
karamo Jan 13, 2022
72a4678
Update RNode_Firmware.ino
karamo Jan 14, 2022
291868a
remove warnings
karamo Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove warnings 
"unused variable" "uninitialized"
  • Loading branch information
@karamo
karamo committed Jan 14, 2022
commit 291868af6db5ae33f5966cf71c8dfa01e6b124d4
6 changes: 3 additions & 3 deletions RNode_Firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ void transmit(uint16_t size) {
LoRa.beginPacket();
LoRa.write(header); written++;

for (uint16_t i; i < size; i++) {
for (int i=0; i < size; i++) {
LoRa.write(tbuf[i]);

written++;
Expand Down Expand Up @@ -400,7 +400,7 @@ void transmit(uint16_t size) {
LoRa.beginPacket(size);
}

for (uint16_t i; i < size; i++) {
for (int i=0; i < size; i++) {
LoRa.write(tbuf[i]);

written++;
Expand Down Expand Up @@ -805,7 +805,7 @@ void buffer_serial() {
// Discard GPS data for now
c = 0;
while (c < MAX_CYCLES && Serial1.available()) {
uint8_t void_c = Serial1.read();
Serial1.read();
}
#endif

Expand Down
36 changes: 18 additions & 18 deletions Utilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ int8_t led_standby_direction = 0;
}
#endif

void escapedSerialWrite(uint8_t byte) {
if (byte == FEND) { Serial.write(FESC); byte = TFEND; }
if (byte == FESC) { Serial.write(FESC); byte = TFESC; }
Serial.write(byte);
void escapedSerialWrite(uint8_t vbyte) {
if (vbyte == FEND) { Serial.write(FESC); vbyte = TFEND; }
if (vbyte == FESC) { Serial.write(FESC); vbyte = TFESC; }
Serial.write(vbyte);
}

void kiss_indicate_reset() {
Expand Down Expand Up @@ -327,10 +327,10 @@ void kiss_indicate_frequency() {
Serial.write(FEND);
}

void kiss_indicate_random(uint8_t byte) {
void kiss_indicate_random(uint8_t vbyte) {
Serial.write(FEND);
Serial.write(CMD_RANDOM);
Serial.write(byte);
Serial.write(vbyte);
Serial.write(FEND);
}

Expand Down Expand Up @@ -474,22 +474,22 @@ bool eeprom_info_locked() {

void eeprom_dump_info() {
for (int addr = ADDR_PRODUCT; addr <= ADDR_INFO_LOCK; addr++) {
uint8_t byte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(byte);
uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(vbyte);
}
}

void eeprom_dump_config() {
for (int addr = ADDR_CONF_SF; addr <= ADDR_CONF_OK; addr++) {
uint8_t byte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(byte);
uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(vbyte);
}
}

void eeprom_dump_all() {
for (int addr = 0; addr < EEPROM_RESERVED; addr++) {
uint8_t byte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(byte);
uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
escapedSerialWrite(vbyte);
}
}

Expand All @@ -500,12 +500,12 @@ void kiss_dump_eeprom() {
Serial.write(FEND);
}

void eeprom_update(int mapped_addr, uint8_t byte) {
void eeprom_update(int mapped_addr, uint8_t vbyte) {
#if MCU_VARIANT == MCU_1284P || MCU_VARIANT == MCU_2560
EEPROM.update(mapped_addr, byte);
EEPROM.update(mapped_addr, vbyte);
#elif MCU_VARIANT == MCU_ESP32
if (EEPROM.read(mapped_addr) != byte) {
EEPROM.write(mapped_addr, byte);
if (EEPROM.read(mapped_addr) != vbyte) {
EEPROM.write(mapped_addr, vbyte);
EEPROM.commit();
}
#endif
Expand Down Expand Up @@ -565,8 +565,8 @@ bool eeprom_hwrev_valid() {
bool eeprom_checksum_valid() {
char *data = (char*)malloc(CHECKSUMMED_SIZE);
for (uint8_t i = 0; i < CHECKSUMMED_SIZE; i++) {
char byte = EEPROM.read(eeprom_addr(i));
data[i] = byte;
char vbyte = EEPROM.read(eeprom_addr(i));
data[i] = vbyte;
}

unsigned char *hash = MD5::make_hash(data, CHECKSUMMED_SIZE);
Expand Down