Improve sample applications

Sming/Arch/Host/Components/hostlib/include/hostlib/Streams.h

@@ -0,0 +1,50 @@
+/**
+ * Streams.h - Print support for host output
+ *
+ * Copyright 2024 mikee47 <[email protected]>
+ *
+ * This file is part of the Sming Framework Project
+ *
+ * This library is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, version 3 or later.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with SHEM.
+ * If not, see <https://www.gnu.org/licenses/>.
+ *
+ ****/
+
+#pragma once
+
+#include <unistd.h>
+
+namespace Host
+{
+class OutputStream : public Print
+{
+public:
+	OutputStream(int fileno) : fileno(fileno)
+	{
+	}
+
+	virtual size_t write(uint8_t c) override
+	{
+		return write(&c, 1);
+	}
+
+	size_t write(const uint8_t* buffer, size_t size) override
+	{
+		return ::write(fileno, buffer, size);
+	}
+
+private:
+	int fileno;
+};
+
+OutputStream standardOutput(STDOUT_FILENO);
+OutputStream standardError(STDERR_FILENO);
+
+}; // namespace Host

Sming/Components/Storage/src/include/Storage/SysMem.h

@@ -73,6 +73,8 @@ class SysMem : public Device
 	class SysMemPartitionTable : public PartitionTable
 	{
 	public:
+		using PartitionTable::add;
+
 		/**
 		 * @brief Add partition entry for FlashString data access
 		 */

Sming/Libraries/BLEGamepad/samples/Bluetooth_Gamepad/app/application.cpp

@@ -40,5 +40,5 @@ void init()
 	// Auto reporting is enabled by default.
 	// Use bleGamepad.setAutoReport(false); to disable auto reporting, and then use bleGamepad.sendReport(); as needed
 
-	procTimer.initializeMs(500, loop).start();
+	procTimer.initializeMs<500>(loop).start();
 }

Sming/Libraries/BLEKeyboard/samples/Bluetooth_Keyboard/app/application.cpp

@@ -44,5 +44,5 @@ void init()
 	Serial.println("Starting BLE Keyboard sample!");
 	bleKeyboard.begin();
 
-	procTimer.initializeMs(1000, loop).start();
+	procTimer.initializeMs<1000>(loop).start();
 }

Sming/Libraries/CS5460/samples/generic/app/application.cpp

@@ -1,30 +1,31 @@
 #include <SmingCore.h>
 #include <CS5460.h>
 
+namespace
+{
 CS5460 powerMeter(PIN_NDEFINED, PIN_NDEFINED, PIN_NDEFINED, PIN_NDEFINED);
-
-Timer printVoltageTimer;
+SimpleTimer printVoltageTimer;
 
 void printVoltage()
 {
-	debugf("Measured RMS voltage is: %f", powerMeter.getRMSVoltage());
+	Serial << _F("Measured RMS voltage is: ") << powerMeter.getRMSVoltage() << endl;
 }
 
+} // namespace
+
 void init()
 {
-	Serial.begin(SERIAL_BAUD_RATE, SERIAL_8N1,
-				 SERIAL_FULL); // 115200 by default, GPIO1,GPIO3, see Serial.swap(), HardwareSerial
+	Serial.begin(SERIAL_BAUD_RATE);
 	Serial.systemDebugOutput(true);
 
 	powerMeter.init();
-	powerMeter.setCurrentGain(190.84); //0.25 / shunt (0.00131)
-	powerMeter.setVoltageGain(500);	//0.25V (Veff max) * dividerGain
-	uint32_t conf = 0;
-	conf = powerMeter.readRegister(CONFIG_REGISTER);
-	conf |= ENABLE_VOLTAGE_HPF;
-	conf |= ENABLE_CURRENT_HPF;
+	powerMeter.setCurrentGain(190.84); // 0.25 / shunt (0.00131)
+	powerMeter.setVoltageGain(500);	// 0.25V (Veff max) * dividerGain
+
+	uint32_t conf = powerMeter.readRegister(CONFIG_REGISTER);
+	conf |= ENABLE_VOLTAGE_HPF | ENABLE_CURRENT_HPF;
 	powerMeter.writeRegister(CONFIG_REGISTER, conf);
 	powerMeter.startMultiConvert();
 
-	printVoltageTimer.initializeMs(1000, printVoltage).start();
+	printVoltageTimer.initializeMs<1000>(printVoltage).start();
 }

Sming/Libraries/CommandProcessing/samples/TelnetServer/app/application.cpp

@@ -34,7 +34,7 @@ bool processTelnetInput(TcpClient& client, char* data, int size)
 		char c = *data++;
 		if(skip) {
 			--skip;
-		} else if(c == '\xff') {
+		} else if(c == TC_ESC) {
 			skip = 2;
 		} else {
 			commandHandler.process(c);

Sming/Libraries/DS18S20/ds18s20.cpp

@@ -51,7 +51,7 @@ void DS18S20::StartMeasure()
 		InProgress=true;
 		ds->begin();
 		ds->reset_search();
-		DelaysTimer.initializeMs(150, TimerDelegate(&DS18S20::DoSearch, this)).start(false);
+		DelaysTimer.initializeMs<150>(TimerDelegate(&DS18S20::DoSearch, this)).start(false);
 	}
 
 }
