Script can now control baud rate and changing the script or serial po…

…rt results in serial port reconnection. Fixes kuym#2, fixes kuym#3

Resources/devices/Denon-AVR-3806.lua

@@ -35,7 +35,12 @@ end
 
 function onEvent(event, value)
 
-	if(event == "key") then
+	if(event == "init") then
+
+		print("init:", value);
+		init();
+
+	elseif(event == "key") then
 
 		if(value == 11) then		--volume down
 			print("volume down key");
@@ -133,6 +138,8 @@ end
 
 --initialize here
 init();
+setSerialBaud(9600);
+
 serialWrite("MV?\r");	--seed volume data by querying it
 
 setStatus("Denon AVR-3806 pending.");

Source/Model.h

@@ -21,6 +21,9 @@
 - (NSString*)serialPort;
 - (void)setSerialPort:(NSString*)value;
 
+- (int)baudRate;
+- (void)setBaudRate:(int)baud;
+
 - (NSString*)deviceModel;
 - (void)setDeviceModel:(NSString*)value;
 

Source/Model.m

@@ -6,11 +6,13 @@ @implementation AmpControllerModel
 {
 @private
 	NSString*		_deviceStatus;
+	int				_baud;
 }
 
 - (id)init
 {
 	_deviceStatus = @"Disconnected";
+	_baud = 9600;
 	return(self);
 }
 
@@ -78,6 +80,18 @@ - (void)setSerialPort:(NSString*)value
 	[self change:@"serialPort" on:self];
 }
 
+- (int)baudRate
+{
+	return(_baud);
+}
+
+- (void)setBaudRate:(int)baud
+{
+	_baud = baud;
+
+	[self change:@"baudRate" on:self];
+}
+
 - (NSString*)deviceModel
 {
 	return([[NSUserDefaults standardUserDefaults] stringForKey:@"devicemodel"]);

Source/Scripting.m

@@ -112,6 +112,23 @@ int		luaSetStatus(lua_State* L)
 	return(0);
 }
 
+int		luaSetSerialBaud(lua_State* L)
+{
+	int n = lua_gettop(L);
+	if((n < 1) || !lua_isnumber(L, 1))
+	{
+		lua_pushstring(L, "setStatus must be called with an integer argument");
+		return(lua_error(L));	// longjmps, doesn't actually return
+	}
+
+	int baud = (int)lua_tointeger(L, 1);
+
+	Scripting* s = (__bridge Scripting*)lua_touserdata(L, lua_upvalueindex(1));
+	[s setBaudRate:baud];
+
+	return(0);
+}
+
 int		luaSerialWrite(lua_State* L)
 {
 	int n = lua_gettop(L);
@@ -156,6 +173,13 @@ - (void)unloadScript
 	}
 }
 
+void	addGlobalMethod(lua_State* L, void* context, char const* name, lua_CFunction fn)
+{
+	lua_pushlightuserdata(L, context);
+	lua_pushcclosure(L, fn, 1);
+	lua_setglobal(L, name);
+}
+
 - (BOOL)loadLuaScript:(NSString*)scriptPath
 {
 	if(_luaState != 0)
@@ -179,17 +203,10 @@ - (BOOL)loadLuaScript:(NSString*)scriptPath
 	luaL_openlibs(_luaState);	//load default libraries
 	lua_gc(_luaState, LUA_GCRESTART, 0);
 
-	lua_pushlightuserdata(_luaState, (__bridge void*)self);
-	lua_pushcclosure(_luaState, &luaPrint, 1);
-	lua_setglobal(_luaState, "print");
-
-	lua_pushlightuserdata(_luaState, (__bridge void*)self);
-	lua_pushcclosure(_luaState, &luaSetStatus, 1);
-	lua_setglobal(_luaState, "setStatus");
-
-	lua_pushlightuserdata(_luaState, (__bridge void*)self);
-	lua_pushcclosure(_luaState, &luaSerialWrite, 1);
-	lua_setglobal(_luaState, "serialWrite");
+	addGlobalMethod(_luaState, (__bridge void*)self, "print", &luaPrint);
+	addGlobalMethod(_luaState, (__bridge void*)self, "setStatus", &luaSetStatus);
+	addGlobalMethod(_luaState, (__bridge void*)self, "setSerialBaud", &luaSetSerialBaud);
+	addGlobalMethod(_luaState, (__bridge void*)self, "serialWrite", &luaSerialWrite);
 
 	ScriptLoadClosure* closure = (ScriptLoadClosure*)malloc(sizeof(ScriptLoadClosure));
 	closure->file = file;
@@ -262,6 +279,11 @@ - (void)setStatus:(NSString*)value
 	[_model setDeviceStatus:value];
 }
 
+- (void)setBaudRate:(int)baud
+{
+	[_model setBaudRate:baud];
+}
+
 - (void)serialWrite:(NSData*)data
 {
 	[_model postSerialOutput:data];

Source/main.mm

@@ -144,8 +144,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification
 	[_model onChanged:@"autostart" call:@selector(onUpdateAutoStart:) on:self];
 
 	[_model onChanged:@"serialPort" call:@selector(onSerialPortChanged:) on:self];
+	[_model onChanged:@"baudRate" call:@selector(onBaudRateChanged:) on:self];
 	[_model onChanged:@"serialOutput" call:@selector(onSerialOutput:) on:self];
-	[self openSerialPort:[_model serialPort] baudRate:9600];	//@@script controlled baud
 
 	[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(onSystemWillSleep:) name:NSWorkspaceWillSleepNotification object:nil];
 	[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(onSystemDidWake:) name:NSWorkspaceDidWakeNotification object:nil];
@@ -228,7 +228,22 @@ - (void)onSerialPortChanged:(NSNotification*)notification
 		[_serialPort unbindListener:self];
 	}
 
-	[self openSerialPort:[_model serialPort] baudRate:9600];	//@@script controlled baud
+	[self openSerialPort:[_model serialPort] baudRate:[_model baudRate]];
+	//poke script, let it reinitialize if necessary
+	[_model postGenericEvent:@"init" value:@"serialPort"];
+}
+
+- (void)onBaudRateChanged:(NSNotification*)notification
+{
+	if(_serialPort != nil)
+	{
+		[_serialPort close];
+		[_serialPort unbindListener:self];
+	}
+
+	[self openSerialPort:[_model serialPort] baudRate:[_model baudRate]];
+
+	//no script event because baud rate changes are currently script-initiated only
 }
 
 - (void)onSerialInput:(NSNotification*)notification
@@ -369,6 +384,15 @@ - (id)initWithModel:(AmpControllerModel*)model
 - (void)showWindow:(id)sender
 {
 	[super showWindow:sender];
+
+	if([self window] != nil)
+	{
+		// set initial dropdown/popup state
+		[self generateSerialPortMenu];
+
+		// set initial device model state
+		[self generateDeviceModelMenu];
+	}
 }
 
 - (void)awakeFromNib