@@ -146,7 +146,7 @@ void DS18S20::StartReadNext()
 	  ds->select(addr);
 	  ds->write(STARTCONVO, 1);        // start conversion, with parasite power on at the end
 
-	  DelaysTimer.initializeMs(900, TimerDelegate(&DS18S20::DoMeasure, this)).start(false);
+	  DelaysTimer.initializeMs<900>(TimerDelegate(&DS18S20::DoMeasure, this)).start(false);
    }
    else
    {
@@ -210,7 +210,7 @@ void DS18S20::DoMeasure()
 	debugx("  DBG: Temperature = %f Celsius, %f Fahrenheit",celsius[numberOfread],fahrenheit[numberOfread]);
 
 	numberOfread++;
-	DelaysTimer.initializeMs(100, TimerDelegate(&DS18S20::StartReadNext, this)).start(false);
+	DelaysTimer.initializeMs<100>(TimerDelegate(&DS18S20::StartReadNext, this)).start(false);
 
 }
 

Sming/Libraries/ModbusMaster/samples/generic/app/application.cpp

@@ -6,26 +6,28 @@
 #define MB_SLAVE_ADDR 1
 #define SLAVE_REG_ADDR 1
 
-Timer mbLoopTimer;
-
+namespace
+{
+SimpleTimer mbLoopTimer;
 ModbusMaster mbMaster;
 HardwareSerial modbusComPort(UART_ID_0);
 HardwareSerial debugComPort(UART_ID_1);
 
-uint16_t globalSeconds = 0;
+uint16_t globalSeconds;
 
 void mbLoop()
 {
 	globalSeconds++;
 
-	uint8_t numberOfRegistersToWrite = 1;
-	uint8_t bufferPosition = 0;
+	const uint8_t numberOfRegistersToWrite = 1;
+	const uint8_t bufferPosition = 0;
 	mbMaster.begin(MB_SLAVE_ADDR, modbusComPort);
 	mbMaster.setTransmitBuffer(bufferPosition, globalSeconds);
 	mbMaster.writeMultipleRegisters(SLAVE_REG_ADDR, numberOfRegistersToWrite);
 
-	uint8_t nrOfRegistersToRead = 1;
-	uint8_t mbResult = mbMaster.readHoldingRegisters(SLAVE_REG_ADDR, nrOfRegistersToRead); //see also readInputRegisters
+	// see also readInputRegisters
+	const uint8_t nrOfRegistersToRead = 1;
+	uint8_t mbResult = mbMaster.readHoldingRegisters(SLAVE_REG_ADDR, nrOfRegistersToRead);
 
 	if(mbResult == mbMaster.ku8MBSuccess) {
 		/*
@@ -34,9 +36,9 @@ void mbLoop()
 			debugComPort.printf("Reg %d: %d\r\n", i, buffer[i]);
 		}
 		*/
-		debugf("Data from slave: %d", mbMaster.getResponseBuffer(0));
+		debug_i("Data from slave: %d", mbMaster.getResponseBuffer(0));
 	} else {
-		debugf("Res err: %d", mbResult);
+		debug_i("Res err: %d", mbResult);
 	}
 
 	mbMaster.clearResponseBuffer();
@@ -57,57 +59,58 @@ void mbLogReceive(const uint8_t* adu, size_t aduSize, uint8_t status)
 	if(status != mbMaster.ku8MBSuccess) {
 		switch(status) {
 		case mbMaster.ku8MBIllegalFunction:
-			debugf("MB Illegal Function");
+			debug_i("MB Illegal Function");
 			break;
 		case mbMaster.ku8MBIllegalDataAddress:
-			debugf("MB Illegal Address");
+			debug_i("MB Illegal Address");
 			break;
 		case mbMaster.ku8MBIllegalDataValue:
-			debugf("MB Illegal Data Value");
+			debug_i("MB Illegal Data Value");
 			break;
 		case mbMaster.ku8MBSlaveDeviceFailure:
-			debugf("MB Slave Device Failure");
+			debug_i("MB Slave Device Failure");
 			break;
 		case mbMaster.ku8MBInvalidSlaveID:
-			debugf("MB Invalid Slave ID");
+			debug_i("MB Invalid Slave ID");
 			break;
 		case mbMaster.ku8MBInvalidFunction:
-			debugf("MB Invalid function");
+			debug_i("MB Invalid function");
 			break;
 		case mbMaster.ku8MBResponseTimedOut:
-			debugf("MB Response Timeout");
+			debug_i("MB Response Timeout");
 			break;
 		case mbMaster.ku8MBInvalidCRC:
-			debugf("MB Invalid CRC");
+			debug_i("MB Invalid CRC");
 			break;
 		case mbMaster.ku8MBResponseTooLarge:
-			debugf("MB Response too large");
+			debug_i("MB Response too large");
 			break;
 		}
-		debugf("ADU Size: %d, status: %d ", aduSize, status);
+		debug_i("ADU Size: %d, status: %d ", aduSize, status);
 		debug_hex(INFO, "RX ADU", adu, aduSize);
 	}
-	debugf("\r\n");
+	debug_i("\r\n");
 }
 
 void mbLogTransmit(const uint8_t* adu, size_t aduSize)
 {
 	debug_hex(INFO, "TX ADU", adu, aduSize);
 }
 
+} // namespace
+
 void init()
 {
 	pinMode(RS485_RE_PIN, OUTPUT);
 	digitalWrite(RS485_RE_PIN, LOW);
 	modbusComPort.begin(MODBUS_COM_SPEED, SERIAL_8N1, SERIAL_FULL);
-	debugComPort.begin(SERIAL_BAUD_RATE, SERIAL_8N1,
-				  SERIAL_TX_ONLY); // 115200 by default, GPIO1,GPIO3, see Serial.swap(), HardwareSerial
+	debugComPort.begin(SERIAL_BAUD_RATE, SERIAL_8N1, SERIAL_TX_ONLY);
 	debugComPort.systemDebugOutput(true);
 
 	mbMaster.preTransmission(preTransmission);
 	mbMaster.postTransmission(postTransmission);
 	mbMaster.logReceive(mbLogReceive);
 	mbMaster.logTransmit(mbLogTransmit);
 
-	mbLoopTimer.initializeMs(1000, mbLoop).start();
+	mbLoopTimer.initializeMs<1000>(mbLoop).start();
 }

Sming/Libraries/SwitchJoycon/samples/Bluetooth_Joycon/app/application.cpp

@@ -31,7 +31,7 @@ void onConnect(NimBLEServer& server)
 {
 	Serial.println("Connected :) !");
 
-	procTimer.initializeMs(500, loop).start();
+	procTimer.initializeMs<500>(loop).start();
 }
 
 void onDisconnect(NimBLEServer& server)

Sming/Libraries/si4432/si4432.cpp

@@ -354,16 +354,16 @@ void Si4432::BurstWrite(Registers startReg, const byte value[], uint8_t length)
 //	_spi->enable();
 	_spi->beginTransaction(_spi->SPIDefaultSettings);
 	delayMicroseconds(1);
-//	_spi->send(&regVal, 1);
-	_spi->transfer(&regVal, 1);
+	_spi->transfer(regVal);
 
 #if DEBUG_VERBOSE_SI4432
 		debugf("Writing: %x | %x ... %x (%d bytes)", (regVal != 0xFF ? (regVal) & 0x7F : 0x7F),
 				value[0], value[length-1], length);
 #endif
 
-//	_spi->send(value, length);
-	_spi->transfer((uint8 *)value, length);
+	uint8_t buffer[length];
+	memcpy(buffer, value, length);
+	_spi->transfer(buffer, length);
 
 //	_spi->disable();
 	_spi->endTransaction();
@@ -376,13 +376,11 @@ void Si4432::BurstRead(Registers startReg, byte value[], uint8_t length) {
 //	_spi->enable();
 	_spi->beginTransaction(_spi->SPIDefaultSettings);
 	delayMicroseconds(1);
-//	_spi->send(&regVal, 1);
-	_spi->transfer(&regVal, 1);
+	_spi->transfer(regVal);
 
 //	_spi->setMOSI(HIGH); /* Send 0xFF */
-	_spi->transfer((uint8 *)0xFF, 1);
-//	_spi->recv(value, length);
-	_spi->transfer((uint8 *)value, length);
+	_spi->transfer(0xff);
+	_spi->transfer(value, length);
 
 #if DEBUG_VERBOSE_SI4432
 		debugf("Reading: %x  | %x..%x (%d bytes)", (regVal != 0x7F ? (regVal) & 0x7F : 0x7F),

samples/Accel_Gyro_MPU6050/app/application.cpp

@@ -18,7 +18,8 @@ void init()
 
 	Wire.begin(DEFAULT_SDA_PIN, DEFAULT_SCL_PIN);
 	mpu.initialize();
-	Serial.println(mpu.testConnection() ? "MPU6050 connection successful" : "MPU6050 connection failed");
+	bool success = mpu.testConnection();
+	Serial << _F("MPU6050 connection ") << (success ? _F("successful") : _F("failed")) << endl;
 
 	mainLoopTimer.initializeMs<mainLoopInterval>(mainLoop).start();
 }

samples/Accelerometer_MMA7455/app/application.cpp

@@ -3,11 +3,11 @@
 
 // For more information read: https://code.google.com/p/mma-7455-arduino-library/
 MMA_7455 accel;
-Timer procTimer;
+SimpleTimer procTimer;
 
 void readSensor()
 {
-	Serial.println("Reading..");
+	Serial.println(_F("Reading.."));
 
 	int8_t x = accel.readAxis('x');
 	int8_t y = accel.readAxis('y');
@@ -29,5 +29,5 @@ void init()
 	accel.initSensitivity(MMA_7455_2G_MODE);
 
 	// Start reading loop
-	procTimer.initializeMs(300, readSensor).start();
+	procTimer.initializeMs<300>(readSensor).start();
 }